Merge pull request #344 from gabemontero/47-samples-bump

pull latest openshift/library for updating samples for 4.7
openshift · Dec 5, 2020 · d43f4d1 · d43f4d1
2 parents 2fe3a63 + 15ac89d
commit d43f4d1
Show file tree

Hide file tree

Showing 109 changed files with 5,500 additions and 5,355 deletions.
diff --git a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json
@@ -419,7 +419,7 @@
 							],
 							"from": {
 								"kind": "ImageStreamTag",
-								"name": "mysql:8.0-el8",
+								"name": "mysql:${MYSQL_VERSION}",
 								"namespace": "${NAMESPACE}"
 							}
 						},
@@ -454,6 +454,13 @@
 			"value": "7.3-ubi8",
 			"required": true
 		},
+		{
+			"name": "MYSQL_VERSION",
+			"displayName": "MySQL Version",
+			"description": "Version of MySQL image to be used (8.0-el8 or latest).",
+			"value": "8.0-el8",
+			"required": true
+		},
 		{
 			"name": "MEMORY_LIMIT",
 			"displayName": "Memory Limit",

diff --git a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json
@@ -438,7 +438,7 @@
 							],
 							"from": {
 								"kind": "ImageStreamTag",
-								"name": "mysql:8.0-el8",
+								"name": "mysql:${MYSQL_VERSION}",
 								"namespace": "${NAMESPACE}"
 							}
 						},
@@ -473,6 +473,13 @@
 			"value": "7.3-ubi8",
 			"required": true
 		},
+		{
+			"name": "MYSQL_VERSION",
+			"displayName": "MySQL Version",
+			"description": "Version of MySQL image to be used (8.0-el8 or latest).",
+			"value": "8.0-el8",
+			"required": true
+		},
 		{
 			"name": "MEMORY_LIMIT",
 			"displayName": "Memory Limit",

diff --git a/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json b/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json
@@ -26,7 +26,7 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "1.13.4-ubi8"
+					"name": "1.14.7-ubi8"
 				},
 				"generation": null,
 				"importPolicy": {},
