feat: update hack/update-payload-crds.sh

Signed-off-by: Ondrej Pokorny <[email protected]>

Author: opokornyy

hack/update-payload-crds.sh

@@ -2,9 +2,11 @@
 
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
+shopt -s extglob
+
 crd_globs="\
     authorization/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
-    config/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
+    config/v1/zz_generated.crd-manifests/*_config-operator_!(01_insightsdatagathers*).crd*yaml\
     machine/v1/zz_generated.crd-manifests/*.crd*yaml\
     operator/v1/zz_generated.crd-manifests//*_config-operator_*.crd*yaml\
     operator/v1alpha1/zz_generated.crd-manifests//*_config-operator_*.crd*yaml\
@@ -26,6 +28,8 @@ crd_globs="\
     config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring*.crd.yaml
     operator/v1/zz_generated.crd-manifests/*_storage_01_storages*.crd.yaml
     operator/v1/zz_generated.crd-manifests/*_csi-driver_01_clustercsidrivers*.crd.yaml
+    insights/v1alpha2/zz_generated.crd-manifests/0000_10_insights_01_datagathers*.crd.yaml
+    config/v1alpha2/zz_generated.crd-manifests/0000_10_config-operator_01_insightsdatagathers*.crd.yaml
     "
 
 # To allow the crd_globs to be sourced in the verify script,

payload-manifests/crds/0000_10_config-operator_01_insightsdatagathers-CustomNoUpgrade.crd.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    api-approved.openshift.io: https://github.com/openshift/api/pull/2448
+    api-approved.openshift.io: https://github.com/openshift/api/pull/2195
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
@@ -17,13 +17,13 @@ spec:
     singular: insightsdatagather
   scope: Cluster
   versions:
-  - name: v1
+  - name: v1alpha2
     schema:
       openAPIV3Schema:
         description: |-
-          InsightsDataGather provides data gather configuration options for the Insights Operator.
+          InsightsDataGather provides data gather configuration options for the the Insights Operator.
 
-          Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
+          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: |-
@@ -46,7 +46,7 @@ spec:
             description: spec holds user settable values for configuration
             properties:
               gatherConfig:
-                description: gatherConfig is a required spec attribute that includes
+                description: gatherConfig is an optional spec attribute that includes
                   all the configuration options related to gathering of the Insights
                   data and its uploading to the ingress.
                 properties:
@@ -59,13 +59,12 @@ spec:
                       When set to WorkloadNames, the gathered data about cluster resources will not contain the workload names for your deployments. Resources UIDs will be used instead.
                       When omitted no obfuscation is applied.
                     items:
-                      description: DataPolicyOption declares valid data policy options
+                      description: dataPolicyOption declares valid data policy options
                       enum:
                       - ObfuscateNetworking
                       - WorkloadNames
                       type: string
                     maxItems: 2
-                    minItems: 1
                     type: array
                     x-kubernetes-list-type: atomic
                     x-kubernetes-validations:
@@ -91,12 +90,12 @@ spec:
                               Run the following command to get the names of last active gatherers:
                               "oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'"
                             items:
-                              description: GathererConfig allows to configure specific
+                              description: gathererConfig allows to configure specific
                                 gatherers
                               properties:
                                 name:
                                   description: |-
-                                    name is the required name of a specific gatherer.
+                                    name is the required name of a specific gatherer
                                     It may not exceed 256 characters.
                                     The format for a gatherer name is: {gatherer}/{function} where the function is optional.
                                     Gatherer consists of a lowercase letters only that may include underscores (_).
@@ -105,7 +104,6 @@ spec:
                                     Run the following command to get the names of last active gatherers:
                                     "oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'"
                                   maxLength: 256
-                                  minLength: 1
                                   type: string
                                   x-kubernetes-validations:
                                   - message: gatherer name must be in the format of
@@ -128,7 +126,6 @@ spec:
                               - state
                               type: object
                             maxItems: 100
-                            minItems: 1
                             type: array
                             x-kubernetes-list-map-keys:
                             - name
@@ -139,7 +136,7 @@ spec:
                       mode:
                         description: |-
                           mode is a required field that specifies the mode for gatherers. Allowed values are All, None, and Custom.
-                          When set to All, all gatherers will run and gather data.
+                          When set to All, all gatherers wil run and gather data.
                           When set to None, all gatherers will be disabled and no data will be gathered.
                           When set to Custom, the custom configuration from the custom field will be applied.
                         enum:
@@ -172,11 +169,9 @@ spec:
                             properties:
                               name:
                                 description: |-
-                                  name is the name of the PersistentVolumeClaim that will be used to store the Insights data archive.
-                                  It is a string that follows the DNS1123 subdomain format.
+                                  name is a string that follows the DNS1123 subdomain format.
                                   It must be at most 253 characters in length, and must consist only of lower case alphanumeric characters, '-' and '.', and must start and end with an alphanumeric character.
                                 maxLength: 253
-                                minLength: 1
                                 type: string
                                 x-kubernetes-validations:
                                 - message: a lowercase RFC 1123 subdomain must consist
@@ -194,7 +189,6 @@ spec:
                               The current default mount path is /var/lib/insights-operator
                               The path may not exceed 1024 characters and must not contain a colon.
                             maxLength: 1024
-                            minLength: 1
                             type: string
                             x-kubernetes-validations:
                             - message: mountPath must not contain a colon
@@ -223,11 +217,15 @@ spec:
                 required:
                 - gatherers
                 type: object
-            required:
-            - gatherConfig
+            type: object
+          status:
+            description: status holds observed values from the cluster. They may not
+              be overridden.
             type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}

payload-manifests/crds/0000_10_config-operator_01_insightsdatagathers-DevPreviewNoUpgrade.crd.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    api-approved.openshift.io: https://github.com/openshift/api/pull/2448
+    api-approved.openshift.io: https://github.com/openshift/api/pull/2195
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
@@ -17,13 +17,13 @@ spec:
     singular: insightsdatagather
   scope: Cluster
   versions:
-  - name: v1
+  - name: v1alpha2
     schema:
       openAPIV3Schema:
         description: |-
-          InsightsDataGather provides data gather configuration options for the Insights Operator.
+          InsightsDataGather provides data gather configuration options for the the Insights Operator.
 
-          Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
+          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: |-
@@ -46,7 +46,7 @@ spec:
             description: spec holds user settable values for configuration
             properties:
               gatherConfig:
-                description: gatherConfig is a required spec attribute that includes
+                description: gatherConfig is an optional spec attribute that includes
                   all the configuration options related to gathering of the Insights
                   data and its uploading to the ingress.
                 properties:
@@ -59,13 +59,12 @@ spec:
                       When set to WorkloadNames, the gathered data about cluster resources will not contain the workload names for your deployments. Resources UIDs will be used instead.
                       When omitted no obfuscation is applied.
                     items:
-                      description: DataPolicyOption declares valid data policy options
+                      description: dataPolicyOption declares valid data policy options
                       enum:
                       - ObfuscateNetworking
                       - WorkloadNames
                       type: string
                     maxItems: 2
-                    minItems: 1
                     type: array
                     x-kubernetes-list-type: atomic
                     x-kubernetes-validations:
@@ -91,12 +90,12 @@ spec:
                               Run the following command to get the names of last active gatherers:
                               "oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'"
                             items:
-                              description: GathererConfig allows to configure specific
+                              description: gathererConfig allows to configure specific
                                 gatherers
                               properties:
                                 name:
                                   description: |-
-                                    name is the required name of a specific gatherer.
+                                    name is the required name of a specific gatherer
                                     It may not exceed 256 characters.
                                     The format for a gatherer name is: {gatherer}/{function} where the function is optional.
                                     Gatherer consists of a lowercase letters only that may include underscores (_).
@@ -105,7 +104,6 @@ spec:
                                     Run the following command to get the names of last active gatherers:
                                     "oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'"
                                   maxLength: 256
-                                  minLength: 1
                                   type: string
                                   x-kubernetes-validations:
                                   - message: gatherer name must be in the format of
@@ -128,7 +126,6 @@ spec:
                               - state
                               type: object
                             maxItems: 100
-                            minItems: 1
                             type: array
                             x-kubernetes-list-map-keys:
                             - name
@@ -139,7 +136,7 @@ spec:
                       mode:
                         description: |-
                           mode is a required field that specifies the mode for gatherers. Allowed values are All, None, and Custom.
-                          When set to All, all gatherers will run and gather data.
+                          When set to All, all gatherers wil run and gather data.
                           When set to None, all gatherers will be disabled and no data will be gathered.
                           When set to Custom, the custom configuration from the custom field will be applied.
                         enum:
@@ -172,11 +169,9 @@ spec:
                             properties:
                               name:
                                 description: |-
-                                  name is the name of the PersistentVolumeClaim that will be used to store the Insights data archive.
-                                  It is a string that follows the DNS1123 subdomain format.
+                                  name is a string that follows the DNS1123 subdomain format.
                                   It must be at most 253 characters in length, and must consist only of lower case alphanumeric characters, '-' and '.', and must start and end with an alphanumeric character.
                                 maxLength: 253
-                                minLength: 1
                                 type: string
                                 x-kubernetes-validations:
                                 - message: a lowercase RFC 1123 subdomain must consist
@@ -194,7 +189,6 @@ spec:
                               The current default mount path is /var/lib/insights-operator
                               The path may not exceed 1024 characters and must not contain a colon.
                             maxLength: 1024
-                            minLength: 1
                             type: string
                             x-kubernetes-validations:
                             - message: mountPath must not contain a colon
@@ -223,11 +217,15 @@ spec:
                 required:
                 - gatherers
                 type: object
-            required:
-            - gatherConfig
+            type: object
+          status:
+            description: status holds observed values from the cluster. They may not
+              be overridden.
             type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}