fix/openshift 24.3

olm/build-bundles.sh

@@ -173,9 +173,11 @@ catalog() {
 
 deploy() {
 	if $DEPLOY; then
-		kubectl apply --namespace stackable-operators -f catalog-source.yaml
-		kubectl apply --namespace stackable-operators -f subscription.yaml
-		kubectl apply --namespace stackable-operators -f operator-group.yaml
+		kubectl describe namespace stackable-operators || kubectl create namespace stackable-operators
+		kubectl apply --namespace stackable-operators \
+			-f catalog-source.yaml \
+			-f subscription.yaml \
+			-f operator-group.yaml
 		echo "Operator deployment done!"
 	else
 		echo "Skip operator deployment!"

olm/build-manifests.sh

@@ -16,9 +16,9 @@
 #
 # The generated manifests need to be updated manually with the following steps:
 # * Copy the cluster service version file from the previous package version.
-# * Replace the contents of the deployment, and cluster role with the `spec` and `rules` from the newly generated files.
+# * Replace the contents of the deployment, and cluster role with the `template.spec` and `rules` from the newly generated files.
 # * Remove the unused generated files : service account, operator cluster role (not the product cluster role), role binding, deployment.
-# * Remove all Helm labels in all remaining files.
+# * Remove all Helm labels in all remaining files (including all labels from the cluster role).
 # * Check or update the metadata/dependencies.yaml
 # * Update image tags and hashes
 
@@ -45,30 +45,30 @@ generate_metadata() {
   pushd "$METADATA_DIR"
 
   cat >annotations.yaml <<-ANNOS
-    ---
-    annotations:
-      operators.operatorframework.io.bundle.channel.default.v1: stable
-      operators.operatorframework.io.bundle.channels.v1: stable
-      operators.operatorframework.io.bundle.manifests.v1: manifests/
-      operators.operatorframework.io.bundle.mediatype.v1: registry+v1
-      operators.operatorframework.io.bundle.metadata.v1: metadata/
-      operators.operatorframework.io.bundle.package.v1: stackable-${OPERATOR}
-
-      com.redhat.openshift.versions: v4.10-v4.13
-  ANNOS
+---
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: stackable-${OPERATOR}
+
+  com.redhat.openshift.versions: v4.11-v4.15
+ANNOS
 
   cat >dependencies.yaml <<-DEPS
-    ---
-    dependencies:
-      - type: olm.package
-        value:
-          packageName: stackable-commons-operator
-          version: "$RELEASE_VERSION"
-      - type: olm.package
-        value:
-          packageName: stackable-secret-operator
-          version: "$RELEASE_VERSION"
-  DEPS
+---
+dependencies:
+  - type: olm.package
+    value:
+      packageName: stackable-commons-operator
+      version: "$RELEASE_VERSION"
+  - type: olm.package
+    value:
+      packageName: stackable-secret-operator
+      version: "$RELEASE_VERSION"
+DEPS
 
   popd
 }
@@ -138,7 +138,7 @@ maybe_print_help() {
           Example:
 
             $SCRIPT_NAME -r 23.11.0 -c $HOME/repo/stackable/openshift-certified-operators -o $HOME/repo/stackable/zookeeper-operator
-    HELP
+HELP
 
     exit 1
   fi