Created example for new FeatureGateAwareMaxItems.

openshift · May 6, 2024 · aa059ab · aa059ab
1 parent a94437e
commit aa059ab
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 32 deletions.
diff --git a/config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml b/config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml
@@ -216,38 +216,6 @@ tests:
                 - IBMCloud2
                 port: 443
                 server: server2.dev.cluster.com
-#      expected: |
-#        apiVersion: config.openshift.io/v1
-#        kind: Infrastructure
-#        spec:
-#          platformSpec:
-#            type: VSphere
-#            vsphere:
-#              failureDomains:
-#              - name: generated-failure-domain
-#                region: generated-region
-#                server: server1.dev.cluster.com
-#                topology:
-#                  computeCluster: /IBMCloud/host/vcs-8e-workload
-#                  datacenter: IBMCloud
-#                  datastore: /IBMCloud/datastore/mdcnc-ds-shared
-#                  networks:
-#                    - ocp-ci-seg-13
-#                  resourcePool: /IBMCloud/host/vcs-8e-workload/Resources
-#                  template: /IBMCloud/vm/ngirard-dev-rqh5s-rhcos-generated-region-generated-zone
-#                zone: generated-zone
-#              nodeNetworking:
-#                external: {}
-#                internal: {}
-#              vcenters:
-#              - datacenters:
-#                - IBMCloud
-#                port: 443
-#                server: server1.dev.cluster.com
-#              - datacenters:
-#                - IBMCloud2
-#                port: 443
-#                server: server2.dev.cluster.com
       expectedError: "Too many: 2: must have at most 1 items"
   onUpdate:
     - name: Should be able to change External platformName from unknown to something else

diff --git a/example/v1/types_stable.go b/example/v1/types_stable.go
@@ -67,6 +67,14 @@ type StableConfigTypeSpec struct {
 	// celUnion demonstrates how to validate a discrminated union using CEL
 	// +optional
 	CELUnion CELUnion `json:"celUnion,omitempty"`
+
+	// evolvingCollection demonstrates how to have a collection where the maximum number of items varies on cluster type.
+	// For default clusters, this will be "1" but on TechPreview clusters, this value will be "3".
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
+	// +openshift:validation:FeatureGateAwareMaxItems:featureGate=Example,maxItems=3
+	// +optional
+	// +listType=atomic
+	EvolvingCollection []string `json:"evolvingCollection,omitempty"`
 }
 
 type EvolvingUnion struct {

diff --git a/...generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-CustomNoUpgrade.crd.yaml b/...generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-CustomNoUpgrade.crd.yaml
@@ -71,6 +71,16 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: evolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
+                x-kubernetes-list-type: atomic
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...e/v1/zz_generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-Default.crd.yaml b/...e/v1/zz_generated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-Default.crd.yaml
@@ -67,6 +67,16 @@ spec:
                 - message: optionalMember is forbidden when type is not OptionalMember
                   rule: 'has(self.type) && self.type == ''OptionalMember'' ?  true
                     : !has(self.optionalMember)'
+              evolvingCollection:
+                description: evolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 1
+                type: array
+                x-kubernetes-list-type: atomic
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...rated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-DevPreviewNoUpgrade.crd.yaml b/...rated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-DevPreviewNoUpgrade.crd.yaml
@@ -71,6 +71,16 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: evolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
+                x-kubernetes-list-type: atomic
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/...ated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-TechPreviewNoUpgrade.crd.yaml b/...ated.crd-manifests/0000_50_my-operator_01_stableconfigtypes-TechPreviewNoUpgrade.crd.yaml
@@ -71,6 +71,16 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: evolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
+                x-kubernetes-list-type: atomic
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/example/v1/zz_generated.deepcopy.go b/example/v1/zz_generated.deepcopy.go
diff --git a/...erated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/AAA_ungated.yaml b/...erated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/AAA_ungated.yaml
@@ -67,6 +67,16 @@ spec:
                 - message: optionalMember is forbidden when type is not OptionalMember
                   rule: 'has(self.type) && self.type == ''OptionalMember'' ?  true
                     : !has(self.optionalMember)'
+              evolvingCollection:
+                description: evolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 1
+                type: array
+                x-kubernetes-list-type: atomic
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/..._generated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/Example.yaml b/..._generated.featuregated-crd-manifests/stableconfigtypes.example.openshift.io/Example.yaml
@@ -71,6 +71,16 @@ spec:
                 description: coolNewField is a field that is for tech preview only.  On
                   normal clusters this shouldn't be present
                 type: string
+              evolvingCollection:
+                description: evolvingCollection demonstrates how to have a collection
+                  where the maximum number of items varies on cluster type. For default
+                  clusters, this will be "1" but on TechPreview clusters, this value
+                  will be "3".
+                items:
+                  type: string
+                maxItems: 3
+                type: array
+                x-kubernetes-list-type: atomic
               evolvingUnion:
                 description: evolvingUnion demonstrates how to phase in new values
                   into discriminated union

diff --git a/example/v1/zz_generated.swagger_doc_generated.go b/example/v1/zz_generated.swagger_doc_generated.go
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -12904,6 +12904,15 @@
           "type": "string",
           "default": ""
         },
+        "evolvingCollection": {
+          "description": "evolvingCollection demonstrates how to have a collection where the maximum number of items varies on cluster type. For default clusters, this will be \"1\" but on TechPreview clusters, this value will be \"3\".",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "default": ""
+          },
+          "x-kubernetes-list-type": "atomic"
+        },
         "evolvingUnion": {
           "description": "evolvingUnion demonstrates how to phase in new values into discriminated union",
           "default": {},