Merge pull request crossplane#6157 from phisco/environmentconfigs-plz-let-me-rollback

fix(environmentConfigs): revert to v1alpha1 as storageversion to fix rollback issues

Author: phisco

apis/apiextensions/v1alpha1/zz_generated.environment_config_types.go

@@ -24,6 +24,7 @@ import (
 )
 
 // +kubebuilder:object:root=true
+// +kubebuilder:storageversion
 // +genclient
 // +genclient:nonNamespaced
 

apis/apiextensions/v1beta1/environment_config_types.go

@@ -22,7 +22,6 @@ import (
 )
 
 // +kubebuilder:object:root=true
-// +kubebuilder:storageversion
 // +genclient
 // +genclient:nonNamespaced
 

apis/generate.go

@@ -31,7 +31,7 @@ limitations under the License.
 //go:generate ../hack/duplicate_api_type.sh apiextensions/v1/composition_patches.go apiextensions/v1beta1
 //go:generate ../hack/duplicate_api_type.sh apiextensions/v1/composition_transforms.go apiextensions/v1beta1
 
-//go:generate ../hack/duplicate_api_type.sh apiextensions/v1beta1/environment_config_types.go apiextensions/v1alpha1
+//go:generate ../hack/duplicate_api_type.sh apiextensions/v1beta1/environment_config_types.go apiextensions/v1alpha1 true
 
 //go:generate ../hack/duplicate_api_type.sh pkg/v1/package_types.go pkg/v1beta1
 //go:generate ../hack/duplicate_api_type.sh pkg/v1/package_runtime_types.go pkg/v1beta1

cluster/crds/apiextensions.crossplane.io_environmentconfigs.yaml

@@ -58,7 +58,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources: {}
   - additionalPrinterColumns:
     - jsonPath: .metadata.creationTimestamp
@@ -100,5 +100,5 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources: {}

cmd/crossplane/core/init.go

@@ -73,7 +73,7 @@ func (c *initCommand) Run(s *runtime.Scheme, log logging.Logger) error {
 	steps = append(steps,
 		initializer.NewTLSCertificateGenerator(c.Namespace, c.TLSCASecretName, tlsGeneratorOpts...),
 		initializer.NewCoreCRDsMigrator("compositionrevisions.apiextensions.crossplane.io", "v1alpha1"),
-		initializer.NewCoreCRDsMigrator("environmentconfigs.apiextensions.crossplane.io", "v1alpha1"),
+		initializer.NewCoreCRDsMigrator("environmentconfigs.apiextensions.crossplane.io", "v1beta1"),
 		initializer.NewCoreCRDsMigrator("functions.pkg.crossplane.io", "v1beta1"),
 		initializer.NewCoreCRDsMigrator("functionrevisions.pkg.crossplane.io", "v1beta1"),
 		initializer.NewCoreCRDsMigrator("locks.pkg.crossplane.io", "v1alpha1"),

hack/duplicate_api_type.sh

@@ -13,6 +13,7 @@ set -e
 
 FROM_PATH=${1}
 TO_DIR=${2}
+STORAGE_VERSION=${3:-false}
 
 DO_NOT_EDIT="// Generated from ${FROM_PATH} by ${0}. DO NOT EDIT."
 
@@ -23,6 +24,25 @@ FROM_PACKAGE=$(basename ${FROM_DIR})
 TO_PACKAGE=$(basename ${TO_DIR})
 TO_PATH="${TO_DIR}/zz_generated.${FROM_FILE}"
 
-sed "s#^package ${FROM_PACKAGE}\$#${DO_NOT_EDIT}\n\npackage ${TO_PACKAGE}#" ${FROM_PATH} | grep -v '// +kubebuilder:storageversion' > ${TO_PATH}
-
-echo "Duplicated ${FROM_PATH} (package ${FROM_PACKAGE}) to ${TO_PATH} (package ${TO_PACKAGE})."
+sed "s#^package ${FROM_PACKAGE}\$#${DO_NOT_EDIT}\n\npackage ${TO_PACKAGE}#" ${FROM_PATH} > ${TO_PATH}
+
+case $STORAGE_VERSION in
+  true)
+    if grep -q "+kubebuilder:storageversion" ${FROM_PATH}; then
+      echo "Error: ${FROM_PATH} is marked as storage version and cannot be duplicated without dropping the marker."
+      exit 1
+    fi
+    # Add the storageVersion marker before // +genclient
+    sed -i '\/\/ +genclient$/i\/\/ +kubebuilder:storageversion' ${TO_PATH}
+    echo "Duplicated ${FROM_PATH} (package ${FROM_PACKAGE}) to ${TO_PATH} (package ${TO_PACKAGE})."
+    ;;
+  false)
+    # Remove the +kubebuilder:storageversion comment marker
+    sed -i '/+kubebuilder:storageversion/d' ${TO_PATH}
+    echo "Duplicated ${FROM_PATH} (package ${FROM_PACKAGE}) to ${TO_PATH} (package ${TO_PACKAGE}), removed storage version marker."
+    ;;
+  *)
+    echo "Error: Invalid STORAGE_VERSION value: ${STORAGE_VERSION}"
+    exit 1
+    ;;
+esac