Skip to content

Commit

Permalink
Merge pull request #2033 from deads2k/move-02-mco-courtesy-move
Browse files Browse the repository at this point in the history
copy mco crds to be managed by openshfit/api
  • Loading branch information
openshift-merge-bot[bot] authored Sep 18, 2024
2 parents 07bccfd + 8f68f40 commit 8f6ded4
Show file tree
Hide file tree
Showing 28 changed files with 20,286 additions and 0 deletions.
4 changes: 4 additions & 0 deletions hack/update-payload-crds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ crd_globs="\
operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers*.crd.yaml
config/v1/zz_generated.crd-manifests/0000_10_openshift-controller-manager_01_builds*.crd.yaml
operator/v1/zz_generated.crd-manifests/0000_50_openshift-controller-manager_02_openshiftcontrollermanagers*.crd.yaml
machineconfiguration/v1/zz_generated.crd-manifests/*.crd.yaml
machineconfiguration/v1alpha1/zz_generated.crd-manifests/*.crd.yaml
operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations*.crd.yaml
config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies*.crd.yaml
"

# To allow the crd_globs to be sourced in the verify script,
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.openshift.io: https://github.com/openshift/api/pull/1453
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
labels:
openshift.io/operator-managed: ""
name: containerruntimeconfigs.machineconfiguration.openshift.io
spec:
group: machineconfiguration.openshift.io
names:
kind: ContainerRuntimeConfig
listKind: ContainerRuntimeConfigList
plural: containerruntimeconfigs
shortNames:
- ctrcfg
singular: containerruntimeconfig
scope: Cluster
versions:
- name: v1
schema:
openAPIV3Schema:
description: "ContainerRuntimeConfig describes a customized Container Runtime
configuration. \n Compatibility level 1: Stable within a major release for
a minimum of 12 months or 3 minor releases (whichever is longer)."
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: ContainerRuntimeConfigSpec defines the desired state of ContainerRuntimeConfig
properties:
containerRuntimeConfig:
description: ContainerRuntimeConfiguration defines the tuneables of
the container runtime
properties:
defaultRuntime:
description: defaultRuntime is the name of the OCI runtime to
be used as the default.
type: string
logLevel:
description: logLevel specifies the verbosity of the logs based
on the level it is set to. Options are fatal, panic, error,
warn, info, and debug.
type: string
logSizeMax:
anyOf:
- type: integer
- type: string
description: logSizeMax specifies the Maximum size allowed for
the container log file. Negative numbers indicate that no size
limit is imposed. If it is positive, it must be >= 8192 to match/exceed
conmon's read buffer.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
overlaySize:
anyOf:
- type: integer
- type: string
description: 'overlaySize specifies the maximum size of a container
image. This flag can be used to set quota on the size of container
images. (default: 10GB)'
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
pidsLimit:
description: pidsLimit specifies the maximum number of processes
allowed in a container
format: int64
type: integer
type: object
machineConfigPoolSelector:
description: MachineConfigPoolSelector selects which pools the ContainerRuntimeConfig
shoud apply to. A nil selector will result in no pools being selected.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: A label selector requirement is a selector that
contains values, a key, and an operator that relates the key
and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: operator represents a key's relationship to
a set of values. Valid operators are In, NotIn, Exists
and DoesNotExist.
type: string
values:
description: values is an array of string values. If the
operator is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A single
{key,value} in the matchLabels map is equivalent to an element
of matchExpressions, whose key field is "key", the operator
is "In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
required:
- containerRuntimeConfig
type: object
status:
description: ContainerRuntimeConfigStatus defines the observed state of
a ContainerRuntimeConfig
properties:
conditions:
description: conditions represents the latest available observations
of current state.
items:
description: ContainerRuntimeConfigCondition defines the state of
the ContainerRuntimeConfig
properties:
lastTransitionTime:
description: lastTransitionTime is the time of the last update
to the current status object.
format: date-time
nullable: true
type: string
message:
description: message provides additional information about the
current condition. This is only to be consumed by humans.
type: string
reason:
description: reason is the reason for the condition's last transition. Reasons
are PascalCase
type: string
status:
description: status of the condition, one of True, False, Unknown.
type: string
type:
description: type specifies the state of the operator's reconciliation
functionality.
type: string
type: object
type: array
x-kubernetes-list-type: atomic
observedGeneration:
description: observedGeneration represents the generation observed
by the controller.
format: int64
type: integer
type: object
required:
- spec
type: object
served: true
storage: true
subresources:
status: {}
Loading

0 comments on commit 8f6ded4

Please sign in to comment.