diff --git a/features.md b/features.md index 750b68d62fc..5543c61eb8b 100644 --- a/features.md +++ b/features.md @@ -29,7 +29,6 @@ | AWSDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled | | AWSDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled | | AWSEuropeanSovereignCloudInstall| | | Enabled | Enabled | | | Enabled | Enabled | -| AdditionalStorageConfig| | | Enabled | Enabled | | | Enabled | Enabled | | AutomatedEtcdBackup| | | Enabled | Enabled | | | Enabled | Enabled | | AzureDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled | | AzureDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled | @@ -87,6 +86,7 @@ | VSphereMixedNodeEnv| | | Enabled | Enabled | | | Enabled | Enabled | | VolumeGroupSnapshot| | | Enabled | Enabled | | | Enabled | Enabled | | AWSServiceLBNetworkSecurityGroup| | Enabled | Enabled | Enabled | | Enabled | Enabled | Enabled | +| AdditionalStorageConfig| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AzureClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AzureWorkloadIdentity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BootImageSkewEnforcement| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index c17075aa867..a22abd8c6f0 100644 --- a/features/features.go +++ b/features/features.go @@ -325,7 +325,7 @@ var ( contactPerson("saschagrunert"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1934"). - enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateUpgradeStatus = newFeatureGate("UpgradeStatus"). diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-Default.crd.yaml deleted file mode 100644 index a983664180f..00000000000 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-Default.crd.yaml +++ /dev/null @@ -1,197 +0,0 @@ -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" - release.openshift.io/feature-set: Default - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-DevPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-DevPreviewNoUpgrade.crd.yaml deleted file mode 100644 index 8d918545b29..00000000000 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-DevPreviewNoUpgrade.crd.yaml +++ /dev/null @@ -1,328 +0,0 @@ -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" - release.openshift.io/feature-set: DevPreviewNoUpgrade - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - additionalArtifactStores: - description: |- - additionalArtifactStores configures additional read-only artifact storage locations for Open Container Initiative (OCI) artifacts. - - Artifacts are checked in order: additional stores first, then the default location (/var/lib/containers/storage/artifacts). - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default artifact location is used. - When specified, at least one store must be provided. - items: - description: AdditionalArtifactStore defines an additional read-only - storage location for Open Container Initiative (OCI) artifacts. - properties: - path: - description: |- - path specifies the absolute location of the additional artifact store. - The path must exist on the node before configuration is applied. - When an artifact is requested, artifacts found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalArtifactStores must not contain duplicate - paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalImageStores: - description: |- - additionalImageStores configures additional read-only container image store locations for Open Container Initiative (OCI) images. - - Images are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default image location is used. - When specified, at least one store must be provided. - items: - description: AdditionalImageStore defines an additional read-only - storage location for Open Container Initiative (OCI) images. - properties: - path: - description: |- - path specifies the absolute location of the additional image store. - The path must exist on the node before configuration is applied. - When a container image is requested, images found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalImageStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalLayerStores: - description: |- - additionalLayerStores configures additional read-only container image layer store locations for Open Container Initiative (OCI) images. - - Layers are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 5 stores allowed. - Each path must be unique. - - When omitted, only the default layer location is used. - When specified, at least one store must be provided. - items: - description: AdditionalLayerStore defines a read-only storage - location for Open Container Initiative (OCI) container image - layers. - properties: - path: - description: |- - path specifies the absolute location of the additional layer store. - The path must exist on the node before configuration is applied. - When a container image is requested, layers found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 5 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalLayerStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-OKD.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-OKD.crd.yaml deleted file mode 100644 index db82f1a1418..00000000000 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-OKD.crd.yaml +++ /dev/null @@ -1,197 +0,0 @@ -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" - release.openshift.io/feature-set: OKD - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-TechPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-TechPreviewNoUpgrade.crd.yaml deleted file mode 100644 index 27a0cb3c173..00000000000 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-TechPreviewNoUpgrade.crd.yaml +++ /dev/null @@ -1,328 +0,0 @@ -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" - release.openshift.io/feature-set: TechPreviewNoUpgrade - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - additionalArtifactStores: - description: |- - additionalArtifactStores configures additional read-only artifact storage locations for Open Container Initiative (OCI) artifacts. - - Artifacts are checked in order: additional stores first, then the default location (/var/lib/containers/storage/artifacts). - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default artifact location is used. - When specified, at least one store must be provided. - items: - description: AdditionalArtifactStore defines an additional read-only - storage location for Open Container Initiative (OCI) artifacts. - properties: - path: - description: |- - path specifies the absolute location of the additional artifact store. - The path must exist on the node before configuration is applied. - When an artifact is requested, artifacts found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalArtifactStores must not contain duplicate - paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalImageStores: - description: |- - additionalImageStores configures additional read-only container image store locations for Open Container Initiative (OCI) images. - - Images are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default image location is used. - When specified, at least one store must be provided. - items: - description: AdditionalImageStore defines an additional read-only - storage location for Open Container Initiative (OCI) images. - properties: - path: - description: |- - path specifies the absolute location of the additional image store. - The path must exist on the node before configuration is applied. - When a container image is requested, images found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalImageStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalLayerStores: - description: |- - additionalLayerStores configures additional read-only container image layer store locations for Open Container Initiative (OCI) images. - - Layers are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 5 stores allowed. - Each path must be unique. - - When omitted, only the default layer location is used. - When specified, at least one store must be provided. - items: - description: AdditionalLayerStore defines a read-only storage - location for Open Container Initiative (OCI) container image - layers. - properties: - path: - description: |- - path specifies the absolute location of the additional layer store. - The path must exist on the node before configuration is applied. - When a container image is requested, layers found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 5 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalLayerStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-CustomNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml similarity index 99% rename from machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-CustomNoUpgrade.crd.yaml rename to machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml index 68726d9ce15..a1c686ee5e1 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs-CustomNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml @@ -6,7 +6,6 @@ metadata: api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: CustomNoUpgrade labels: openshift.io/operator-managed: "" name: containerruntimeconfigs.machineconfiguration.openshift.io diff --git a/openapi/openapi.json b/openapi/openapi.json index 0774c34942c..fb248cd7e4f 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -20515,6 +20515,19 @@ } } }, + "com.github.openshift.api.config.v1.NetworkObservabilitySpec": { + "description": "NetworkObservabilitySpec defines the configuration for network observability installation", + "type": "object", + "required": [ + "installationPolicy" + ], + "properties": { + "installationPolicy": { + "description": "installationPolicy controls whether network observability is installed during cluster deployment. Valid values are \"InstallAndEnable\" and \"NoAction\". When set to \"InstallAndEnable\", ensure that network observability will be installed and enabled on the cluster. If already installed, no action taken, but if it gets uninstalled, it will install it again. When set to \"NoAction\", nothing will be done regarding Network observability.", + "type": "string" + } + } + }, "com.github.openshift.api.config.v1.NetworkSpec": { "description": "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.", "type": "object", @@ -20542,6 +20555,11 @@ "default": {}, "$ref": "#/definitions/com.github.openshift.api.config.v1.NetworkDiagnostics" }, + "networkObservability": { + "description": "networkObservability is an optional field that configures network observability installation during cluster deployment (day-0). When omitted, unless this is a SNO cluster, network observability will be installed if not already present, after that, no action taken.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.api.config.v1.NetworkObservabilitySpec" + }, "networkType": { "description": "networkType is the plugin that is to be deployed (e.g. OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OVNKubernetes This field is immutable after installation.", "type": "string", @@ -25111,14 +25129,6 @@ "type": "integer", "format": "int32" }, - "nodeSelector": { - "description": "nodeSelector defines the nodes on which the Pods are scheduled. nodeSelector is optional.\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default value is `kubernetes.io/os: linux`. When specified, nodeSelector must contain at least 1 entry and must not contain more than 10 entries.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, "resources": { "description": "resources defines the compute resource requests and limits for the node-exporter container. This includes CPU, memory and HugePages constraints to help control scheduling and resource usage. When not specified, defaults are used by the platform. Requests cannot exceed limits. This field is optional. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ This is a simplified API that maps to Kubernetes ResourceRequirements. The current default values are:\n resources:\n - name: cpu\n request: 8m\n limit: null\n - name: memory\n request: 32Mi\n limit: null", "type": "array", @@ -25130,15 +25140,6 @@ "name" ], "x-kubernetes-list-type": "map" - }, - "tolerations": { - "description": "tolerations defines tolerations for the pods. tolerations is optional.\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is to tolerate all taints (operator: Exists without any key), which is typical for DaemonSets that must run on every node. Maximum length for this list is 10. Minimum length for this list is 1.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/Toleration.v1.core.api.k8s.io" - }, - "x-kubernetes-list-type": "atomic" } } }, diff --git a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-Default.crd.yaml deleted file mode 100644 index a983664180f..00000000000 --- a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-Default.crd.yaml +++ /dev/null @@ -1,197 +0,0 @@ -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" - release.openshift.io/feature-set: Default - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-DevPreviewNoUpgrade.crd.yaml deleted file mode 100644 index 8d918545b29..00000000000 --- a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-DevPreviewNoUpgrade.crd.yaml +++ /dev/null @@ -1,328 +0,0 @@ -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" - release.openshift.io/feature-set: DevPreviewNoUpgrade - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - additionalArtifactStores: - description: |- - additionalArtifactStores configures additional read-only artifact storage locations for Open Container Initiative (OCI) artifacts. - - Artifacts are checked in order: additional stores first, then the default location (/var/lib/containers/storage/artifacts). - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default artifact location is used. - When specified, at least one store must be provided. - items: - description: AdditionalArtifactStore defines an additional read-only - storage location for Open Container Initiative (OCI) artifacts. - properties: - path: - description: |- - path specifies the absolute location of the additional artifact store. - The path must exist on the node before configuration is applied. - When an artifact is requested, artifacts found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalArtifactStores must not contain duplicate - paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalImageStores: - description: |- - additionalImageStores configures additional read-only container image store locations for Open Container Initiative (OCI) images. - - Images are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default image location is used. - When specified, at least one store must be provided. - items: - description: AdditionalImageStore defines an additional read-only - storage location for Open Container Initiative (OCI) images. - properties: - path: - description: |- - path specifies the absolute location of the additional image store. - The path must exist on the node before configuration is applied. - When a container image is requested, images found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalImageStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalLayerStores: - description: |- - additionalLayerStores configures additional read-only container image layer store locations for Open Container Initiative (OCI) images. - - Layers are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 5 stores allowed. - Each path must be unique. - - When omitted, only the default layer location is used. - When specified, at least one store must be provided. - items: - description: AdditionalLayerStore defines a read-only storage - location for Open Container Initiative (OCI) container image - layers. - properties: - path: - description: |- - path specifies the absolute location of the additional layer store. - The path must exist on the node before configuration is applied. - When a container image is requested, layers found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 5 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalLayerStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-OKD.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-OKD.crd.yaml deleted file mode 100644 index db82f1a1418..00000000000 --- a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-OKD.crd.yaml +++ /dev/null @@ -1,197 +0,0 @@ -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" - release.openshift.io/feature-set: OKD - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-TechPreviewNoUpgrade.crd.yaml deleted file mode 100644 index 27a0cb3c173..00000000000 --- a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-TechPreviewNoUpgrade.crd.yaml +++ /dev/null @@ -1,328 +0,0 @@ -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" - release.openshift.io/feature-set: TechPreviewNoUpgrade - 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. - - 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: spec contains the desired container runtime configuration. - properties: - containerRuntimeConfig: - description: containerRuntimeConfig defines the tuneables of the container - runtime. - properties: - additionalArtifactStores: - description: |- - additionalArtifactStores configures additional read-only artifact storage locations for Open Container Initiative (OCI) artifacts. - - Artifacts are checked in order: additional stores first, then the default location (/var/lib/containers/storage/artifacts). - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default artifact location is used. - When specified, at least one store must be provided. - items: - description: AdditionalArtifactStore defines an additional read-only - storage location for Open Container Initiative (OCI) artifacts. - properties: - path: - description: |- - path specifies the absolute location of the additional artifact store. - The path must exist on the node before configuration is applied. - When an artifact is requested, artifacts found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalArtifactStores must not contain duplicate - paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalImageStores: - description: |- - additionalImageStores configures additional read-only container image store locations for Open Container Initiative (OCI) images. - - Images are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 10 stores allowed. - Each path must be unique. - - When omitted, only the default image location is used. - When specified, at least one store must be provided. - items: - description: AdditionalImageStore defines an additional read-only - storage location for Open Container Initiative (OCI) images. - properties: - path: - description: |- - path specifies the absolute location of the additional image store. - The path must exist on the node before configuration is applied. - When a container image is requested, images found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 10 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalImageStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - additionalLayerStores: - description: |- - additionalLayerStores configures additional read-only container image layer store locations for Open Container Initiative (OCI) images. - - Layers are checked in order: additional stores first, then the default location. - Stores are read-only. - Maximum of 5 stores allowed. - Each path must be unique. - - When omitted, only the default layer location is used. - When specified, at least one store must be provided. - items: - description: AdditionalLayerStore defines a read-only storage - location for Open Container Initiative (OCI) container image - layers. - properties: - path: - description: |- - path specifies the absolute location of the additional layer store. - The path must exist on the node before configuration is applied. - When a container image is requested, layers found at this location will be used instead of - retrieving from the registry. - The path is required and must be between 1 and 256 characters long, begin with a forward slash, - and only contain the characters a-z, A-Z, 0-9, '/', '.', '_', and '-'. - Consecutive forward slashes are not permitted. - maxLength: 256 - minLength: 1 - type: string - x-kubernetes-validations: - - message: path must be absolute and contain only alphanumeric - characters, '/', '.', '_', and '-' - rule: self.matches('^/[a-zA-Z0-9/._-]+$') - - message: path must not contain consecutive forward slashes - rule: '!self.contains(''//'')' - required: - - path - type: object - maxItems: 5 - minItems: 1 - type: array - x-kubernetes-list-type: atomic - x-kubernetes-validations: - - message: additionalLayerStores must not contain duplicate paths - rule: self.all(x, self.exists_one(y, x.path == y.path)) - defaultRuntime: - description: |- - defaultRuntime is the name of the OCI runtime to be used as the default for containers. - Allowed values are `runc` and `crun`. - When set to `runc`, OpenShift will use runc to execute the container - When set to `crun`, OpenShift will use crun to execute the container - When omitted, this means no opinion and the platform is left to choose a reasonable default, - which is subject to change over time. Currently, the default is `crun`. - enum: - - crun - - runc - 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: status contains observed information about the container - runtime configuration. - 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: {} diff --git a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml similarity index 99% rename from payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-CustomNoUpgrade.crd.yaml rename to payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml index 68726d9ce15..a1c686ee5e1 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml @@ -6,7 +6,6 @@ metadata: api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: CustomNoUpgrade labels: openshift.io/operator-managed: "" name: containerruntimeconfigs.machineconfiguration.openshift.io diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index cc76fcf6894..2a91c3bee9a 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -32,9 +32,6 @@ { "name": "AWSServiceLBNetworkSecurityGroup" }, - { - "name": "AdditionalStorageConfig" - }, { "name": "AutomatedEtcdBackup" }, @@ -274,6 +271,9 @@ } ], "enabled": [ + { + "name": "AdditionalStorageConfig" + }, { "name": "AzureClusterHostedDNSInstall" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index cc297eee295..32371a6119a 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -34,9 +34,6 @@ { "name": "AWSServiceLBNetworkSecurityGroup" }, - { - "name": "AdditionalStorageConfig" - }, { "name": "AutomatedEtcdBackup" }, @@ -276,6 +273,9 @@ } ], "enabled": [ + { + "name": "AdditionalStorageConfig" + }, { "name": "AzureClusterHostedDNSInstall" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index c74894c2ff6..11f72dbefd8 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -29,9 +29,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AdditionalStorageConfig" - }, { "name": "AutomatedEtcdBackup" }, @@ -271,6 +268,9 @@ { "name": "AWSServiceLBNetworkSecurityGroup" }, + { + "name": "AdditionalStorageConfig" + }, { "name": "AzureClusterHostedDNSInstall" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 9c33c4dc09f..f264faf92ee 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -31,9 +31,6 @@ { "name": "AWSEuropeanSovereignCloudInstall" }, - { - "name": "AdditionalStorageConfig" - }, { "name": "AutomatedEtcdBackup" }, @@ -273,6 +270,9 @@ { "name": "AWSServiceLBNetworkSecurityGroup" }, + { + "name": "AdditionalStorageConfig" + }, { "name": "AzureClusterHostedDNSInstall" },