Fix CRD Annotation generation for all platforms (#422)

apache · Mar 15, 2022 · 7246b4d · 7246b4d
1 parent 8207f95
commit 7246b4d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.5.1-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrbackups.solr.apache.org
 spec:

diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.5.1-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrclouds.solr.apache.org
 spec:

diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.5.1-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrprometheusexporters.solr.apache.org
 spec:

diff --git a/hack/config/add_crds_annotations.sh b/hack/config/add_crds_annotations.sh
@@ -30,8 +30,6 @@ files=("${CONFIG_DIRECTORY:-config}"/crd/bases/*)
 # Copy and package CRDs
 for file in "${files[@]}"; do
   {
-    cat "${file}" | sed -e "/^    controller-gen.kubebuilder.io.version.*/a \\
-    operator.solr.apache.org\\/version: ${VERSION}\\
-    argocd.argoproj.io\\/sync-options: Replace=true"
+    awk '/^    controller-gen.kubebuilder.io.version.*/{print "    operator.solr.apache.org/version: '"${VERSION}"'\n    argocd.argoproj.io/sync-options: Replace=true"}1' "${file}"
   } > "${file}.tmp" && mv "${file}.tmp" "${file}"
 done
diff --git a/helm/solr-operator/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.5.1-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrbackups.solr.apache.org
 spec:
@@ -1273,9 +1273,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.5.1-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrclouds.solr.apache.org
 spec:
@@ -8336,9 +8336,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.5.1-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrprometheusexporters.solr.apache.org
 spec: