diff --git a/config/v1/manual-override-crd-manifests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml b/config/v1/manual-override-crd-manifests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml deleted file mode 100644 index 13b038ac942..00000000000 --- a/config/v1/manual-override-crd-manifests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml +++ /dev/null @@ -1,205 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - feature-gate.release.openshift.io/CRIOCredentialProviderConfig: "true" - name: criocredentialproviderconfigs.config.openshift.io -spec: - versions: - - name: v1 - storage: false - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is "cluster". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. - For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. - CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. - Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout. - - The resource is a singleton named "cluster". - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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 defines the desired configuration of the CRI-O Credential Provider. - This field is required and must be provided when creating the resource. - minProperties: 0 - properties: - matchImages: - description: |- - matchImages is a list of string patterns used to determine whether - the CRI-O credential provider should be invoked for a given image. This list is - passed to the kubelet CredentialProviderConfig, and if any pattern matches - the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling - that image or its mirrors. - Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. - Conflicts between the existing platform specific provider image match configuration and this list will be handled by - the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those - from the CRIOCredentialProviderConfig when both match the same image. - To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with - existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). - You can check the resource's Status conditions - to see if any entries were ignored due to exact matches with known built-in provider patterns. - - This field is optional, the items of the list must contain between 1 and 50 entries. - The list is treated as a set, so duplicate entries are not allowed. - - For more details, see: - https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ - https://github.com/cri-o/crio-credential-provider#architecture - - Each entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. - Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', - and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). - A global wildcard '*' (matching any domain) is not allowed. - Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. - For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. - Each wildcard matches only a single domain label, - so '*.io' does **not** match '*.k8s.io'. - - A match exists between an image and a matchImage when all of the below are true: - Both contain the same number of domain parts and each part matches. - The URL path of an matchImages must be a prefix of the target image URL path. - If the matchImages contains a port, then the port must match in the image as well. - - Example values of matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - *.azurecr.io - - gcr.io - - *.*.registry.io - - registry.io:8080/path - items: - description: |- - MatchImage is a string pattern used to match container image registry addresses. - It must be a valid fully qualified domain name with optional wildcard, port, and path. - The maximum length is 512 characters. - - Wildcards ('*') are supported for full subdomain labels and top-level domains. - Each entry can optionally contain a port (e.g., :8080) and a path (e.g., /path). - Wildcards are not allowed in the port or path portions. - - Examples: - - "registry.io" - matches exactly registry.io - - "*.azurecr.io" - matches any single subdomain of azurecr.io - - "registry.io:8080/path" - matches with specific port and path prefix - maxLength: 512 - minLength: 1 - type: string - x-kubernetes-validations: - - message: global wildcard '*' is not allowed - rule: self != '*' - - message: invalid matchImages value, must be a valid fully qualified - domain name in lowercase with optional wildcard, port, and path - rule: self.matches('^((\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?)(\\.(\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?))*)(:[0-9]+)?(/[-a-z0-9._/]*)?$') - maxItems: 50 - minItems: 1 - type: array - x-kubernetes-list-type: set - type: object - status: - description: |- - status represents the current state of the CRIOCredentialProviderConfig. - When omitted or nil, it indicates that the status has not yet been set by the controller. - The controller will populate this field with validation conditions and operational state. - minProperties: 1 - properties: - conditions: - description: |- - conditions represent the latest available observations of the configuration state. - When omitted, it indicates that no conditions have been reported yet. - The maximum number of conditions is 16. - Conditions are stored as a map keyed by condition type, ensuring uniqueness. - - Expected condition types include: - "Validated": indicates whether the matchImages configuration is valid - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - maxItems: 16 - minItems: 1 - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - type: object - required: - - spec - type: object - x-kubernetes-validations: - - message: criocredentialproviderconfig is a singleton, .metadata.name must - be 'cluster' - rule: self.metadata.name == 'cluster' - served: true - storage: true - subresources: - status: {} diff --git a/config/v1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml b/config/v1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml index 4e0d5c34e55..efcbbb51bdd 100644 --- a/config/v1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml +++ b/config/v1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml @@ -1,7 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this name: "CRIOCredentialProviderConfig" crdName: "criocredentialproviderconfigs.config.openshift.io" -version: v1 featureGates: - CRIOCredentialProviderConfig tests: diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml index 7a720440acc..6650d1cf94b 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.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,DevPreviewNoUpgrade,TechPreviewNoUpgrade name: criocredentialproviderconfigs.config.openshift.io spec: group: config.openshift.io @@ -209,201 +208,6 @@ spec: be 'cluster' rule: self.metadata.name == 'cluster' served: true - storage: false - subresources: - status: {} - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is "cluster". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. - For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. - CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. - Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout. - - The resource is a singleton named "cluster". - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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 defines the desired configuration of the CRI-O Credential Provider. - This field is required and must be provided when creating the resource. - minProperties: 0 - properties: - matchImages: - description: |- - matchImages is a list of string patterns used to determine whether - the CRI-O credential provider should be invoked for a given image. This list is - passed to the kubelet CredentialProviderConfig, and if any pattern matches - the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling - that image or its mirrors. - Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. - Conflicts between the existing platform specific provider image match configuration and this list will be handled by - the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those - from the CRIOCredentialProviderConfig when both match the same image. - To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with - existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). - You can check the resource's Status conditions - to see if any entries were ignored due to exact matches with known built-in provider patterns. - - This field is optional, the items of the list must contain between 1 and 50 entries. - The list is treated as a set, so duplicate entries are not allowed. - - For more details, see: - https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ - https://github.com/cri-o/crio-credential-provider#architecture - - Each entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. - Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', - and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). - A global wildcard '*' (matching any domain) is not allowed. - Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. - For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. - Each wildcard matches only a single domain label, - so '*.io' does **not** match '*.k8s.io'. - - A match exists between an image and a matchImage when all of the below are true: - Both contain the same number of domain parts and each part matches. - The URL path of an matchImages must be a prefix of the target image URL path. - If the matchImages contains a port, then the port must match in the image as well. - - Example values of matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - *.azurecr.io - - gcr.io - - *.*.registry.io - - registry.io:8080/path - items: - description: |- - MatchImage is a string pattern used to match container image registry addresses. - It must be a valid fully qualified domain name with optional wildcard, port, and path. - The maximum length is 512 characters. - - Wildcards ('*') are supported for full subdomain labels and top-level domains. - Each entry can optionally contain a port (e.g., :8080) and a path (e.g., /path). - Wildcards are not allowed in the port or path portions. - - Examples: - - "registry.io" - matches exactly registry.io - - "*.azurecr.io" - matches any single subdomain of azurecr.io - - "registry.io:8080/path" - matches with specific port and path prefix - maxLength: 512 - minLength: 1 - type: string - x-kubernetes-validations: - - message: global wildcard '*' is not allowed - rule: self != '*' - - message: invalid matchImages value, must be a valid fully qualified - domain name in lowercase with optional wildcard, port, and path - rule: self.matches('^((\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?)(\\.(\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?))*)(:[0-9]+)?(/[-a-z0-9._/]*)?$') - maxItems: 50 - minItems: 1 - type: array - x-kubernetes-list-type: set - type: object - status: - description: |- - status represents the current state of the CRIOCredentialProviderConfig. - When omitted or nil, it indicates that the status has not yet been set by the controller. - The controller will populate this field with validation conditions and operational state. - minProperties: 1 - properties: - conditions: - description: |- - conditions represent the latest available observations of the configuration state. - When omitted, it indicates that no conditions have been reported yet. - The maximum number of conditions is 16. - Conditions are stored as a map keyed by condition type, ensuring uniqueness. - - Expected condition types include: - "Validated": indicates whether the matchImages configuration is valid - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - maxItems: 16 - minItems: 1 - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - type: object - required: - - spec - type: object - x-kubernetes-validations: - - message: criocredentialproviderconfig is a singleton, .metadata.name must - be 'cluster' - rule: self.metadata.name == 'cluster' - served: true storage: true subresources: status: {} diff --git a/config/v1alpha1/register.go b/config/v1alpha1/register.go index 1d84b710792..364dc7a7d84 100644 --- a/config/v1alpha1/register.go +++ b/config/v1alpha1/register.go @@ -36,8 +36,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &InsightsDataGatherList{}, &Backup{}, &BackupList{}, - &CRIOCredentialProviderConfig{}, - &CRIOCredentialProviderConfigList{}, &PKI{}, &PKIList{}, ) diff --git a/config/v1alpha1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml b/config/v1alpha1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml deleted file mode 100644 index 63672a7490a..00000000000 --- a/config/v1alpha1/tests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml +++ /dev/null @@ -1,105 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this -name: "CRIOCredentialProviderConfig" -crdName: "criocredentialproviderconfigs.config.openshift.io" -featureGates: - - CRIOCredentialProviderConfig -tests: - onCreate: - - name: Should create a minimal CRIOCredentialProviderConfig - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: {} - expected: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: {} - - name: Should create a valid CRIOCredentialProviderConfig - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - "*.azurecr.io" - - gcr.io - - "*.*.registry.io" - - registry.io:8080/path - expected: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - "*.azurecr.io" - - gcr.io - - "*.*.registry.io" - - registry.io:8080/path - - name: Should reject matchImages with invalid characters - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - "reg!stry.io" - expectedError: "spec.matchImages[0]: Invalid value: \"string\": invalid matchImages value, must be a valid fully qualified domain name in lowercase with optional wildcard, port, and path" - - name: Should reject matchImages with uppercase hostname - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - "Registry.COM" - expectedError: "spec.matchImages[0]: Invalid value: \"string\": invalid matchImages value, must be a valid fully qualified domain name in lowercase with optional wildcard, port, and path" - - name: Should reject matchImages with uppercase in the path - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - "registry.io/PaTh" - expectedError: "spec.matchImages[0]: Invalid value: \"string\": invalid matchImages value, must be a valid fully qualified domain name in lowercase with optional wildcard, port, and path" - - name: Should reject matchImages wildcard in the path - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - "registry.io:8080/pa*th" - expectedError: "spec.matchImages[0]: Invalid value: \"string\": invalid matchImages value, must be a valid fully qualified domain name in lowercase with optional wildcard, port, and path" - - name: Should reject wildcard for partial subdomains - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - "example.app*.com" - expectedError: "spec.matchImages[0]: Invalid value: \"string\": invalid matchImages value, must be a valid fully qualified domain name in lowercase with optional wildcard, port, and path" - - name: Should reject global wildcard '*' - initial: | - apiVersion: config.openshift.io/v1alpha1 - kind: CRIOCredentialProviderConfig - metadata: - name: cluster - spec: - matchImages: - - "*" - expectedError: "spec.matchImages[0]: Invalid value: \"string\": global wildcard '*' is not allowed" diff --git a/config/v1alpha1/types_crio_credential_provider_config.go b/config/v1alpha1/types_crio_credential_provider_config.go deleted file mode 100644 index 9e2e0d39d28..00000000000 --- a/config/v1alpha1/types_crio_credential_provider_config.go +++ /dev/null @@ -1,186 +0,0 @@ -package v1alpha1 - -import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - -// +genclient -// +genclient:nonNamespaced -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is "cluster". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. -// For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. -// CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. -// Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout. -// -// The resource is a singleton named "cluster". -// -// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. -// +kubebuilder:object:root=true -// +kubebuilder:resource:path=criocredentialproviderconfigs,scope=Cluster -// +kubebuilder:subresource:status -// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2557 -// +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01 -// +openshift:enable:FeatureGate=CRIOCredentialProviderConfig -// +openshift:compatibility-gen:level=4 -// +kubebuilder:validation:XValidation:rule="self.metadata.name == 'cluster'",message="criocredentialproviderconfig is a singleton, .metadata.name must be 'cluster'" -type CRIOCredentialProviderConfig struct { - metav1.TypeMeta `json:",inline"` - - // metadata is the standard object's metadata. - // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata - // +optional - metav1.ObjectMeta `json:"metadata,omitzero"` - - // spec defines the desired configuration of the CRI-O Credential Provider. - // This field is required and must be provided when creating the resource. - // +required - Spec *CRIOCredentialProviderConfigSpec `json:"spec,omitempty,omitzero"` - - // status represents the current state of the CRIOCredentialProviderConfig. - // When omitted or nil, it indicates that the status has not yet been set by the controller. - // The controller will populate this field with validation conditions and operational state. - // +optional - Status CRIOCredentialProviderConfigStatus `json:"status,omitzero,omitempty"` -} - -// CRIOCredentialProviderConfigSpec defines the desired configuration of the CRI-O Credential Provider. -// +kubebuilder:validation:MinProperties=0 -type CRIOCredentialProviderConfigSpec struct { - // matchImages is a list of string patterns used to determine whether - // the CRI-O credential provider should be invoked for a given image. This list is - // passed to the kubelet CredentialProviderConfig, and if any pattern matches - // the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling - // that image or its mirrors. - // Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. - // Conflicts between the existing platform specific provider image match configuration and this list will be handled by - // the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those - // from the CRIOCredentialProviderConfig when both match the same image. - // To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with - // existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). - // You can check the resource's Status conditions - // to see if any entries were ignored due to exact matches with known built-in provider patterns. - // - // This field is optional, the items of the list must contain between 1 and 50 entries. - // The list is treated as a set, so duplicate entries are not allowed. - // - // For more details, see: - // https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ - // https://github.com/cri-o/crio-credential-provider#architecture - // - // Each entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. - // Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', - // and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). - // A global wildcard '*' (matching any domain) is not allowed. - // Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. - // For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. - // Each wildcard matches only a single domain label, - // so '*.io' does **not** match '*.k8s.io'. - // - // A match exists between an image and a matchImage when all of the below are true: - // Both contain the same number of domain parts and each part matches. - // The URL path of an matchImages must be a prefix of the target image URL path. - // If the matchImages contains a port, then the port must match in the image as well. - // - // Example values of matchImages: - // - 123456789.dkr.ecr.us-east-1.amazonaws.com - // - *.azurecr.io - // - gcr.io - // - *.*.registry.io - // - registry.io:8080/path - // - // +kubebuilder:validation:MaxItems=50 - // +kubebuilder:validation:MinItems=1 - // +listType=set - // +optional - MatchImages []MatchImage `json:"matchImages,omitempty"` -} - -// MatchImage is a string pattern used to match container image registry addresses. -// It must be a valid fully qualified domain name with optional wildcard, port, and path. -// The maximum length is 512 characters. -// -// Wildcards ('*') are supported for full subdomain labels and top-level domains. -// Each entry can optionally contain a port (e.g., :8080) and a path (e.g., /path). -// Wildcards are not allowed in the port or path portions. -// -// Examples: -// - "registry.io" - matches exactly registry.io -// - "*.azurecr.io" - matches any single subdomain of azurecr.io -// - "registry.io:8080/path" - matches with specific port and path prefix -// -// +kubebuilder:validation:MaxLength=512 -// +kubebuilder:validation:MinLength=1 -// +kubebuilder:validation:XValidation:rule="self != '*'",message="global wildcard '*' is not allowed" -// +kubebuilder:validation:XValidation:rule=`self.matches('^((\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?)(\\.(\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?))*)(:[0-9]+)?(/[-a-z0-9._/]*)?$')`,message="invalid matchImages value, must be a valid fully qualified domain name in lowercase with optional wildcard, port, and path" -type MatchImage string - -// +k8s:deepcopy-gen=true -// CRIOCredentialProviderConfigStatus defines the observed state of CRIOCredentialProviderConfig -// +kubebuilder:validation:MinProperties=1 -type CRIOCredentialProviderConfigStatus struct { - // conditions represent the latest available observations of the configuration state. - // When omitted, it indicates that no conditions have been reported yet. - // The maximum number of conditions is 16. - // Conditions are stored as a map keyed by condition type, ensuring uniqueness. - // - // Expected condition types include: - // "Validated": indicates whether the matchImages configuration is valid - // +optional - // +kubebuilder:validation:MaxItems=16 - // +kubebuilder:validation:MinItems=1 - // +listType=map - // +listMapKey=type - Conditions []metav1.Condition `json:"conditions,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// CRIOCredentialProviderConfigList contains a list of CRIOCredentialProviderConfig resources -// -// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. -// +openshift:compatibility-gen:level=4 -type CRIOCredentialProviderConfigList struct { - metav1.TypeMeta `json:",inline"` - - // metadata is the standard list's metadata. - // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata - metav1.ListMeta `json:"metadata"` - - Items []CRIOCredentialProviderConfig `json:"items"` -} - -const ( - // ConditionTypeValidated is a condition type that indicates whether the CRIOCredentialProviderConfig - // matchImages configuration has been validated successfully. - // When True, all matchImage patterns are valid and have been applied. - // When False, the configuration contains errors (see Reason for details). - // Possible reasons for False status: - // - ValidationFailed: matchImages contains invalid patterns - // - ConfigurationPartiallyApplied: some matchImage entries were ignored due to conflicts - ConditionTypeValidated = "Validated" - - // ReasonValidationFailed is a condition reason used with ConditionTypeValidated=False - // to indicate that the matchImages configuration contains one or more invalid registry patterns - // that do not conform to the required format (valid FQDN with optional wildcard, port, and path). - ReasonValidationFailed = "ValidationFailed" - - // ReasonConfigurationPartiallyApplied is a condition reason used with ConditionTypeValidated=False - // to indicate that some matchImage entries were ignored due to conflicts or overlapping patterns. - // The condition message will contain details about which entries were ignored and why. - ReasonConfigurationPartiallyApplied = "ConfigurationPartiallyApplied" - - // ConditionTypeMachineConfigRendered is a condition type that indicates whether - // the CRIOCredentialProviderConfig has been successfully rendered into a - // MachineConfig object. - // When True, the corresponding MachineConfig is present in the cluster. - // When False, rendering failed. - ConditionTypeMachineConfigRendered = "MachineConfigRendered" - - // ReasonMachineConfigRenderingSucceeded is a condition reason used with ConditionTypeMachineConfigRendered=True - // to indicate that the MachineConfig was successfully created/updated in the API server. - ReasonMachineConfigRenderingSucceeded = "MachineConfigRenderingSucceeded" - - // ReasonMachineConfigRenderingFailed is a condition reason used with ConditionTypeMachineConfigRendered=False - // to indicate that the MachineConfig creation/update failed. - // The condition message will contain details about the failure. - ReasonMachineConfigRenderingFailed = "MachineConfigRenderingFailed" -) diff --git a/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml b/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml deleted file mode 100644 index 0e12b8cc45b..00000000000 --- a/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml +++ /dev/null @@ -1,214 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2557 - 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,DevPreviewNoUpgrade,TechPreviewNoUpgrade - name: criocredentialproviderconfigs.config.openshift.io -spec: - group: config.openshift.io - names: - kind: CRIOCredentialProviderConfig - listKind: CRIOCredentialProviderConfigList - plural: criocredentialproviderconfigs - singular: criocredentialproviderconfig - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is "cluster". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. - For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. - CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. - Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout. - - The resource is a singleton named "cluster". - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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 defines the desired configuration of the CRI-O Credential Provider. - This field is required and must be provided when creating the resource. - minProperties: 0 - properties: - matchImages: - description: |- - matchImages is a list of string patterns used to determine whether - the CRI-O credential provider should be invoked for a given image. This list is - passed to the kubelet CredentialProviderConfig, and if any pattern matches - the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling - that image or its mirrors. - Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. - Conflicts between the existing platform specific provider image match configuration and this list will be handled by - the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those - from the CRIOCredentialProviderConfig when both match the same image. - To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with - existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). - You can check the resource's Status conditions - to see if any entries were ignored due to exact matches with known built-in provider patterns. - - This field is optional, the items of the list must contain between 1 and 50 entries. - The list is treated as a set, so duplicate entries are not allowed. - - For more details, see: - https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ - https://github.com/cri-o/crio-credential-provider#architecture - - Each entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. - Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', - and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). - A global wildcard '*' (matching any domain) is not allowed. - Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. - For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. - Each wildcard matches only a single domain label, - so '*.io' does **not** match '*.k8s.io'. - - A match exists between an image and a matchImage when all of the below are true: - Both contain the same number of domain parts and each part matches. - The URL path of an matchImages must be a prefix of the target image URL path. - If the matchImages contains a port, then the port must match in the image as well. - - Example values of matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - *.azurecr.io - - gcr.io - - *.*.registry.io - - registry.io:8080/path - items: - description: |- - MatchImage is a string pattern used to match container image registry addresses. - It must be a valid fully qualified domain name with optional wildcard, port, and path. - The maximum length is 512 characters. - - Wildcards ('*') are supported for full subdomain labels and top-level domains. - Each entry can optionally contain a port (e.g., :8080) and a path (e.g., /path). - Wildcards are not allowed in the port or path portions. - - Examples: - - "registry.io" - matches exactly registry.io - - "*.azurecr.io" - matches any single subdomain of azurecr.io - - "registry.io:8080/path" - matches with specific port and path prefix - maxLength: 512 - minLength: 1 - type: string - x-kubernetes-validations: - - message: global wildcard '*' is not allowed - rule: self != '*' - - message: invalid matchImages value, must be a valid fully qualified - domain name in lowercase with optional wildcard, port, and path - rule: self.matches('^((\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?)(\\.(\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?))*)(:[0-9]+)?(/[-a-z0-9._/]*)?$') - maxItems: 50 - minItems: 1 - type: array - x-kubernetes-list-type: set - type: object - status: - description: |- - status represents the current state of the CRIOCredentialProviderConfig. - When omitted or nil, it indicates that the status has not yet been set by the controller. - The controller will populate this field with validation conditions and operational state. - minProperties: 1 - properties: - conditions: - description: |- - conditions represent the latest available observations of the configuration state. - When omitted, it indicates that no conditions have been reported yet. - The maximum number of conditions is 16. - Conditions are stored as a map keyed by condition type, ensuring uniqueness. - - Expected condition types include: - "Validated": indicates whether the matchImages configuration is valid - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - maxItems: 16 - minItems: 1 - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - type: object - required: - - spec - type: object - x-kubernetes-validations: - - message: criocredentialproviderconfig is a singleton, .metadata.name must - be 'cluster' - rule: self.metadata.name == 'cluster' - served: true - storage: true - subresources: - status: {} diff --git a/config/v1alpha1/zz_generated.deepcopy.go b/config/v1alpha1/zz_generated.deepcopy.go index 12dd0cd3127..89ae11fb4d1 100644 --- a/config/v1alpha1/zz_generated.deepcopy.go +++ b/config/v1alpha1/zz_generated.deepcopy.go @@ -7,7 +7,6 @@ package v1alpha1 import ( v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -250,115 +249,6 @@ func (in *BasicAuth) DeepCopy() *BasicAuth { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CRIOCredentialProviderConfig) DeepCopyInto(out *CRIOCredentialProviderConfig) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - if in.Spec != nil { - in, out := &in.Spec, &out.Spec - *out = new(CRIOCredentialProviderConfigSpec) - (*in).DeepCopyInto(*out) - } - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CRIOCredentialProviderConfig. -func (in *CRIOCredentialProviderConfig) DeepCopy() *CRIOCredentialProviderConfig { - if in == nil { - return nil - } - out := new(CRIOCredentialProviderConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *CRIOCredentialProviderConfig) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CRIOCredentialProviderConfigList) DeepCopyInto(out *CRIOCredentialProviderConfigList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CRIOCredentialProviderConfig, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CRIOCredentialProviderConfigList. -func (in *CRIOCredentialProviderConfigList) DeepCopy() *CRIOCredentialProviderConfigList { - if in == nil { - return nil - } - out := new(CRIOCredentialProviderConfigList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *CRIOCredentialProviderConfigList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CRIOCredentialProviderConfigSpec) DeepCopyInto(out *CRIOCredentialProviderConfigSpec) { - *out = *in - if in.MatchImages != nil { - in, out := &in.MatchImages, &out.MatchImages - *out = make([]MatchImage, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CRIOCredentialProviderConfigSpec. -func (in *CRIOCredentialProviderConfigSpec) DeepCopy() *CRIOCredentialProviderConfigSpec { - if in == nil { - return nil - } - out := new(CRIOCredentialProviderConfigSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CRIOCredentialProviderConfigStatus) DeepCopyInto(out *CRIOCredentialProviderConfigStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]metav1.Condition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CRIOCredentialProviderConfigStatus. -func (in *CRIOCredentialProviderConfigStatus) DeepCopy() *CRIOCredentialProviderConfigStatus { - if in == nil { - return nil - } - out := new(CRIOCredentialProviderConfigStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CertificateConfig) DeepCopyInto(out *CertificateConfig) { *out = *in diff --git a/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml index b2a12419377..651776cc15d 100644 --- a/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml +++ b/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml @@ -21,29 +21,6 @@ backups.config.openshift.io: - AutomatedEtcdBackup Version: v1alpha1 -criocredentialproviderconfigs.config.openshift.io: - Annotations: {} - ApprovedPRNumber: https://github.com/openshift/api/pull/2557 - CRDName: criocredentialproviderconfigs.config.openshift.io - Capability: "" - Category: "" - FeatureGates: - - CRIOCredentialProviderConfig - FilenameOperatorName: config-operator - FilenameOperatorOrdering: "01" - FilenameRunLevel: "0000_10" - GroupName: config.openshift.io - HasStatus: true - KindName: CRIOCredentialProviderConfig - Labels: {} - PluralName: criocredentialproviderconfigs - PrinterColumns: [] - Scope: Cluster - ShortNames: null - TopLevelFeatureGates: - - CRIOCredentialProviderConfig - Version: v1alpha1 - clustermonitorings.config.openshift.io: Annotations: description: Cluster Monitoring Operators configuration API diff --git a/config/v1alpha1/zz_generated.featuregated-crd-manifests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml b/config/v1alpha1/zz_generated.featuregated-crd-manifests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml deleted file mode 100644 index 9b2a39e020c..00000000000 --- a/config/v1alpha1/zz_generated.featuregated-crd-manifests/criocredentialproviderconfigs.config.openshift.io/CRIOCredentialProviderConfig.yaml +++ /dev/null @@ -1,214 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2557 - api.openshift.io/filename-cvo-runlevel: "0000_10" - api.openshift.io/filename-operator: config-operator - api.openshift.io/filename-ordering: "01" - feature-gate.release.openshift.io/CRIOCredentialProviderConfig: "true" - name: criocredentialproviderconfigs.config.openshift.io -spec: - group: config.openshift.io - names: - kind: CRIOCredentialProviderConfig - listKind: CRIOCredentialProviderConfigList - plural: criocredentialproviderconfigs - singular: criocredentialproviderconfig - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is "cluster". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. - For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. - CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. - Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout. - - The resource is a singleton named "cluster". - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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 defines the desired configuration of the CRI-O Credential Provider. - This field is required and must be provided when creating the resource. - minProperties: 0 - properties: - matchImages: - description: |- - matchImages is a list of string patterns used to determine whether - the CRI-O credential provider should be invoked for a given image. This list is - passed to the kubelet CredentialProviderConfig, and if any pattern matches - the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling - that image or its mirrors. - Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. - Conflicts between the existing platform specific provider image match configuration and this list will be handled by - the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those - from the CRIOCredentialProviderConfig when both match the same image. - To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with - existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). - You can check the resource's Status conditions - to see if any entries were ignored due to exact matches with known built-in provider patterns. - - This field is optional, the items of the list must contain between 1 and 50 entries. - The list is treated as a set, so duplicate entries are not allowed. - - For more details, see: - https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ - https://github.com/cri-o/crio-credential-provider#architecture - - Each entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. - Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', - and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). - A global wildcard '*' (matching any domain) is not allowed. - Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. - For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. - Each wildcard matches only a single domain label, - so '*.io' does **not** match '*.k8s.io'. - - A match exists between an image and a matchImage when all of the below are true: - Both contain the same number of domain parts and each part matches. - The URL path of an matchImages must be a prefix of the target image URL path. - If the matchImages contains a port, then the port must match in the image as well. - - Example values of matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - *.azurecr.io - - gcr.io - - *.*.registry.io - - registry.io:8080/path - items: - description: |- - MatchImage is a string pattern used to match container image registry addresses. - It must be a valid fully qualified domain name with optional wildcard, port, and path. - The maximum length is 512 characters. - - Wildcards ('*') are supported for full subdomain labels and top-level domains. - Each entry can optionally contain a port (e.g., :8080) and a path (e.g., /path). - Wildcards are not allowed in the port or path portions. - - Examples: - - "registry.io" - matches exactly registry.io - - "*.azurecr.io" - matches any single subdomain of azurecr.io - - "registry.io:8080/path" - matches with specific port and path prefix - maxLength: 512 - minLength: 1 - type: string - x-kubernetes-validations: - - message: global wildcard '*' is not allowed - rule: self != '*' - - message: invalid matchImages value, must be a valid fully qualified - domain name in lowercase with optional wildcard, port, and path - rule: self.matches('^((\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?)(\\.(\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?))*)(:[0-9]+)?(/[-a-z0-9._/]*)?$') - maxItems: 50 - minItems: 1 - type: array - x-kubernetes-list-type: set - type: object - status: - description: |- - status represents the current state of the CRIOCredentialProviderConfig. - When omitted or nil, it indicates that the status has not yet been set by the controller. - The controller will populate this field with validation conditions and operational state. - minProperties: 1 - properties: - conditions: - description: |- - conditions represent the latest available observations of the configuration state. - When omitted, it indicates that no conditions have been reported yet. - The maximum number of conditions is 16. - Conditions are stored as a map keyed by condition type, ensuring uniqueness. - - Expected condition types include: - "Validated": indicates whether the matchImages configuration is valid - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - maxItems: 16 - minItems: 1 - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - type: object - required: - - spec - type: object - x-kubernetes-validations: - - message: criocredentialproviderconfig is a singleton, .metadata.name must - be 'cluster' - rule: self.metadata.name == 'cluster' - served: true - storage: true - subresources: - status: {} diff --git a/config/v1alpha1/zz_generated.model_name.go b/config/v1alpha1/zz_generated.model_name.go index 36a7803bf2f..98ed39edb51 100644 --- a/config/v1alpha1/zz_generated.model_name.go +++ b/config/v1alpha1/zz_generated.model_name.go @@ -55,26 +55,6 @@ func (in BasicAuth) OpenAPIModelName() string { return "com.github.openshift.api.config.v1alpha1.BasicAuth" } -// OpenAPIModelName returns the OpenAPI model name for this type. -func (in CRIOCredentialProviderConfig) OpenAPIModelName() string { - return "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfig" -} - -// OpenAPIModelName returns the OpenAPI model name for this type. -func (in CRIOCredentialProviderConfigList) OpenAPIModelName() string { - return "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigList" -} - -// OpenAPIModelName returns the OpenAPI model name for this type. -func (in CRIOCredentialProviderConfigSpec) OpenAPIModelName() string { - return "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigSpec" -} - -// OpenAPIModelName returns the OpenAPI model name for this type. -func (in CRIOCredentialProviderConfigStatus) OpenAPIModelName() string { - return "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigStatus" -} - // OpenAPIModelName returns the OpenAPI model name for this type. func (in CertificateConfig) OpenAPIModelName() string { return "com.github.openshift.api.config.v1alpha1.CertificateConfig" diff --git a/config/v1alpha1/zz_generated.swagger_doc_generated.go b/config/v1alpha1/zz_generated.swagger_doc_generated.go index 8f6cda1915a..443c05730e2 100644 --- a/config/v1alpha1/zz_generated.swagger_doc_generated.go +++ b/config/v1alpha1/zz_generated.swagger_doc_generated.go @@ -760,44 +760,6 @@ func (UserDefinedMonitoring) SwaggerDoc() map[string]string { return map_UserDefinedMonitoring } -var map_CRIOCredentialProviderConfig = map[string]string{ - "": "CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is \"cluster\". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout.\n\nThe resource is a singleton named \"cluster\".\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "metadata": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "spec": "spec defines the desired configuration of the CRI-O Credential Provider. This field is required and must be provided when creating the resource.", - "status": "status represents the current state of the CRIOCredentialProviderConfig. When omitted or nil, it indicates that the status has not yet been set by the controller. The controller will populate this field with validation conditions and operational state.", -} - -func (CRIOCredentialProviderConfig) SwaggerDoc() map[string]string { - return map_CRIOCredentialProviderConfig -} - -var map_CRIOCredentialProviderConfigList = map[string]string{ - "": "CRIOCredentialProviderConfigList contains a list of CRIOCredentialProviderConfig resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "metadata": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", -} - -func (CRIOCredentialProviderConfigList) SwaggerDoc() map[string]string { - return map_CRIOCredentialProviderConfigList -} - -var map_CRIOCredentialProviderConfigSpec = map[string]string{ - "": "CRIOCredentialProviderConfigSpec defines the desired configuration of the CRI-O Credential Provider.", - "matchImages": "matchImages is a list of string patterns used to determine whether the CRI-O credential provider should be invoked for a given image. This list is passed to the kubelet CredentialProviderConfig, and if any pattern matches the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling that image or its mirrors. Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. Conflicts between the existing platform specific provider image match configuration and this list will be handled by the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those from the CRIOCredentialProviderConfig when both match the same image. To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). You can check the resource's Status conditions to see if any entries were ignored due to exact matches with known built-in provider patterns.\n\nThis field is optional, the items of the list must contain between 1 and 50 entries. The list is treated as a set, so duplicate entries are not allowed.\n\nFor more details, see: https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ https://github.com/cri-o/crio-credential-provider#architecture\n\nEach entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). A global wildcard '*' (matching any domain) is not allowed. Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. Each wildcard matches only a single domain label, so '*.io' does **not** match '*.k8s.io'.\n\nA match exists between an image and a matchImage when all of the below are true: Both contain the same number of domain parts and each part matches. The URL path of an matchImages must be a prefix of the target image URL path. If the matchImages contains a port, then the port must match in the image as well.\n\nExample values of matchImages: - 123456789.dkr.ecr.us-east-1.amazonaws.com - *.azurecr.io - gcr.io - *.*.registry.io - registry.io:8080/path", -} - -func (CRIOCredentialProviderConfigSpec) SwaggerDoc() map[string]string { - return map_CRIOCredentialProviderConfigSpec -} - -var map_CRIOCredentialProviderConfigStatus = map[string]string{ - "": "CRIOCredentialProviderConfigStatus defines the observed state of CRIOCredentialProviderConfig", - "conditions": "conditions represent the latest available observations of the configuration state. When omitted, it indicates that no conditions have been reported yet. The maximum number of conditions is 16. Conditions are stored as a map keyed by condition type, ensuring uniqueness.\n\nExpected condition types include: \"Validated\": indicates whether the matchImages configuration is valid", -} - -func (CRIOCredentialProviderConfigStatus) SwaggerDoc() map[string]string { - return map_CRIOCredentialProviderConfigStatus -} - var map_GatherConfig = map[string]string{ "": "gatherConfig provides data gathering configuration options.", "dataPolicy": "dataPolicy allows user to enable additional global obfuscation of the IP addresses and base domain in the Insights archive data. Valid values are \"None\" and \"ObfuscateNetworking\". When set to None the data is not obfuscated. When set to ObfuscateNetworking the IP addresses and the cluster domain name are obfuscated. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.", diff --git a/features.md b/features.md index c78d402696a..767b86d430b 100644 --- a/features.md +++ b/features.md @@ -40,7 +40,6 @@ | BootcNodeManagement| | | Enabled | Enabled | | | Enabled | Enabled | | CBORServingAndStorage| | | Enabled | Enabled | | | Enabled | Enabled | | CRDCompatibilityRequirementOperator| | | Enabled | Enabled | | | Enabled | Enabled | -| CRIOCredentialProviderConfig| | | Enabled | Enabled | | | Enabled | Enabled | | ClientsPreferCBOR| | | Enabled | Enabled | | | Enabled | Enabled | | ClusterAPIInstallIBMCloud| | | Enabled | Enabled | | | Enabled | Enabled | | ClusterAPIMachineManagement| | | Enabled | Enabled | | | Enabled | Enabled | @@ -100,6 +99,7 @@ | AzureWorkloadIdentity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BootImageSkewEnforcement| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BuildCSIVolumes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| CRIOCredentialProviderConfig| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | DualReplica| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | EVPN| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | EventTTL| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index b45bef77056..b2a548d9e5b 100644 --- a/features/features.go +++ b/features/features.go @@ -159,7 +159,7 @@ var ( contactPerson("QiWang"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1861"). - enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). mustRegister() FeatureGateVSphereHostVMGroupZonal = newFeatureGate("VSphereHostVMGroupZonal"). diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 636966aeec1..1be271278e8 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -524,10 +524,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA configv1alpha1.BackupSpec{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_BackupSpec(ref), configv1alpha1.BackupStatus{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_BackupStatus(ref), configv1alpha1.BasicAuth{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_BasicAuth(ref), - configv1alpha1.CRIOCredentialProviderConfig{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfig(ref), - configv1alpha1.CRIOCredentialProviderConfigList{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfigList(ref), - configv1alpha1.CRIOCredentialProviderConfigSpec{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfigSpec(ref), - configv1alpha1.CRIOCredentialProviderConfigStatus{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfigStatus(ref), configv1alpha1.CertificateConfig{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_CertificateConfig(ref), configv1alpha1.ClusterMonitoring{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_ClusterMonitoring(ref), configv1alpha1.ClusterMonitoringList{}.OpenAPIModelName(): schema_openshift_api_config_v1alpha1_ClusterMonitoringList(ref), @@ -23742,176 +23738,6 @@ func schema_openshift_api_config_v1alpha1_BasicAuth(ref common.ReferenceCallback } } -func schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is \"cluster\". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout.\n\nThe resource is a singleton named \"cluster\".\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Description: "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - Default: map[string]interface{}{}, - Ref: ref(metav1.ObjectMeta{}.OpenAPIModelName()), - }, - }, - "spec": { - SchemaProps: spec.SchemaProps{ - Description: "spec defines the desired configuration of the CRI-O Credential Provider. This field is required and must be provided when creating the resource.", - Ref: ref(configv1alpha1.CRIOCredentialProviderConfigSpec{}.OpenAPIModelName()), - }, - }, - "status": { - SchemaProps: spec.SchemaProps{ - Description: "status represents the current state of the CRIOCredentialProviderConfig. When omitted or nil, it indicates that the status has not yet been set by the controller. The controller will populate this field with validation conditions and operational state.", - Default: map[string]interface{}{}, - Ref: ref(configv1alpha1.CRIOCredentialProviderConfigStatus{}.OpenAPIModelName()), - }, - }, - }, - Required: []string{"spec"}, - }, - }, - Dependencies: []string{ - configv1alpha1.CRIOCredentialProviderConfigSpec{}.OpenAPIModelName(), configv1alpha1.CRIOCredentialProviderConfigStatus{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()}, - } -} - -func schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "CRIOCredentialProviderConfigList contains a list of CRIOCredentialProviderConfig resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - 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{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Description: "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - Default: map[string]interface{}{}, - Ref: ref(metav1.ListMeta{}.OpenAPIModelName()), - }, - }, - "items": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref(configv1alpha1.CRIOCredentialProviderConfig{}.OpenAPIModelName()), - }, - }, - }, - }, - }, - }, - Required: []string{"metadata", "items"}, - }, - }, - Dependencies: []string{ - configv1alpha1.CRIOCredentialProviderConfig{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()}, - } -} - -func schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfigSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "CRIOCredentialProviderConfigSpec defines the desired configuration of the CRI-O Credential Provider.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "matchImages": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-type": "set", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "matchImages is a list of string patterns used to determine whether the CRI-O credential provider should be invoked for a given image. This list is passed to the kubelet CredentialProviderConfig, and if any pattern matches the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling that image or its mirrors. Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. Conflicts between the existing platform specific provider image match configuration and this list will be handled by the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those from the CRIOCredentialProviderConfig when both match the same image. To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). You can check the resource's Status conditions to see if any entries were ignored due to exact matches with known built-in provider patterns.\n\nThis field is optional, the items of the list must contain between 1 and 50 entries. The list is treated as a set, so duplicate entries are not allowed.\n\nFor more details, see: https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ https://github.com/cri-o/crio-credential-provider#architecture\n\nEach entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). A global wildcard '*' (matching any domain) is not allowed. Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. Each wildcard matches only a single domain label, so '*.io' does **not** match '*.k8s.io'.\n\nA match exists between an image and a matchImage when all of the below are true: Both contain the same number of domain parts and each part matches. The URL path of an matchImages must be a prefix of the target image URL path. If the matchImages contains a port, then the port must match in the image as well.\n\nExample values of matchImages: - 123456789.dkr.ecr.us-east-1.amazonaws.com - *.azurecr.io - gcr.io - *.*.registry.io - registry.io:8080/path", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - }, - }, - }, - } -} - -func schema_openshift_api_config_v1alpha1_CRIOCredentialProviderConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "CRIOCredentialProviderConfigStatus defines the observed state of CRIOCredentialProviderConfig", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "conditions": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-map-keys": []interface{}{ - "type", - }, - "x-kubernetes-list-type": "map", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "conditions represent the latest available observations of the configuration state. When omitted, it indicates that no conditions have been reported yet. The maximum number of conditions is 16. Conditions are stored as a map keyed by condition type, ensuring uniqueness.\n\nExpected condition types include: \"Validated\": indicates whether the matchImages configuration is valid", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref(metav1.Condition{}.OpenAPIModelName()), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - metav1.Condition{}.OpenAPIModelName()}, - } -} - func schema_openshift_api_config_v1alpha1_CertificateConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/openapi/openapi.json b/openapi/openapi.json index 468c116a34e..07648f4f63d 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -12923,100 +12923,6 @@ } } }, - "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfig": { - "description": "CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is \"cluster\". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout.\n\nThe resource is a singleton named \"cluster\".\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "type": "object", - "required": [ - "spec" - ], - "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": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec defines the desired configuration of the CRI-O Credential Provider. This field is required and must be provided when creating the resource.", - "$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigSpec" - }, - "status": { - "description": "status represents the current state of the CRIOCredentialProviderConfig. When omitted or nil, it indicates that the status has not yet been set by the controller. The controller will populate this field with validation conditions and operational state.", - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigStatus" - } - } - }, - "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigList": { - "description": "CRIOCredentialProviderConfigList contains a list of CRIOCredentialProviderConfig resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "type": "object", - "required": [ - "metadata", - "items" - ], - "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" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfig" - } - }, - "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": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - } - }, - "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigSpec": { - "description": "CRIOCredentialProviderConfigSpec defines the desired configuration of the CRI-O Credential Provider.", - "type": "object", - "properties": { - "matchImages": { - "description": "matchImages is a list of string patterns used to determine whether the CRI-O credential provider should be invoked for a given image. This list is passed to the kubelet CredentialProviderConfig, and if any pattern matches the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling that image or its mirrors. Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. Conflicts between the existing platform specific provider image match configuration and this list will be handled by the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those from the CRIOCredentialProviderConfig when both match the same image. To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). You can check the resource's Status conditions to see if any entries were ignored due to exact matches with known built-in provider patterns.\n\nThis field is optional, the items of the list must contain between 1 and 50 entries. The list is treated as a set, so duplicate entries are not allowed.\n\nFor more details, see: https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ https://github.com/cri-o/crio-credential-provider#architecture\n\nEach entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). A global wildcard '*' (matching any domain) is not allowed. Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. Each wildcard matches only a single domain label, so '*.io' does **not** match '*.k8s.io'.\n\nA match exists between an image and a matchImage when all of the below are true: Both contain the same number of domain parts and each part matches. The URL path of an matchImages must be a prefix of the target image URL path. If the matchImages contains a port, then the port must match in the image as well.\n\nExample values of matchImages: - 123456789.dkr.ecr.us-east-1.amazonaws.com - *.azurecr.io - gcr.io - *.*.registry.io - registry.io:8080/path", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - } - } - }, - "com.github.openshift.api.config.v1alpha1.CRIOCredentialProviderConfigStatus": { - "description": "CRIOCredentialProviderConfigStatus defines the observed state of CRIOCredentialProviderConfig", - "type": "object", - "properties": { - "conditions": { - "description": "conditions represent the latest available observations of the configuration state. When omitted, it indicates that no conditions have been reported yet. The maximum number of conditions is 16. Conditions are stored as a map keyed by condition type, ensuring uniqueness.\n\nExpected condition types include: \"Validated\": indicates whether the matchImages configuration is valid", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - } - } - }, "com.github.openshift.api.config.v1alpha1.CertificateConfig": { "description": "CertificateConfig specifies configuration parameters for certificates. At least one property must be specified.", "type": "object", diff --git a/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml index 7a720440acc..6650d1cf94b 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.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,DevPreviewNoUpgrade,TechPreviewNoUpgrade name: criocredentialproviderconfigs.config.openshift.io spec: group: config.openshift.io @@ -209,201 +208,6 @@ spec: be 'cluster' rule: self.metadata.name == 'cluster' served: true - storage: false - subresources: - status: {} - - name: v1alpha1 - schema: - openAPIV3Schema: - description: |- - CRIOCredentialProviderConfig holds cluster-wide singleton resource configurations for CRI-O credential provider, the name of this instance is "cluster". CRI-O credential provider is a binary shipped with CRI-O that provides a way to obtain container image pull credentials from external sources. - For example, it can be used to fetch mirror registry credentials from secrets resources in the cluster within the same namespace the pod will be running in. - CRIOCredentialProviderConfig configuration specifies the pod image sources registries that should trigger the CRI-O credential provider execution, which will resolve the CRI-O mirror configurations and obtain the necessary credentials for pod creation. - Note: Configuration changes will only take effect after the kubelet restarts, which is automatically managed by the cluster during rollout. - - The resource is a singleton named "cluster". - - Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. - 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 defines the desired configuration of the CRI-O Credential Provider. - This field is required and must be provided when creating the resource. - minProperties: 0 - properties: - matchImages: - description: |- - matchImages is a list of string patterns used to determine whether - the CRI-O credential provider should be invoked for a given image. This list is - passed to the kubelet CredentialProviderConfig, and if any pattern matches - the requested image, CRI-O credential provider will be invoked to obtain credentials for pulling - that image or its mirrors. - Depending on the platform, the CRI-O credential provider may be installed alongside an existing platform specific provider. - Conflicts between the existing platform specific provider image match configuration and this list will be handled by - the following precedence rule: credentials from built-in kubelet providers (e.g., ECR, GCR, ACR) take precedence over those - from the CRIOCredentialProviderConfig when both match the same image. - To avoid uncertainty, it is recommended to avoid configuring your private image patterns to overlap with - existing platform specific provider config(e.g., the entries from https://github.com/openshift/machine-config-operator/blob/main/templates/common/aws/files/etc-kubernetes-credential-providers-ecr-credential-provider.yaml). - You can check the resource's Status conditions - to see if any entries were ignored due to exact matches with known built-in provider patterns. - - This field is optional, the items of the list must contain between 1 and 50 entries. - The list is treated as a set, so duplicate entries are not allowed. - - For more details, see: - https://kubernetes.io/docs/tasks/administer-cluster/kubelet-credential-provider/ - https://github.com/cri-o/crio-credential-provider#architecture - - Each entry in matchImages is a pattern which can optionally contain a port and a path. Each entry must be no longer than 512 characters. - Wildcards ('*') are supported for full subdomain labels, such as '*.k8s.io' or 'k8s.*.io', - and for top-level domains, such as 'k8s.*' (which matches 'k8s.io' or 'k8s.net'). - A global wildcard '*' (matching any domain) is not allowed. - Wildcards may replace an entire hostname label (e.g., *.example.com), but they cannot appear within a label (e.g., f*oo.example.com) and are not allowed in the port or path. - For example, 'example.*.com' is valid, but 'exa*mple.*.com' is not. - Each wildcard matches only a single domain label, - so '*.io' does **not** match '*.k8s.io'. - - A match exists between an image and a matchImage when all of the below are true: - Both contain the same number of domain parts and each part matches. - The URL path of an matchImages must be a prefix of the target image URL path. - If the matchImages contains a port, then the port must match in the image as well. - - Example values of matchImages: - - 123456789.dkr.ecr.us-east-1.amazonaws.com - - *.azurecr.io - - gcr.io - - *.*.registry.io - - registry.io:8080/path - items: - description: |- - MatchImage is a string pattern used to match container image registry addresses. - It must be a valid fully qualified domain name with optional wildcard, port, and path. - The maximum length is 512 characters. - - Wildcards ('*') are supported for full subdomain labels and top-level domains. - Each entry can optionally contain a port (e.g., :8080) and a path (e.g., /path). - Wildcards are not allowed in the port or path portions. - - Examples: - - "registry.io" - matches exactly registry.io - - "*.azurecr.io" - matches any single subdomain of azurecr.io - - "registry.io:8080/path" - matches with specific port and path prefix - maxLength: 512 - minLength: 1 - type: string - x-kubernetes-validations: - - message: global wildcard '*' is not allowed - rule: self != '*' - - message: invalid matchImages value, must be a valid fully qualified - domain name in lowercase with optional wildcard, port, and path - rule: self.matches('^((\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?)(\\.(\\*|[a-z0-9]([a-z0-9-]*[a-z0-9])?))*)(:[0-9]+)?(/[-a-z0-9._/]*)?$') - maxItems: 50 - minItems: 1 - type: array - x-kubernetes-list-type: set - type: object - status: - description: |- - status represents the current state of the CRIOCredentialProviderConfig. - When omitted or nil, it indicates that the status has not yet been set by the controller. - The controller will populate this field with validation conditions and operational state. - minProperties: 1 - properties: - conditions: - description: |- - conditions represent the latest available observations of the configuration state. - When omitted, it indicates that no conditions have been reported yet. - The maximum number of conditions is 16. - Conditions are stored as a map keyed by condition type, ensuring uniqueness. - - Expected condition types include: - "Validated": indicates whether the matchImages configuration is valid - items: - description: Condition contains details for one aspect of the current - state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - maxItems: 16 - minItems: 1 - type: array - x-kubernetes-list-map-keys: - - type - x-kubernetes-list-type: map - type: object - required: - - spec - type: object - x-kubernetes-validations: - - message: criocredentialproviderconfig is a singleton, .metadata.name must - be 'cluster' - rule: self.metadata.name == 'cluster' - served: true storage: true subresources: status: {} diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 2873fff0258..ab63cba1d0e 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -53,9 +53,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -313,6 +310,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "name": "DualReplica" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index ee9d301c7c5..040546426df 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -55,9 +55,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -315,6 +312,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "name": "DualReplica" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index d3ec99985fc..ea9dc9c86ce 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -53,9 +53,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -307,6 +304,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "name": "DualReplica" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 326fe926316..37494bf8df9 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -55,9 +55,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -309,6 +306,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "name": "DualReplica" },