Skip to content

Commit 7246b4d

Browse files
committed
Fix CRD Annotation generation for all platforms (#422)
1 parent 8207f95 commit 7246b4d

5 files changed

Lines changed: 7 additions & 9 deletions

File tree

config/crd/bases/solr.apache.org_solrbackups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
1818
kind: CustomResourceDefinition
1919
metadata:
2020
annotations:
21-
controller-gen.kubebuilder.io/version: v0.5.0
2221
operator.solr.apache.org/version: v0.5.1-prerelease
2322
argocd.argoproj.io/sync-options: Replace=true
23+
controller-gen.kubebuilder.io/version: v0.5.0
2424
creationTimestamp: null
2525
name: solrbackups.solr.apache.org
2626
spec:

config/crd/bases/solr.apache.org_solrclouds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
1818
kind: CustomResourceDefinition
1919
metadata:
2020
annotations:
21-
controller-gen.kubebuilder.io/version: v0.5.0
2221
operator.solr.apache.org/version: v0.5.1-prerelease
2322
argocd.argoproj.io/sync-options: Replace=true
23+
controller-gen.kubebuilder.io/version: v0.5.0
2424
creationTimestamp: null
2525
name: solrclouds.solr.apache.org
2626
spec:

config/crd/bases/solr.apache.org_solrprometheusexporters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
1818
kind: CustomResourceDefinition
1919
metadata:
2020
annotations:
21-
controller-gen.kubebuilder.io/version: v0.5.0
2221
operator.solr.apache.org/version: v0.5.1-prerelease
2322
argocd.argoproj.io/sync-options: Replace=true
23+
controller-gen.kubebuilder.io/version: v0.5.0
2424
creationTimestamp: null
2525
name: solrprometheusexporters.solr.apache.org
2626
spec:

hack/config/add_crds_annotations.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ files=("${CONFIG_DIRECTORY:-config}"/crd/bases/*)
3030
# Copy and package CRDs
3131
for file in "${files[@]}"; do
3232
{
33-
cat "${file}" | sed -e "/^ controller-gen.kubebuilder.io.version.*/a \\
34-
operator.solr.apache.org\\/version: ${VERSION}\\
35-
argocd.argoproj.io\\/sync-options: Replace=true"
33+
awk '/^ controller-gen.kubebuilder.io.version.*/{print " operator.solr.apache.org/version: '"${VERSION}"'\n argocd.argoproj.io/sync-options: Replace=true"}1' "${file}"
3634
} > "${file}.tmp" && mv "${file}.tmp" "${file}"
3735
done

helm/solr-operator/crds/crds.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ apiVersion: apiextensions.k8s.io/v1
1818
kind: CustomResourceDefinition
1919
metadata:
2020
annotations:
21-
controller-gen.kubebuilder.io/version: v0.5.0
2221
operator.solr.apache.org/version: v0.5.1-prerelease
2322
argocd.argoproj.io/sync-options: Replace=true
23+
controller-gen.kubebuilder.io/version: v0.5.0
2424
creationTimestamp: null
2525
name: solrbackups.solr.apache.org
2626
spec:
@@ -1273,9 +1273,9 @@ apiVersion: apiextensions.k8s.io/v1
12731273
kind: CustomResourceDefinition
12741274
metadata:
12751275
annotations:
1276-
controller-gen.kubebuilder.io/version: v0.5.0
12771276
operator.solr.apache.org/version: v0.5.1-prerelease
12781277
argocd.argoproj.io/sync-options: Replace=true
1278+
controller-gen.kubebuilder.io/version: v0.5.0
12791279
creationTimestamp: null
12801280
name: solrclouds.solr.apache.org
12811281
spec:
@@ -8336,9 +8336,9 @@ apiVersion: apiextensions.k8s.io/v1
83368336
kind: CustomResourceDefinition
83378337
metadata:
83388338
annotations:
8339-
controller-gen.kubebuilder.io/version: v0.5.0
83408339
operator.solr.apache.org/version: v0.5.1-prerelease
83418340
argocd.argoproj.io/sync-options: Replace=true
8341+
controller-gen.kubebuilder.io/version: v0.5.0
83428342
creationTimestamp: null
83438343
name: solrprometheusexporters.solr.apache.org
83448344
spec:

0 commit comments

Comments
 (0)