diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml index 5fdb2ad2..3796f1c0 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.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 index 2f830d04..ec4f931b 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.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 index 62fc87eb..321b2318 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.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 index 18d34312..d860576f 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 2868e65c..f3819933 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.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: