add CEL validation for RegistrySources in Image API

muraee · muraee · commit 9f8eba879215 · 2025-02-06T18:14:32.000+01:00
diff --git a/config/v1/types_image.go b/config/v1/types_image.go
@@ -161,6 +161,8 @@ type RegistryLocation struct {
 }
 
 // RegistrySources holds cluster-wide information about how to handle the registries config.
+//
+// +kubebuilder:validation:XValidation:rule="self.blockedRegistries.size() == 0 || self.allowedRegistries.size() == 0",message="Only one of BlockedRegistries or AllowedRegistries may be set"
 type RegistrySources struct {
 	// insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.
 	// +optional
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-CustomNoUpgrade.crd.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-Default.crd.yaml
@@ -146,6 +146,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-DevPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-DevPreviewNoUpgrade.crd.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-TechPreviewNoUpgrade.crd.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/images.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/images.config.openshift.io/AAA_ungated.yaml
@@ -146,6 +146,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/images.config.openshift.io/ImageStreamImportMode.yaml b/config/v1/zz_generated.featuregated-crd-manifests/images.config.openshift.io/ImageStreamImportMode.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/payload-manifests/crds/0000_10_config-operator_01_images-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_images-CustomNoUpgrade.crd.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/payload-manifests/crds/0000_10_config-operator_01_images-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_images-Default.crd.yaml
@@ -146,6 +146,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/payload-manifests/crds/0000_10_config-operator_01_images-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_images-DevPreviewNoUpgrade.crd.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not
diff --git a/payload-manifests/crds/0000_10_config-operator_01_images-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_images-TechPreviewNoUpgrade.crd.yaml
@@ -164,6 +164,11 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                 type: object
+                x-kubernetes-validations:
+                - message: Only one of BlockedRegistries or AllowedRegistries may
+                    be set
+                  rule: self.blockedRegistries.size() == 0 || self.allowedRegistries.size()
+                    == 0
             type: object
           status:
             description: status holds observed values from the cluster. They may not

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,8 @@ type RegistryLocation struct {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`// RegistrySources holds cluster-wide information about how to handle the registries config.`
	`164`	`+//`
	`165`	`+// +kubebuilder:validation:XValidation:rule="self.blockedRegistries.size() == 0 \|\| self.allowedRegistries.size() == 0",message="Only one of BlockedRegistries or AllowedRegistries may be set"`
`164`	`166`	`type RegistrySources struct {`
`165`	`167`	`// insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.`
`166`	`168`	`// +optional`