fix: append storageversion marker only on exact match

Signed-off-by: Philippe Scorsolini <[email protected]>

Author: phisco

apis/apiextensions/v1alpha1/zz_generated.environment_config_types.go

@@ -26,7 +26,6 @@ import (
 // +kubebuilder:object:root=true
 // +kubebuilder:storageversion
 // +genclient
-// +kubebuilder:storageversion
 // +genclient:nonNamespaced
 
 // An EnvironmentConfig contains user-defined unstructured values for

hack/duplicate_api_type.sh

@@ -24,17 +24,16 @@ FROM_PACKAGE=$(basename ${FROM_DIR})
 TO_PACKAGE=$(basename ${TO_DIR})
 TO_PATH="${TO_DIR}/zz_generated.${FROM_FILE}"
 
-if [ "${STORAGE_VERSION}" = "true" ] && grep -q "+kubebuilder:storageversion" ${FROM_PATH}; then
-  echo "Error: ${FROM_PATH} is a storage version and cannot be duplicated without dropping the storage version marker."
-  exit 1
-fi
-
 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}
+    sed -i '\/\/ +genclient$/i\/\/ +kubebuilder:storageversion' ${TO_PATH}
     echo "Duplicated ${FROM_PATH} (package ${FROM_PACKAGE}) to ${TO_PATH} (package ${TO_PACKAGE})."
     ;;
   false)