Merge pull request #833 from spolti/RHPAM-4558-blue

[7.13.x-blue][RHPAM-4558] - Upgrade oauth proxy image on ba and kogit…
kiegroup · Oct 26, 2022 · 52ea4e3 · 52ea4e3
2 parents 746ec7b + 822d053
commit 52ea4e3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/...atalog/dev/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml b/...atalog/dev/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "false"
     containerImage: quay.io/kiegroup/kie-cloud-operator:8.0.1
-    createdAt: "2022-10-06 11:21:23"
+    createdAt: "2022-10-20 14:43:44"
     description: Deploys and manages IBM Business Automation Manager Open Editions
       environment.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
     operator-bamoe-businessautomation: "true"
     operatorframework.io/arch.amd64: supported
     operatorframework.io/os.linux: supported
-  name: bamoe-businessautomation-operator.8.0.1-1-dev-r7zcrc7cpb
+  name: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -183,7 +183,7 @@ spec:
                 - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.1
                   value: registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.1
                 - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.1
-                  value: registry.redhat.io/openshift4/ose-cli:v4.10
+                  value: registry.redhat.io/openshift4/ose-cli:v4.11
                 - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.1
                   value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
                 - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.1
@@ -207,7 +207,7 @@ spec:
                 - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.0
                   value: registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.0
                 - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.0
-                  value: registry.redhat.io/openshift4/ose-cli:v4.10
+                  value: registry.redhat.io/openshift4/ose-cli:v4.11
                 - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.0
                   value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
                 - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.0
@@ -226,6 +226,8 @@ spec:
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.7
                 - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.6
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6
+                - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.11
+                  value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.11
                 - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.10
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.10
                 image: quay.io/kiegroup/kie-cloud-operator:8.0.1
@@ -403,7 +405,7 @@ spec:
   - operator
   labels:
     alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-r7zcrc7cpb
+    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
   links:
   - name: Product Page
     url: https://ibm.com
@@ -419,5 +421,5 @@ spec:
   selector:
     matchLabels:
       alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-r7zcrc7cpb
-  version: 8.0.1-1+r7zcrc7cpb
+      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
+  version: 8.0.1-1+6sxfhtw4j6
diff --git a/...talog/prod/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml b/...talog/prod/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "true"
     containerImage: registry.stage.redhat.io/ibm-bamoe/bamoe-rhel8-operator:8.0.1
-    createdAt: "2022-10-06 11:21:23"
+    createdAt: "2022-10-20 14:43:44"
     description: Deploys and manages IBM Business Automation Manager Open Editions
       environment.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -183,7 +183,7 @@ spec:
                 - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.1
                   value: registry.stage.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.1
                 - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.1
-                  value: registry.redhat.io/openshift4/ose-cli:v4.10
+                  value: registry.redhat.io/openshift4/ose-cli:v4.11
                 - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.1
                   value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
                 - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.1
@@ -207,7 +207,7 @@ spec:
                 - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.0
                   value: registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.0
                 - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.0
-                  value: registry.redhat.io/openshift4/ose-cli:v4.10
+                  value: registry.redhat.io/openshift4/ose-cli:v4.11
                 - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.0
                   value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
                 - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.0
@@ -226,6 +226,8 @@ spec:
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.7
                 - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.6
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6
+                - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.11
+                  value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.11
                 - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.10
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.10
                 image: registry.stage.redhat.io/ibm-bamoe/bamoe-rhel8-operator:8.0.1

diff --git a/...talog/test/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml b/...talog/test/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "true"
     containerImage: registry-proxy.engineering.redhat.com/rh-osbs/bamoe-8-rhpam-rhel8-operator:8.0.1
-    createdAt: "2022-10-06 11:21:23"
+    createdAt: "2022-10-20 14:43:44"
     description: Deploys and manages IBM Business Automation Manager Open Editions
       environment.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
     operator-bamoe-businessautomation: "true"
     operatorframework.io/arch.amd64: supported
     operatorframework.io/os.linux: supported
-  name: bamoe-businessautomation-operator.8.0.1-1-dev-d8ftz76hjq
+  name: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -183,7 +183,7 @@ spec:
                 - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.1
                   value: registry-proxy.engineering.redhat.com/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.1
                 - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.1
-                  value: registry.redhat.io/openshift4/ose-cli:v4.10
+                  value: registry.redhat.io/openshift4/ose-cli:v4.11
                 - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.1
                   value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
                 - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.1
@@ -207,7 +207,7 @@ spec:
                 - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.0
                   value: registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.0
                 - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.0
-                  value: registry.redhat.io/openshift4/ose-cli:v4.10
+                  value: registry.redhat.io/openshift4/ose-cli:v4.11
                 - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.0
                   value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
                 - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.0
@@ -226,6 +226,8 @@ spec:
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.7
                 - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.6
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6
+                - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.11
+                  value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.11
                 - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.10
                   value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.10
                 image: registry-proxy.engineering.redhat.com/rh-osbs/bamoe-8-rhpam-rhel8-operator:8.0.1
@@ -403,7 +405,7 @@ spec:
   - operator
   labels:
     alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-d8ftz76hjq
+    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
   links:
   - name: Product Page
     url: https://ibm.com
@@ -419,5 +421,5 @@ spec:
   selector:
     matchLabels:
       alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-d8ftz76hjq
-  version: 8.0.1-1+d8ftz76hjq
+      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
+  version: 8.0.1-1+7xj86rglwn
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -52,7 +52,7 @@ spec:
         - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.1
           value: registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.1
         - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.1
-          value: registry.redhat.io/openshift4/ose-cli:v4.10
+          value: registry.redhat.io/openshift4/ose-cli:v4.11
         - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.1
           value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
         - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.1
@@ -76,7 +76,7 @@ spec:
         - name: RELATED_IMAGE_PAM_DASHBUILDER_IMAGE_8.0.0
           value: registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8:8.0.0
         - name: RELATED_IMAGE_OSE_CLI_IMAGE_8.0.0
-          value: registry.redhat.io/openshift4/ose-cli:v4.10
+          value: registry.redhat.io/openshift4/ose-cli:v4.11
         - name: RELATED_IMAGE_MYSQL_PROXY_IMAGE_8.0.0
           value: registry.redhat.io/rhscl/mysql-80-rhel7:latest
         - name: RELATED_IMAGE_POSTGRESQL_PROXY_IMAGE_8.0.0
@@ -95,6 +95,8 @@ spec:
           value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.7
         - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.6
           value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.6
+        - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.11
+          value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.11
         - name: RELATED_IMAGE_OAUTH_PROXY_IMAGE_4.10
           value: registry.redhat.io/openshift4/ose-oauth-proxy:v4.10
         image: quay.io/kiegroup/kie-cloud-operator:8.0.1

diff --git a/pkg/controller/kieapp/constants/constants.go b/pkg/controller/kieapp/constants/constants.go
@@ -1,14 +1,15 @@
 package constants
 
 import (
-	api "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v2"
 	"golang.org/x/mod/semver"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	api "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v2"
 )
 
 // Ocp4Versions - OpenShift minor versions used for image curation
-var Ocp4Versions = []string{"4.10", "4.9", "4.8", "4.7", "4.6"}
+var Ocp4Versions = []string{"4.11", "4.10", "4.9", "4.8", "4.7", "4.6"}
 
 const (
 	// CurrentVersion product version supported