Merge pull request #87 from SolaceDev/v1.2.0

v1.2.0 Release
SolaceProducts · Sep 25, 2024 · 6353e0c · 6353e0c
2 parents 83f922d + 2a1143e
commit 6353e0c
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 49 deletions.
diff --git a/.github/workflows/build-test-dev.yml b/.github/workflows/build-test-dev.yml
@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  VERSION: 1.1.1
+  VERSION: 1.2.0
   IMAGE_NAME: pubsubplus-eventbroker-operator
   VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
   GCLOUD_PROJECT_ID_DEV: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -25,12 +25,10 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
-        env:
-          GOTOOLCHAIN: go1.21rc3
+          go-version: "1.22.7"
 
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0
@@ -59,7 +57,7 @@ jobs:
 
       - name: Upload Test coverage Reports
         if: ${{ startsWith(github.ref_name, 'dev1.') && (github.ref_name != 'main') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: |
@@ -100,7 +98,7 @@ jobs:
 
       - name: Checkout SolaceDev/maas-build-actions
         if: ${{ startsWith(github.ref_name, 'dev1.') && (github.ref_name != 'main') }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: SolaceDev/maas-build-actions
           ref: refs/heads/master
@@ -145,7 +143,7 @@ jobs:
           push: true
         env:
           VERSION: ${{ env.VERSION }}
-          IMAGE_NAME: pubsubplus-eventbroker-operator
+          IMAGE_NAME: ${{ env.IMAGE_NAME }}
           VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
           GCLOUD_PROJECT_ID_DEV: ${{ secrets.GCLOUD_PROJECT_ID }}
 
@@ -157,7 +155,7 @@ jobs:
         if: ${{ startsWith(github.ref_name, 'dev1.') && (github.ref_name != 'main') }}
         with:
           docker_image_to_check: gcr.io/${{ env.GCLOUD_PROJECT_ID_DEV }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
-          prisma_repository_name: "${{ env.GCLOUD_PROJECT_ID_DEV }}/${{ env.IMAGE_NAME }}"
+          prisma_repository_name: "gcr.io/${{ env.GCLOUD_PROJECT_ID_DEV }}/${{ env.IMAGE_NAME }}"
           project_squad: "launchpad"
           prisma_jira_check: "False"
 
@@ -183,8 +181,9 @@ jobs:
 
       - name: Uploads Trivy Scan Reports
         if: ${{ startsWith(github.ref_name, 'dev1.') && (github.ref_name != 'main') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
+          name: trivy-results
           path: |
             trivy-results.sarif
 
@@ -199,7 +198,7 @@ jobs:
 
       - name: Uploads Trivy Scan Reports
         if: ${{ startsWith(github.ref_name, 'dev1.') && (github.ref_name != 'main') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: |
             trivy-results.sarif

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Create k8s Kind Cluster
         uses: helm/[email protected]

diff --git a/.github/workflows/prep-release.yml b/.github/workflows/prep-release.yml
@@ -4,7 +4,7 @@ on:
       release_tag:
         description: 'Release tag'
         required: true
-        default: '1.1.1'
+        default: '1.2.0'
       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
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22.7
 
       - name: Login to Github Packages
         uses: docker/login-action@v2
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup tools
         run: |

diff --git a/.github/workflows/test-broker-chaos-situation.yml b/.github/workflows/test-broker-chaos-situation.yml
@@ -19,7 +19,7 @@ jobs:
           echo "TESTNAMESPACE=op-test-chaos-$(date +%s)" >> $GITHUB_ENV
 
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0

diff --git a/.github/workflows/test-broker-upgrade-update.yml b/.github/workflows/test-broker-upgrade-update.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0

diff --git a/.github/workflows/test-full-params-ha.yml b/.github/workflows/test-full-params-ha.yml
@@ -19,7 +19,7 @@ jobs:
           echo "TESTNAMESPACE=op-test-full-$(date +%s)" >> $GITHUB_ENV
 
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0

diff --git a/.github/workflows/test-full-params.yml b/.github/workflows/test-full-params.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0

diff --git a/.github/workflows/test-helm-upgrade.yml b/.github/workflows/test-helm-upgrade.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0

diff --git a/.github/workflows/test-minimal-params.yml b/.github/workflows/test-minimal-params.yml
@@ -8,12 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0
-        env:
-          GOTOOLCHAIN: go1.21rc3
 
       - name: Create k8s Kind Cluster
         uses: helm/[email protected]

diff --git a/.github/workflows/vulncheck_periodic.yml b/.github/workflows/vulncheck_periodic.yml
@@ -4,7 +4,7 @@ on:
     - cron: '0 */ * * *'
 
 env:
-  VERSION: 1.1.1
+  VERSION: 1.2.0
   IMAGE_NAME: pubsubplus-eventbroker-operator
   VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
   GCLOUD_PROJECT_ID_DEV: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -27,10 +27,10 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22.7"
 
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Login to Github Packages
         uses: docker/login-action@v2
@@ -44,7 +44,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Checkout SolaceDev/maas-build-actions
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: SolaceDev/maas-build-actions
           ref: refs/heads/master
@@ -65,7 +65,7 @@ jobs:
           secrets: |
             secret/data/development/gcp-gcr GCP_SERVICE_ACCOUNT | GCP_DEV_SERVICE_ACCOUNT
         env:
-          VERSION: 1.1.1
+          VERSION: 1.2.0
           IMAGE_NAME: pubsubplus-eventbroker-operator
           VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
           GCLOUD_PROJECT_ID_DEV: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -85,7 +85,7 @@ jobs:
             gcr.io/${{ env.GCLOUD_PROJECT_ID_DEV }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
           push: true
         env:
-          VERSION: 1.1.1
+          VERSION: 1.2.0
           IMAGE_NAME: pubsubplus-eventbroker-operator
           VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
           GCLOUD_PROJECT_ID_DEV: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -121,7 +121,7 @@ jobs:
 
       - name: Uploads Trivy Scan Reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: |
             trivy-results.sarif
@@ -136,7 +136,7 @@ jobs:
 
       - name: Uploads Trivy Scan Reports
         if: ${{ !startsWith(github.ref_name, '1.') }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: |
             trivy-results.sarif
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as builder
+FROM golang:1.22.7 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,12 +19,12 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1194
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1227.1725849298
 
 LABEL name="solace/pubsubplus-eventbroker-operator"
 LABEL vendor="Solace Corporation"
-LABEL version="1.1.1"
-LABEL release="1.1.1"
+LABEL version="1.2.0"
+LABEL release="1.2.0"
 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"
 

diff --git a/Makefile b/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.1.1
+VERSION ?= 1.2.0
 
 # API_VERSION defines the API version for the PubSubPlusEventBroker CRD
 API_VERSION ?= v1beta1

diff --git a/bundle/manifests/pubsubplus-eventbroker-operator.clusterserviceversion.yaml b/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:v1.1.1
-    createdAt: "2024-07-31T18:47:51Z"
+    containerImage: docker.io/solace/pubsubplus-eventbroker-operator:1.2.0
+    createdAt: "2024-09-12T19:47:52Z"
     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.34.1
     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.1.1
+  name: pubsubplus-eventbroker-operator.v1.2.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -296,7 +296,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: docker.io/solace/pubsubplus-eventbroker-operator:1.1.1
+                image: docker.io/solace/pubsubplus-eventbroker-operator:1.2.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -411,4 +411,4 @@ spec:
   provider:
     name: Solace Corporation
     url: www.solace.com
-  version: 1.1.1
+  version: 1.2.0
diff --git a/bundle/manifests/pubsubplus.solace.com_pubsubpluseventbrokers.yaml b/bundle/manifests/pubsubplus.solace.com_pubsubpluseventbrokers.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
-    app.kubernetes.io/version: v1.1.1
+    app.kubernetes.io/version: v1.2.0
   name: pubsubpluseventbrokers.pubsubplus.solace.com
 spec:
   group: pubsubplus.solace.com

diff --git a/ci/whitesource/whitesource-agent.config b/ci/whitesource/whitesource-agent.config
@@ -41,11 +41,11 @@ go.modules.includeTestDependencies=true
 #userKey=
 
 projectName=pubsubplus-kubernetes-operator
-projectVersion=v1.1.1
+projectVersion=v1.2.0
 projectToken=
 
 productName=pubsubplus-kubernetes-operator
-productVersion=v1.1.1
+productVersion=v1.2.0
 productToken=
 updateType=OVERRIDE
 #[email protected]

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -11,4 +11,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: docker.io/solace/pubsubplus-eventbroker-operator
-  newTag: 1.1.1
+  newTag: 1.2.0