Bug 1871737: Upgrade CRD apiVersion apiextensions.k8s.io from v1beta1 to v1

bundle/manifests/cluster-logging.v4.6.0.clusterserviceversion.yaml

@@ -249,6 +249,12 @@ spec:
           - consoleexternalloglinks
           verbs:
           - "*"
+        - apiGroups:
+          - ""
+          resources:
+          - configmaps
+          verbs:
+          - "*"
         - apiGroups:
           - scheduling.k8s.io
           resources:

bundle/manifests/crd-v1beta1-clusterloggings-patches.yaml → bundle/manifests/crd-v1-clusterloggings-patches.yaml

@@ -1,5 +1,5 @@
 - op: replace
-  path: /spec/validation/openAPIV3Schema/properties/metadata
+  path: /spec/versions/0/schema/openAPIV3Schema/properties/metadata
   value:
     type: object
     properties:
@@ -8,6 +8,6 @@
         enum:
         - "instance"
 - op: replace
-  path: /spec/validation/openAPIV3Schema/properties/status
+  path: /spec/versions/0/schema/openAPIV3Schema/properties/status
   value:
     type: object

bundle/manifests/kustomization.yaml

@@ -8,9 +8,9 @@ patchesJson6902:
     version: v1
     kind: CustomResourceDefinition
     name: clusterlogforwarders.logging.openshift.io
-- path: crd-v1beta1-clusterloggings-patches.yaml
+- path: crd-v1-clusterloggings-patches.yaml
   target:
     group: apiextensions.k8s.io
-    version: v1beta1
+    version: v1
     kind: CustomResourceDefinition
     name: clusterloggings.logging.openshift.io

bundle/manifests/logforwardings.crd.yaml

@@ -72,6 +72,9 @@ spec:
                       - logs.app
                       - logs.infra
                       - logs.audit
+                  labels:
+                    type: map
+                    description: Pipeline labels in the key:value format
               required:
               - name
               - source

bundle/manifests/logging.openshift.io_clusterlogforwarders_crd.yaml

@@ -192,13 +192,14 @@ spec:
                     url:
                       description: "URL to send log messages to. \n Must be an absolute
                         URL, with a scheme. Valid URL schemes depend on `type`. Special
-                        schemes 'tcp', 'udp' and 'tls' are used for output types that
-                        don't define their own URL scheme.  Example: \n     { type:
-                        syslog, url: tls://syslog.example.com:1234 } \n TLS with server
-                        authentication is enabled by the URL scheme, for example 'tls'
-                        or 'https'.  See `secret` for TLS client authentication. \n
-                        This field is optional and can be empty if there is an output-type
-                        field with alternative connection information."
+                        schemes 'tcp', 'tls', 'udp' and 'udps are used for output
+                        types that don't define their own URL scheme.  Example: \n
+                        \    { type: syslog, url: udps://syslog.example.com:1234 }
+                        \n TLS with server authentication is enabled by the URL scheme,
+                        for example 'tls' or 'https'.  See `secret` for TLS client
+                        authentication. \n This field is optional and can be empty
+                        if there is an output-type field with alternative connection
+                        information."
                       pattern: ^$|[a-zA-z]+:\/\/.*
                       type: string
                   required:
@@ -221,6 +222,11 @@ spec:
                       items:
                         type: string
                       type: array
+                    labels:
+                      additionalProperties:
+                        type: string
+                      description: Labels lists labels applied to this pipeline
+                      type: object
                     name:
                       description: Name is optional, but must be unique in the `pipelines`
                         list if provided.

hack/generate-crd.sh

@@ -13,17 +13,12 @@ echo "Generate k8s golang code"
 echo "--------------------------------------------------------------"
 $OPERATOR_SDK generate k8s
 
-echo "--------------------------------------------------------------"
-echo "Generate CRDs for apiVersion v1beta1"
-echo "--------------------------------------------------------------"
-$OPERATOR_SDK generate crds --crd-version v1beta1
-mv "deploy/crds/${CLO_CRD_FILE}" "${MANIFESTS_DIR}"
-
 echo "--------------------------------------------------------------"
 echo "Generate CRDs for apiVersion v1"
 echo "--------------------------------------------------------------"
 $OPERATOR_SDK generate crds --crd-version v1
 mv "deploy/crds/${CLF_CRD_FILE}" "${MANIFESTS_DIR}"
+mv "deploy/crds/${CLO_CRD_FILE}" "${MANIFESTS_DIR}"
 
 echo "---------------------------------------------------------------"
 echo "Kustomize: Patch CRDs for singeltons and backward-compatibility"

manifests/4.6/crd-v1beta1-clusterloggings-patches.yaml → manifests/4.6/crd-v1-clusterloggings-patches.yaml

@@ -1,5 +1,5 @@
 - op: replace
-  path: /spec/validation/openAPIV3Schema/properties/metadata
+  path: /spec/versions/0/schema/openAPIV3Schema/properties/metadata
   value:
     type: object
     properties:
@@ -8,6 +8,6 @@
         enum:
         - "instance"
 - op: replace
-  path: /spec/validation/openAPIV3Schema/properties/status
+  path: /spec/versions/0/schema/openAPIV3Schema/properties/status
   value:
     type: object

manifests/4.6/kustomization.yaml

@@ -8,9 +8,9 @@ patchesJson6902:
     version: v1
     kind: CustomResourceDefinition
     name: clusterlogforwarders.logging.openshift.io
-- path: crd-v1beta1-clusterloggings-patches.yaml
+- path: crd-v1-clusterloggings-patches.yaml
   target:
     group: apiextensions.k8s.io
-    version: v1beta1
+    version: v1
     kind: CustomResourceDefinition
     name: clusterloggings.logging.openshift.io