Updated broker scripts from PubSub+ Helm v3.3.2

.github/workflows/build-test-dev.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Upload Test coverage Reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: code-coverage-report
           path: |

.github/workflows/prep-release.yml

@@ -4,7 +4,7 @@ on:
       release_tag:
         description: 'Release tag'
         required: true
-        default: '1.0.0-dev'
+        default: '1.0.1-dev'
       prep_internal_release:
         # Need to distinguish between internal and external releases
         # Internal release: Will use default internal location for created images (ghcr.io) and will tag and push operator candidate there

Dockerfile

@@ -23,8 +23,8 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 LABEL name="solace/pubsubplus-eventbroker-operator"
 LABEL vendor="Solace Corporation"
-LABEL version="1.0.0"
-LABEL release="1.0.0"
+LABEL version="1.0.1"
+LABEL release="1.0.1"
 LABEL summary="Solace PubSub+ Event Broker Kubernetes Operator"
 LABEL description="The Solace PubSub+ Event Broker Kubernetes Operator deploys and manages the lifecycle of PubSub+ Event Brokers"
 

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.0.0-dev
+VERSION ?= 1.0.1-dev
 
 # API_VERSION defines the API version for the PubSubPlusEventBroker CRD
 API_VERSION ?= v1beta1

bundle/manifests/pubsubplus-eventbroker-operator.clusterserviceversion.yaml

@@ -20,16 +20,16 @@ metadata:
     certified: "true"
     com.redhat.delivery.operator.bundle: "true"
     com.redhat.openshift.versions: v4.10
-    containerImage: docker.io/solace/pubsubplus-eventbroker-operator:1.0.0
-    createdAt: "2023-04-19T16:00:24Z"
+    containerImage: docker.io/solace/pubsubplus-eventbroker-operator:1.0.1
+    createdAt: "2023-09-13T10:40:30Z"
     description: The Solace PubSub+ Event Broker Operator deploys and manages the
       lifecycle of PubSub+ Event Brokers
     operators.openshift.io/valid-subscription: '[]'
     operators.operatorframework.io/builder: operator-sdk-v1.27.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/SolaceProducts/pubsubplus-kubernetes-quickstart
     support: Solace Products
-  name: pubsubplus-eventbroker-operator.v1.0.0
+  name: pubsubplus-eventbroker-operator.v1.0.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -296,7 +296,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: docker.io/solace/pubsubplus-eventbroker-operator:1.0.0
+                image: docker.io/solace/pubsubplus-eventbroker-operator:1.0.1
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -411,4 +411,4 @@ spec:
   provider:
     name: Solace Corporation
     url: www.solace.com
-  version: 1.0.0
+  version: 1.0.1

bundle/manifests/pubsubplus.solace.com_pubsubpluseventbrokers.yaml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.3
   labels:
-    app.kubernetes.io/version: v1.0.0
+    app.kubernetes.io/version: v1.0.1
   name: pubsubpluseventbrokers.pubsubplus.solace.com
 spec:
   group: pubsubplus.solace.com

bundle/metadata/annotations.yaml

@@ -15,4 +15,4 @@ annotations:
   operators.operatorframework.io.test.config.v1: tests/scorecard/
 
   # Required by RedHat certification
-  com.redhat.openshift.versions: "v4.10"
+  com.redhat.openshift.versions: "v4.11"

ci/whitesource/whitesource-agent.config

@@ -45,7 +45,7 @@ projectVersion=
 projectToken=
 
 productName=pubsubplus-kubernetes-operator
-productVersion=v1.0.0
+productVersion=v1.0.1
 productToken=
 updateType=OVERRIDE
 #[email protected]

controllers/brokerscripts/init.sh

@@ -15,15 +15,15 @@ if [ "${BROKER_TLS_ENABLED}" = "true" ]; then
   cat /mnt/disks/certs/server/${BROKER_CERT_FILENAME} /mnt/disks/certs/server/${BROKER_CERTKEY_FILENAME} > /dev/shm/server.cert
   export tls_servercertificate_filepath="/dev/shm/server.cert"
 fi
+# Deal with the fact we cannot accept "-" in router names
+export routername=$(echo $(hostname) | sed 's/-//g')
 if [ "${BROKER_REDUNDANCY}" = "true" ]; then
   IFS='-' read -ra host_array <<< $(hostname)
   is_monitor=$([ ${host_array[-2]} = "m" ] && echo 1 || echo 0)
   is_backup=$([ ${host_array[-2]} = "b" ] && echo 1 || echo 0)
   namespace=$(echo $STATEFULSET_NAMESPACE)
   service=${BROKERSERVICES_NAME}
-  # Deal with the fact we cannot accept "-" in broker names
   service_name=$(echo ${service} | sed 's/-//g')
-  export routername=$(echo $(hostname) | sed 's/-//g')
   export redundancy_enable=yes
   export configsync_enable=yes
   export redundancy_authentication_presharedkey_key=$(cat /mnt/disks/secrets/presharedauthkey/preshared_auth_key | base64)
@@ -37,18 +37,18 @@ if [ "${BROKER_REDUNDANCY}" = "true" ]; then
 
   # Non Monitor Nodes
   if [ "${is_monitor}" = "0" ]; then
-  case ${is_backup} in
-  0)
-    export nodetype=message_routing
-    export redundancy_matelink_connectvia=${service}-b-0.${service}-discovery.${namespace}.svc
-    export redundancy_activestandbyrole=primary
-    ;;
-  1)
-    export nodetype=message_routing
-    export redundancy_matelink_connectvia=${service}-p-0.${service}-discovery.${namespace}.svc
-    export redundancy_activestandbyrole=backup
-    ;;
-  esac
+    case ${is_backup} in
+    0)
+      export nodetype=message_routing
+      export redundancy_matelink_connectvia=${service}-b-0.${service}-discovery.${namespace}.svc
+      export redundancy_activestandbyrole=primary
+      ;;
+    1)
+      export nodetype=message_routing
+      export redundancy_matelink_connectvia=${service}-p-0.${service}-discovery.${namespace}.svc
+      export redundancy_activestandbyrole=backup
+      ;;
+    esac
   else
   export nodetype=monitoring
   fi