@@ -35,19 +35,19 @@
 				}
 			},
 			{
-				"name": "1.13.4-ubi8",
+				"name": "1.14.7-ubi8",
 				"annotations": {
 					"description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.",
 					"iconClass": "icon-go-gopher",
-					"openshift.io/display-name": "Go 1.13.4 (UBI 8)",
+					"openshift.io/display-name": "Go 1.14.7 (UBI 8)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",
 					"sampleRepo": "https://github.com/sclorg/golang-ex.git",
 					"supports": "golang",
 					"tags": "builder,golang,go"
 				},
 				"from": {
 					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi8/go-toolset:1.13.4"
+					"name": "registry.redhat.io/ubi8/go-toolset:1.14.7"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json b/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json
@@ -16,7 +16,7 @@
 			{
 				"name": "latest",
 				"annotations": {
-					"description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.",
+					"description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.",
 					"iconClass": "icon-nginx",
 					"openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -26,7 +26,29 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "1.16-el8"
+					"name": "1.18-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"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": {},

diff --git a/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json b/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json
@@ -16,7 +16,7 @@
 			{
 				"name": "latest",
 				"annotations": {
-					"description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.",
+					"description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.",
 					"iconClass": "icon-nodejs",
 					"openshift.io/display-name": "Node.js (Latest)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -26,7 +26,28 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "12-ubi8"
+					"name": "14-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "14-ubi8",
+				"annotations": {
+					"description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.",
+					"iconClass": "icon-nodejs",
+					"openshift.io/display-name": "Node.js 14 (UBI 8)",
+					"openshift.io/provider-display-name": "Red Hat, Inc.",
+					"sampleRepo": "https://github.com/sclorg/nodejs-ex.git",
+					"tags": "builder,nodejs",
+					"version": "14"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/ubi8/nodejs-14:latest"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json b/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json
@@ -16,7 +16,7 @@
 			{
 				"name": "latest",
 				"annotations": {
-					"description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.",
+					"description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30-mod_fcgid/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.",
 					"iconClass": "icon-perl",
 					"openshift.io/display-name": "Perl (Latest)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -26,7 +26,29 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "5.26-ubi8"
+					"name": "5.30-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "5.30-ubi8",
+				"annotations": {
+					"description": "Build and run Perl 5.30 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30-mod_fcgid/README.md.",
+					"iconClass": "icon-perl",
+					"openshift.io/display-name": "Perl 5.30 (UBI 8)",
+					"openshift.io/provider-display-name": "Red Hat, Inc.",
+					"sampleRepo": "https://github.com/sclorg/dancer-ex.git",
+					"supports": "perl:5.30,perl",
+					"tags": "builder,perl",
+					"version": "5.30"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/ubi8/perl-530:latest"
 				},
 				"generation": null,
 				"importPolicy": {},
@@ -37,7 +59,7 @@
 			{
 				"name": "5.26-ubi8",
 				"annotations": {
-					"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.",
+					"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.",
 					"iconClass": "icon-perl",
 					"openshift.io/display-name": "Perl 5.26 (UBI 8)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",

diff --git a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json
@@ -16,7 +16,7 @@
 			{
 				"name": "latest",
 				"annotations": {
-					"description": "Build and run PHP applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major version updates.",
+					"description": "Build and run PHP applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major version updates.",
 					"iconClass": "icon-php",
 					"openshift.io/display-name": "PHP (Latest)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -26,7 +26,29 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "7.3-ubi8"
+					"name": "7.4-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "7.4-ubi8",
+				"annotations": {
+					"description": "Build and run PHP 7.4 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.4/README.md.",
+					"iconClass": "icon-php",
+					"openshift.io/display-name": "PHP 7.4 (UBI 8)",
+					"openshift.io/provider-display-name": "Red Hat, Inc.",
+					"sampleRepo": "https://github.com/sclorg/cakephp-ex.git",
+					"supports": "php:7.4,php",
+					"tags": "builder,php",
+					"version": "7.4"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/ubi8/php-74:latest"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json b/assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json
@@ -26,7 +26,29 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "2.6-ubi8"
+					"name": "2.7-ubi8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "2.7-ubi8",
+				"annotations": {
+					"description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.",
+					"iconClass": "icon-ruby",
+					"openshift.io/display-name": "Ruby 2.7 (UBI 8)",
+					"openshift.io/provider-display-name": "Red Hat, Inc.",
+					"sampleRepo": "https://github.com/sclorg/ruby-ex.git",
+					"supports": "ruby:2.7,ruby",
+					"tags": "builder,ruby",
+					"version": "2.7"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/ubi8/ruby-27:latest"
 				},
 				"generation": null,
 				"importPolicy": {},

diff --git a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json
@@ -419,7 +419,7 @@
 							],
 							"from": {
 								"kind": "ImageStreamTag",
-								"name": "mysql:8.0-el8",
+								"name": "mysql:${MYSQL_VERSION}",
 								"namespace": "${NAMESPACE}"
 							}
 						},
@@ -454,6 +454,13 @@
 			"value": "7.3-ubi8",
 			"required": true
 		},
+		{
+			"name": "MYSQL_VERSION",
+			"displayName": "MySQL Version",
+			"description": "Version of MySQL image to be used (8.0-el8 or latest).",
+			"value": "8.0-el8",
+			"required": true
+		},
 		{
 			"name": "MEMORY_LIMIT",
 			"displayName": "Memory Limit",

diff --git a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json
@@ -438,7 +438,7 @@
 							],
 							"from": {
 								"kind": "ImageStreamTag",
-								"name": "mysql:8.0-el8",
+								"name": "mysql:${MYSQL_VERSION}",
 								"namespace": "${NAMESPACE}"
 							}
 						},
@@ -473,6 +473,13 @@
 			"value": "7.3-ubi8",
 			"required": true
 		},
+		{
+			"name": "MYSQL_VERSION",
+			"displayName": "MySQL Version",
+			"description": "Version of MySQL image to be used (8.0-el8 or latest).",
+			"value": "8.0-el8",
+			"required": true
+		},
 		{
 			"name": "MEMORY_LIMIT",
 			"displayName": "Memory Limit",

diff --git a/assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json b/assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json
@@ -26,7 +26,7 @@
 				},
 				"from": {
 					"kind": "ImageStreamTag",
-					"name": "1.13.4-ubi8"
+					"name": "1.14.7-ubi8"
 				},
 				"generation": null,
 				"importPolicy": {},
@@ -35,19 +35,19 @@
 				}
 			},
 			{
-				"name": "1.13.4-ubi8",
+				"name": "1.14.7-ubi8",
 				"annotations": {
 					"description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.",
 					"iconClass": "icon-go-gopher",
-					"openshift.io/display-name": "Go 1.13.4 (UBI 8)",
+					"openshift.io/display-name": "Go 1.14.7 (UBI 8)",
 					"openshift.io/provider-display-name": "Red Hat, Inc.",
 					"sampleRepo": "https://github.com/sclorg/golang-ex.git",
 					"supports": "golang",
 					"tags": "builder,golang,go"
 				},
 				"from": {
 					"kind": "DockerImage",
-					"name": "registry.redhat.io/ubi8/go-toolset:1.13.4"
+					"name": "registry.redhat.io/ubi8/go-toolset:1.14.7"
 				},
 				"generation": null,
 				"importPolicy": {},