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

…71-to-release-4.12 [release-4.12] OCPBUGS-4369: Update Cluster Sample Operator dependencies and libraries for OCP 4.12
openshift · Dec 2, 2022 · 83968a4 · 83968a4
2 parents e459868 + 56f4244
commit 83968a4
Show file tree

Hide file tree

Showing 94 changed files with 12,287 additions and 397 deletions.
diff --git a/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-rhel-aarch64.json b/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-rhel-aarch64.json
@@ -5,7 +5,8 @@
 		"name": "dotnet",
 		"creationTimestamp": null,
 		"annotations": {
-			"openshift.io/display-name": ".NET"
+			"openshift.io/display-name": ".NET",
+			"openshift.io/provider-display-name": "Red Hat"
 		}
 	},
 	"spec": {
@@ -16,18 +17,64 @@
 			{
 				"name": "latest",
 				"annotations": {
-					"description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.",
+					"description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/7.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.",
 					"iconClass": "icon-dotnet",
 					"openshift.io/display-name": ".NET (Latest)",
 					"sampleContextDir": "app",
-					"sampleRef": "dotnet-6.0",
+					"sampleRef": "dotnet-7.0",
 					"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex",
 					"supports": "dotnet",
 					"tags": "builder,.net,dotnet,dotnetcore,hidden"
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "6.0-ubi8"
+					"name": "7.0-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "7.0-ubi8",
+				"annotations": {
+					"description": "Build and run .NET 7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/7.0/build/README.md.",
+					"iconClass": "icon-dotnet",
+					"openshift.io/display-name": ".NET 7 (UBI 8)",
+					"sampleContextDir": "app",
+					"sampleRef": "dotnet-7.0",
+					"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex",
+					"supports": "dotnet:7.0,dotnet",
+					"tags": "builder,.net,dotnet,dotnetcore,dotnet70",
+					"version": "7.0"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.access.redhat.com/ubi8/dotnet-70:7.0"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "7.0",
+				"annotations": {
+					"description": "Build and run .NET 7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/7.0/build/README.md.",
+					"iconClass": "icon-dotnet",
+					"openshift.io/display-name": ".NET 7 (UBI 8)",
+					"sampleContextDir": "app",
+					"sampleRef": "dotnetcore-7.0",
+					"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex",
+					"supports": "dotnet:7.0,dotnet",
+					"tags": "builder,.net,dotnet,dotnetcore,dotnet70,hidden",
+					"version": "7.0"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.access.redhat.com/ubi8/dotnet-70:7.0"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-runtime-rhel-aarch64.json b/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-runtime-rhel-aarch64.json
@@ -5,7 +5,8 @@
 		"name": "dotnet-runtime",
 		"creationTimestamp": null,
 		"annotations": {
-			"openshift.io/display-name": ".NET Core Runtime"
+			"openshift.io/display-name": ".NET Core Runtime",
+			"openshift.io/provider-display-name": "Red Hat"
 		}
 	},
 	"spec": {
@@ -16,15 +17,55 @@
 			{
 				"name": "latest",
 				"annotations": {
-					"description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.",
+					"description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/7.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.",
 					"iconClass": "icon-dotnet",
 					"openshift.io/display-name": ".NET Runtime (Latest)",
 					"supports": "dotnet-runtime",
 					"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden"
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "6.0-ubi8"
+					"name": "7.0-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "7.0-ubi8",
+				"annotations": {
+					"description": "Run .NET 7 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/7.0/runtime/README.md.",
+					"iconClass": "icon-dotnet",
+					"openshift.io/display-name": ".NET 7 Runtime (UBI 8)",
+					"supports": "dotnet-runtime",
+					"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
+					"version": "7.0"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.access.redhat.com/ubi8/dotnet-70-runtime:7.0"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "7.0",
+				"annotations": {
+					"description": "Run .NET 7 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/7.0/runtime/README.md.",
+					"iconClass": "icon-dotnet",
+					"openshift.io/display-name": ".NET 7 Runtime (UBI 8)",
+					"supports": "dotnet-runtime",
+					"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden",
+					"version": "7.0"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.access.redhat.com/ubi8/dotnet-70-runtime:7.0"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json b/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json
@@ -47,7 +47,7 @@
 				},
 				"from": {
 					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi9/go-toolset:1.17.7"
+					"name": "registry.redhat.io/ubi9/go-toolset:1.17"
 				},
 				"generation": null,
 				"importPolicy": {},
@@ -68,7 +68,7 @@
 				},
 				"from": {
 					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi8/go-toolset:1.17.7"
+					"name": "registry.redhat.io/ubi8/go-toolset:1.17"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json b/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json
@@ -93,7 +93,7 @@
 					"sourceStrategy": {
 						"from": {
 							"kind": "ImageStreamTag",
-							"name": "httpd:2.4-el8",
+							"name": "httpd:${HTTPD_VERSION}",
 							"namespace": "${NAMESPACE}"
 						}
 					},
@@ -218,6 +218,13 @@
 			"value": "openshift",
 			"required": true
 		},
+		{
+			"name": "HTTPD_VERSION",
+			"displayName": "HTTPD Version",
+			"description": "Version of HTTPD image to be used (2.4-el8 by default).",
+			"value": "2.4-el8",
+			"required": true
+		},
 		{
 			"name": "MEMORY_LIMIT",
 			"displayName": "Memory Limit",

diff --git a/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json b/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json
@@ -422,8 +422,8 @@
 		{
 			"name": "NODEJS_VERSION",
 			"displayName": "Version of NodeJS Image",
-			"description": "Version of NodeJS image to be used (12-ubi8, 14-ubi8, or latest).",
-			"value": "14-ubi8",
+			"description": "Version of NodeJS image to be used (14-ubi8, 16-ubi8, or latest).",
+			"value": "16-ubi8",
 			"required": true
 		},
 		{

diff --git a/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json b/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json
@@ -439,8 +439,8 @@
 		{
 			"name": "NODEJS_VERSION",
 			"displayName": "Version of NodeJS Image",
-			"description": "Version of NodeJS image to be used (12-ubi8, 14-ubi8, or latest).",
-			"value": "14-ubi8",
+			"description": "Version of NodeJS image to be used (14-ubi8, 16-ubi8, or latest).",
+			"value": "16-ubi8",
 			"required": true
 		},
 		{