Merge pull request #237 from awgreene/olmconfig-create-only-annotation

openshift-merge-robot · web-flow · commit 13f7723ba609 · 2021-12-16T22:23:50.000+01:00
Add the create-only annotation to the olmconfig/cluster manifest
diff --git a/manifests/0000_50_olm_02-olmconfig.yaml b/manifests/0000_50_olm_02-olmconfig.yaml
@@ -3,6 +3,7 @@ kind: OLMConfig
 metadata:
   name: cluster
   annotations:
+    release.openshift.io/create-only: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
diff --git a/scripts/cluster-olmconfig.patch.yaml b/scripts/cluster-olmconfig.patch.yaml
@@ -0,0 +1,3 @@
+metadata:
+  annotations:
+    release.openshift.io/create-only: "true"
diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh
@@ -64,6 +64,7 @@ ${YQ} merge --inplace -d'0' manifests/0000_50_olm_00-namespace.yaml scripts/moni
 ${YQ} write --inplace -s scripts/olm-deployment.patch.yaml manifests/0000_50_olm_07-olm-operator.deployment.yaml
 ${YQ} write --inplace -s scripts/catalog-deployment.patch.yaml manifests/0000_50_olm_08-catalog-operator.deployment.yaml
 ${YQ} write --inplace -s scripts/packageserver-deployment.patch.yaml manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
+${YQ} merge --inplace manifests/0000_50_olm_02-olmconfig.yaml scripts/cluster-olmconfig.patch.yaml
 mv manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml pkg/manifests/csv.yaml
 cp scripts/packageserver-pdb.yaml manifests/0000_50_olm_00-packageserver.pdb.yaml
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+metadata:`
	`2`	`+ annotations:`
	`3`	`+ release.openshift.io/create-only: "true"`