Merge pull request #2105 from bertinatto/decrease-runlevel-clustercsidrivers

OCPBUGS-44324 : Rename files to use the default run-level for storage

Author: openshift-merge-bot[bot]

hack/update-payload-crds.sh

@@ -26,13 +26,14 @@ crd_globs="\
     operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations*.crd.yaml
     config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies*.crd.yaml
     config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies*.crd.yaml
-    operator/v1/zz_generated.crd-manifests/0000_50_storage_01_storages*.crd.yaml
-    operator/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers*.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
     "
 
 # To allow the crd_globs to be sourced in the verify script,
 # wrap the copy action to prevent it running when sourced.
 if [ "$0" = "$BASH_SOURCE" ] ; then
+    rm -rf "${SCRIPT_ROOT}/payload-manifests/crds/"*
     for f in ${crd_globs}; do
         cp "$f" "${SCRIPT_ROOT}/payload-manifests/crds/"
     done

operator/v1/types_csi_cluster_driver.go

@@ -20,7 +20,7 @@ import (
 // +kubebuilder:resource:path=clustercsidrivers,scope=Cluster
 // +kubebuilder:subresource:status
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/701
-// +openshift:file-pattern=cvoRunLevel=0000_90,operatorName=csi-driver,operatorOrdering=01
+// +openshift:file-pattern=cvoRunLevel=0000_50,operatorName=csi-driver,operatorOrdering=01
 
 // ClusterCSIDriver object allows management and configuration of a CSI driver operator
 // installed by default in OpenShift. Name of the object must be name of the CSI driver
@@ -71,7 +71,7 @@ const (
 	RemovedStorageClass StorageClassStateName = "Removed"
 )
 
-// If you are adding a new driver name here, ensure that 0000_90_cluster_csi_driver_01_config.crd.yaml-merge-patch file is also updated with new driver name.
+// If you are adding a new driver name here, ensure that 0000_50_cluster_csi_driver_01_config.crd.yaml-merge-patch file is also updated with new driver name.
 const (
 	AWSEBSCSIDriver          CSIDriverName = "ebs.csi.aws.com"
 	AWSEFSCSIDriver          CSIDriverName = "efs.csi.aws.com"

operator/v1/zz_generated.crd-manifests/0000_90_csi-driver_01_clustercsidrivers.crd.yaml renamed to operator/v1/zz_generated.crd-manifests/0000_50_csi-driver_01_clustercsidrivers.crd.yaml

@@ -73,7 +73,7 @@ clustercsidrivers.operator.openshift.io:
   - VSphereDriverConfiguration
   FilenameOperatorName: csi-driver
   FilenameOperatorOrdering: "01"
-  FilenameRunLevel: "0000_90"
+  FilenameRunLevel: "0000_50"
   GroupName: operator.openshift.io
   HasStatus: true
   KindName: ClusterCSIDriver

operator/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/701
-    api.openshift.io/filename-cvo-runlevel: "0000_90"
+    api.openshift.io/filename-cvo-runlevel: "0000_50"
     api.openshift.io/filename-operator: csi-driver
     api.openshift.io/filename-ordering: "01"
     feature-gate.release.openshift.io/: "true"

operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/701
-    api.openshift.io/filename-cvo-runlevel: "0000_90"
+    api.openshift.io/filename-cvo-runlevel: "0000_50"
     api.openshift.io/filename-operator: csi-driver
     api.openshift.io/filename-ordering: "01"
     feature-gate.release.openshift.io/AWSEFSDriverVolumeMetrics: "true"

operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AWSEFSDriverVolumeMetrics.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/701
-    api.openshift.io/filename-cvo-runlevel: "0000_90"
+    api.openshift.io/filename-cvo-runlevel: "0000_50"
     api.openshift.io/filename-operator: csi-driver
     api.openshift.io/filename-ordering: "01"
     feature-gate.release.openshift.io/VSphereDriverConfiguration: "true"