[solr-operator] branch main updated: Fix CRD Annotation generation for all platforms (#422)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new ed6c42e  Fix CRD Annotation generation for all platforms (#422)
ed6c42e is described below

commit ed6c42ee2f1efc859cd7261896223c076aba6bd6
Author: Houston Putman <ho...@apache.org>
AuthorDate: Tue Mar 15 13:15:44 2022 -0400

    Fix CRD Annotation generation for all platforms (#422)
---
 config/crd/bases/solr.apache.org_solrbackups.yaml             | 2 +-
 config/crd/bases/solr.apache.org_solrclouds.yaml              | 2 +-
 config/crd/bases/solr.apache.org_solrprometheusexporters.yaml | 2 +-
 hack/config/add_crds_annotations.sh                           | 4 +---
 helm/solr-operator/crds/crds.yaml                             | 6 +++---
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml
index 9d849cc..cca451a 100644
--- 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.6.0-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
index 6f1ca47..30eeb1b 100644
--- 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.6.0-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
index e89b1f0..636b17d 100644
--- 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.6.0-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
index 18d3431..d860576 100755
--- 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
index 94117ca..02dbe5e 100644
--- 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.6.0-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.6.0-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrclouds.solr.apache.org
 spec:
@@ -8340,9 +8340,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
     operator.solr.apache.org/version: v0.6.0-prerelease
     argocd.argoproj.io/sync-options: Replace=true
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: solrprometheusexporters.solr.apache.org
 spec: