Merge pull request #478 from openshift-cherrypick-robot/cherry-pick-4…

…74-to-release-4.12 [release-4.12] OCPBUGS-4407: Update Cluster Sample Operator dependencies and libraries for OCP 4.13
openshift · Dec 13, 2022 · 3ae8fa1 · 3ae8fa1
2 parents 83968a4 + f0a9acb
commit 3ae8fa1
Show file tree

Hide file tree

Showing 29 changed files with 3,333 additions and 249 deletions.
diff --git a/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json b/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json
@@ -77,28 +77,6 @@
 				"referencePolicy": {
 					"type": "Local"
 				}
-			},
-			{
-				"name": "1.18-ubi8",
-				"annotations": {
-					"description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.",
-					"iconClass": "icon-nginx",
-					"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)",
-					"openshift.io/provider-display-name": "Red Hat, Inc.",
-					"sampleRepo": "https://github.com/sclorg/nginx-ex.git",
-					"supports": "nginx",
-					"tags": "builder,nginx",
-					"version": "1.18"
-				},
-				"from": {
-					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi8/nginx-118:latest"
-				},
-				"generation": null,
-				"importPolicy": {},
-				"referencePolicy": {
-					"type": "Local"
-				}
 			}
 		]
 	},

diff --git a/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json
@@ -99,50 +99,6 @@
 				"referencePolicy": {
 					"type": "Local"
 				}
-			},
-			{
-				"name": "1.18-ubi8",
-				"annotations": {
-					"description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.",
-					"iconClass": "icon-nginx",
-					"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)",
-					"openshift.io/provider-display-name": "Red Hat, Inc.",
-					"sampleRepo": "https://github.com/sclorg/nginx-ex.git",
-					"supports": "nginx",
-					"tags": "builder,nginx",
-					"version": "1.18"
-				},
-				"from": {
-					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi8/nginx-118:latest"
-				},
-				"generation": null,
-				"importPolicy": {},
-				"referencePolicy": {
-					"type": "Local"
-				}
-			},
-			{
-				"name": "1.18-ubi7",
-				"annotations": {
-					"description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.",
-					"iconClass": "icon-nginx",
-					"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)",
-					"openshift.io/provider-display-name": "Red Hat, Inc.",
-					"sampleRepo": "https://github.com/sclorg/nginx-ex.git",
-					"supports": "nginx",
-					"tags": "builder,nginx",
-					"version": "1.18"
-				},
-				"from": {
-					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi7/nginx-118:latest"
-				},
-				"generation": null,
-				"importPolicy": {},
-				"referencePolicy": {
-					"type": "Local"
-				}
 			}
 		]
 	},

diff --git a/assets/operator/ocp-ppc64le/sso/imagestreams/sso76-openshift-rhel8.json b/assets/operator/ocp-ppc64le/sso/imagestreams/sso76-openshift-rhel8.json
@@ -8,7 +8,7 @@
 			"description": "Red Hat Single Sign-On 7.6 on OpenJDK",
 			"openshift.io/display-name": "Red Hat Single Sign-On 7.6 on OpenJDK",
 			"openshift.io/provider-display-name": "Red Hat, Inc.",
-			"version": "7.6.0.GA"
+			"version": "7.6.1.GA"
 		}
 	},
 	"spec": {

diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso76-https.json b/assets/operator/ocp-ppc64le/sso/templates/sso76-https.json
@@ -13,7 +13,7 @@
 			"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/",
 			"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.6 on OpenJDK server based deployment, securing RH-SSO communication using passthrough TLS.",
 			"template.openshift.io/support-url": "https://access.redhat.com",
-			"version": "7.6.0.GA"
+			"version": "7.6.1.GA"
 		}
 	},
 	"message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.",
@@ -539,7 +539,7 @@
 		}
 	],
 	"labels": {
-		"rhsso": "7.6.0.GA",
+		"rhsso": "7.6.1.GA",
 		"template": "sso76-https"
 	}
 }