diff --git a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json index 1b96f4391..dd2c6aac5 100755 --- a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json @@ -139,11 +139,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,7 +152,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -264,25 +267,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -308,11 +293,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -320,7 +306,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -409,26 +397,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json index e9ab73ed7..17dc52fc1 100755 --- a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json @@ -12,8 +12,7 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/support-url": "https://access.redhat.com", - "tags": "quickstart,php,cakephp", - "template.openshift.io/bindable": "false" + "tags": "quickstart,php,cakephp" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/cakephp-ex/blob/master/README.md.", @@ -58,6 +57,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -139,11 +141,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,20 +154,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "cakephp-mysql-persistent" - }, - "failurePolicy": "Retry" - } - }, "type": "Recreate" }, "template": { @@ -241,7 +235,7 @@ "periodSeconds": 60, "timeoutSeconds": 3 }, - "name": "cakephp-mysql-persistent", + "name": "${NAME}", "ports": [ { "containerPort": 8080 @@ -262,27 +256,72 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "DATABASE_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECRET_TOKEN", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-secret-token", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECURITY_SALT", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-security-salt", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_NAME", + "value": "${DATABASE_NAME}" + }, + { + "name": "DATABASE_ENGINE", + "value": "${DATABASE_NAME}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + } + ], + "image": " ", + "name": "cakephp-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -325,11 +364,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -337,7 +377,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -428,26 +470,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json index 3c5a3829f..b71db5074 100755 --- a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -281,8 +266,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", @@ -382,26 +367,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json index f33a6637b..e5696d624 100755 --- a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -298,11 +283,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -310,7 +296,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -401,26 +389,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -446,6 +415,13 @@ "value": "5.30-ubi8", "required": true }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (8.0-el8, 8.0-el9, or latest).", + "value": "8.0-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json b/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json index dd53dd437..c28ff47bc 100755 --- a/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json @@ -5,7 +5,7 @@ "name": "httpd", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Apache HTTP Server (httpd)" + "openshift.io/display-name": "Apache HTTP Server" } }, "spec": { @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "2.4-ubi8", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major version updates.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server (Latest)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd" + "tags": "builder,httpd", + "version": "2.4" }, "from": { - "kind": "ImageStreamTag", - "name": "2.4-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -38,11 +38,10 @@ "name": "2.4-ubi9", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, @@ -57,20 +56,19 @@ } }, { - "name": "2.4-ubi8", + "name": "2.4-el8", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/httpd-24:latest" + "name": "registry.redhat.io/rhel8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +77,19 @@ } }, { - "name": "2.4-el8", + "name": "latest", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", + "tags": "builder,httpd", "version": "2.4" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/httpd-24" + "kind": "ImageStreamTag", + "name": "2.4-ubi8" }, "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 index 044f9ff25..fba65b04f 100755 --- a/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json @@ -122,11 +122,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -134,10 +135,12 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { @@ -181,25 +184,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "httpd-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -271,6 +256,7 @@ ], "labels": { "app": "httpd-example", + "app.openshift.io/runtime": "apache", "template": "httpd-example" } } \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json index e144a50ae..7680a2b0e 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json index da704b43c..3bcf9bbcb 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-rhel-aarch64.json index 76317618e..0e47d6203 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-rhel-aarch64.json @@ -160,6 +160,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json index 5d19707fe..060c14ac6 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json @@ -146,6 +146,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-21-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-21-rhel-aarch64.json new file mode 100755 index 000000000..94a298d87 --- /dev/null +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-21-rhel-aarch64.json @@ -0,0 +1,43 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json new file mode 100755 index 000000000..d3b2a7082 --- /dev/null +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json @@ -0,0 +1,41 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json index ea945d5dd..993bb7932 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json index a9d4a8d5a..de0a4f886 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json index 02d417ece..690ec7fc6 100755 --- a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json @@ -49,8 +49,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -60,7 +60,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -68,7 +70,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json index 76dc1b1ba..0a2635589 100755 --- a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json @@ -66,8 +66,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -77,7 +77,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -85,7 +87,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json b/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json index 17c1884e3..308ec7f71 100755 --- a/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json @@ -13,25 +13,6 @@ "local": false }, "tags": [ - { - "name": "latest", - "annotations": { - "description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "10.3-el8", "annotations": { @@ -91,6 +72,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "latest", + "annotations": { + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-mariadb", + "openshift.io/display-name": "MariaDB 10.5 (Latest)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,mariadb", + "version": "10.5" + }, + "from": { + "kind": "ImageStreamTag", + "name": "10.5-el8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json index 4debbecc5..6b7914675 100755 --- a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json @@ -58,10 +58,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -69,7 +70,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -175,26 +178,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json index 840559cb5..cc8550984 100755 --- a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json @@ -75,10 +75,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +87,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json index dcd7c930f..3efbebbd7 100755 --- a/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json @@ -66,10 +66,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -77,7 +78,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,27 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json b/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json index d150c23dc..987585c7e 100755 --- a/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json @@ -41,6 +41,7 @@ "kind": "Service", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,10 +76,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +88,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json b/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json index 16bdb6f4c..1ab2f2bc8 100755 --- a/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json @@ -5,7 +5,7 @@ "name": "nginx", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (nginx)" + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy" } }, "spec": { @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "1.22-ubi8", "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.20/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 UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx" + "tags": "builder,nginx", + "version": "1.22" }, "from": { - "kind": "ImageStreamTag", - "name": "1.20-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -37,12 +37,11 @@ { "name": "1.20-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", "version": "1.20" }, @@ -57,20 +56,40 @@ } }, { - "name": "1.20-ubi8", + "name": "1.22-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-120:latest" + "name": "registry.redhat.io/ubi9/nginx-122:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-nginx", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git", + "tags": "builder,nginx", + "version": "1.22" + }, + "from": { + "kind": "ImageStreamTag", + "name": "1.22-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json b/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json index 9f84de3ab..57a9655ae 100755 --- a/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json @@ -124,11 +124,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -136,17 +137,20 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "app": "${NAME}", + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { "labels": { + "app": "${NAME}", "name": "${NAME}" - }, - "name": "${NAME}" + } }, "spec": { "containers": [ @@ -183,25 +187,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "nginx-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -272,6 +258,7 @@ } ], "labels": { - "template": "nginx-example" + "app": "${NAME}", + "template": "${NAME}" } } \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json b/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json index 5eda68405..e1dbd371e 100755 --- 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/18/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/20/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,49 @@ }, "from": { "kind": "ImageStreamTag", - "name": "18-ubi8" + "name": "20-ubi9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi9", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 9)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi9/nodejs-20:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi9-minimal", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 9 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +119,19 @@ } }, { - "name": "18-ubi8", + "name": "20-ubi8", "annotations": { - "description": "Build and run Node.js 18 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/18/README.md.", + "description": "Build and run Node.js 20 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/20/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/display-name": "Node.js 20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18:latest" + "name": "registry.redhat.io/ubi8/nodejs-20:latest" }, "generation": null, "importPolicy": {}, @@ -98,19 +140,19 @@ } }, { - "name": "18-ubi8-minimal", + "name": "20-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 20 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 20 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -119,19 +161,19 @@ } }, { - "name": "16-ubi9", + "name": "18-ubi8", "annotations": { - "description": "Build and run Node.js 16 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", + "description": "Build and run Node.js 18 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/18/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 9)", + "openshift.io/display-name": "Node.js 18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "16" + "version": "18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-16:latest" + "name": "registry.redhat.io/ubi8/nodejs-18:latest" }, "generation": null, "importPolicy": {}, @@ -140,19 +182,19 @@ } }, { - "name": "16-ubi9-minimal", + "name": "18-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 16 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 9 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "16" + "version": "18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-16-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -161,11 +203,11 @@ } }, { - "name": "16-ubi8", + "name": "16-ubi9", "annotations": { - "description": "Build and run Node.js 16 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/16/README.md.", + "description": "Build and run Node.js 16 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -173,7 +215,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-16:latest" + "name": "registry.redhat.io/ubi9/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -182,11 +224,11 @@ } }, { - "name": "16-ubi8-minimal", + "name": "16-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", + "description": "Build and run Node.js 16 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -194,7 +236,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-16-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -203,19 +245,19 @@ } }, { - "name": "14-ubi8", + "name": "16-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.", + "description": "Build and run Node.js 16 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/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -224,19 +266,19 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-16-minimal: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 index 0c11d7126..c47d852ef 100755 --- a/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json @@ -78,28 +78,6 @@ "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": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "5.26-ubi8", "annotations": { diff --git a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json index 576f3e295..fc5b6b828 100755 --- a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json @@ -14,19 +14,40 @@ }, "tags": [ { - "name": "latest", + "name": "7.4-ubi8", "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/8.0/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 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 (Latest)", + "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", - "tags": "builder,php" + "tags": "builder,php", + "version": "7.4" }, "from": { - "kind": "ImageStreamTag", - "name": "8.0-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/php-74:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "8.0-ubi8", + "annotations": { + "description": "Build and run PHP 8.0 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/8.0/README.md.", + "iconClass": "icon-php", + "openshift.io/display-name": "PHP 8.0 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", + "tags": "builder,php", + "version": "8.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/php-80:latest" }, "generation": null, "importPolicy": {}, @@ -42,7 +63,6 @@ "openshift.io/display-name": "PHP 8.0 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:8.0,php", "tags": "builder,php", "version": "8.0" }, @@ -57,20 +77,19 @@ } }, { - "name": "8.0-ubi8", + "name": "8.1-ubi9", "annotations": { - "description": "Build and run PHP 8.0 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/8.0/README.md.", + "description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 8.0 (UBI 8)", + "openshift.io/display-name": "PHP 8.1 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:8.0,php", "tags": "builder,php", - "version": "8.0" + "version": "8.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-80:latest" + "name": "registry.redhat.io/ubi9/php-81:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +98,19 @@ } }, { - "name": "7.4-ubi8", + "name": "latest", "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.", + "description": "Build and run PHP 8.0 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/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.4 (UBI 8)", + "openshift.io/display-name": "PHP 8.0 (Latest)", "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" + "version": "8.0" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-74:latest" + "kind": "ImageStreamTag", + "name": "8.0-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json b/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json index ecbc8d933..18d93c201 100755 --- a/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json @@ -14,17 +14,18 @@ }, "tags": [ { - "name": "latest", + "name": "10-el8", "annotations": { - "description": "Provides a PostgreSQL database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major version updates.", + "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Latest)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql" + "tags": "database,postgresql", + "version": "10" }, "from": { - "kind": "ImageStreamTag", - "name": "13-el8" + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/postgresql-10:latest" }, "generation": null, "importPolicy": {}, @@ -33,18 +34,18 @@ } }, { - "name": "13-el9", + "name": "12-el8", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 12 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-13:latest" + "name": "registry.redhat.io/rhel8/postgresql-12:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +74,18 @@ } }, { - "name": "12-el8", + "name": "15-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "12" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-12:latest" + "name": "registry.redhat.io/rhel8/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +94,58 @@ } }, { - "name": "10-el8", + "name": "13-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-10:latest" + "name": "registry.redhat.io/rhel9/postgresql-13:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "15-el9", + "annotations": { + "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "15" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel9/postgresql-15:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 13 (Latest)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "13" + }, + "from": { + "kind": "ImageStreamTag", + "name": "13-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json index 1a7d47325..5d636e6a9 100755 --- a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json @@ -64,10 +64,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,7 +76,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -176,27 +179,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json index 623bc36dd..92478a97b 100755 --- a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json @@ -81,10 +81,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -92,7 +93,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -193,27 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json index f688a0761..9b4cb3d9e 100755 --- a/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json @@ -7,13 +7,12 @@ "annotations": { "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Rails + PostgreSQL", - "openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", - "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/support-url": "https://access.redhat.com", + "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", "tags": "quickstart,ruby,rails", - "template.openshift.io/bindable": "false" + "template.openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", + "template.openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", + "template.openshift.io/provider-display-name": "Red Hat, Inc.", + "template.openshift.io/support-url": "https://access.redhat.com" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", @@ -22,6 +21,10 @@ "apiVersion": "v1", "kind": "Secret", "metadata": { + "annotations": { + "template.openshift.io/expose-password": "{.data['application-password']}", + "template.openshift.io/expose-username": "{.data['application-user']}" + }, "name": "${NAME}" }, "stringData": { @@ -59,6 +62,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -117,7 +123,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +146,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,20 +159,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "${NAME}" - }, - "failurePolicy": "Abort" - } - }, "type": "Recreate" }, "template": { @@ -278,27 +276,89 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "POSTGRESQL_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "SECRET_KEY_BASE", + "valueFrom": { + "secretKeyRef": { + "key": "keybase", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DATABASE_NAME}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + }, + { + "name": "APPLICATION_USER", + "valueFrom": { + "secretKeyRef": { + "key": "application-user", + "name": "${NAME}" + } + } + }, + { + "name": "APPLICATION_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "application-password", + "name": "${NAME}" + } + } + }, + { + "name": "RAILS_ENV", + "value": "${RAILS_ENV}" + } + ], + "image": " ", + "name": "ruby-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -341,11 +401,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -353,7 +414,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -448,26 +511,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -486,6 +530,20 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Postgresql Version", + "description": "Version of Postgresql image to be used (12-el8 by default).", + "value": "12-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json index e7b7be7a4..1a4641f42 100755 --- a/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json @@ -96,9 +96,6 @@ "name": "${NAME}:latest" } }, - "postCommit": { - "script": "bundle exec rake test" - }, "source": { "contextDir": "${CONTEXT_DIR}", "git": { @@ -117,7 +114,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +137,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,7 +150,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -280,25 +280,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -324,11 +306,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -336,7 +319,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -429,26 +414,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -467,6 +433,13 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json b/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json index 104f1f03c..72642ac20 100755 --- a/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json @@ -60,10 +60,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -71,7 +72,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -154,27 +157,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json b/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json index d1f4ed9d6..9f3ea41e2 100755 --- a/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json @@ -77,10 +77,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -88,7 +89,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -171,27 +174,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json index 1b96f4391..dd2c6aac5 100755 --- a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json @@ -139,11 +139,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,7 +152,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -264,25 +267,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -308,11 +293,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -320,7 +306,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -409,26 +397,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json index e9ab73ed7..17dc52fc1 100755 --- a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json @@ -12,8 +12,7 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/support-url": "https://access.redhat.com", - "tags": "quickstart,php,cakephp", - "template.openshift.io/bindable": "false" + "tags": "quickstart,php,cakephp" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/cakephp-ex/blob/master/README.md.", @@ -58,6 +57,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -139,11 +141,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,20 +154,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "cakephp-mysql-persistent" - }, - "failurePolicy": "Retry" - } - }, "type": "Recreate" }, "template": { @@ -241,7 +235,7 @@ "periodSeconds": 60, "timeoutSeconds": 3 }, - "name": "cakephp-mysql-persistent", + "name": "${NAME}", "ports": [ { "containerPort": 8080 @@ -262,27 +256,72 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "DATABASE_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECRET_TOKEN", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-secret-token", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECURITY_SALT", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-security-salt", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_NAME", + "value": "${DATABASE_NAME}" + }, + { + "name": "DATABASE_ENGINE", + "value": "${DATABASE_NAME}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + } + ], + "image": " ", + "name": "cakephp-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -325,11 +364,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -337,7 +377,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -428,26 +470,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json index 3c5a3829f..b71db5074 100755 --- a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -281,8 +266,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", @@ -382,26 +367,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json index f33a6637b..e5696d624 100755 --- a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -298,11 +283,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -310,7 +296,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -401,26 +389,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -446,6 +415,13 @@ "value": "5.30-ubi8", "required": true }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (8.0-el8, 8.0-el9, or latest).", + "value": "8.0-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json b/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json index fc5ce27db..0fab828d4 100755 --- a/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json +++ b/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json @@ -5,7 +5,7 @@ "name": "httpd", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Apache HTTP Server (httpd)" + "openshift.io/display-name": "Apache HTTP Server" } }, "spec": { @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "2.4-ubi8", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major version updates.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server (Latest)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd" + "tags": "builder,httpd", + "version": "2.4" }, "from": { - "kind": "ImageStreamTag", - "name": "2.4-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -38,11 +38,10 @@ "name": "2.4-ubi9", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, @@ -57,20 +56,19 @@ } }, { - "name": "2.4-ubi8", + "name": "2.4-el7", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/httpd-24:latest" + "name": "registry.redhat.io/rhscl/httpd-24-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -82,39 +80,16 @@ "name": "2.4-el8", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", - "version": "2.4" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/httpd-24" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-el7", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/httpd-24-rhel7" + "name": "registry.redhat.io/rhel8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +98,19 @@ } }, { - "name": "2.4", + "name": "latest", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", + "tags": "builder,httpd", "version": "2.4" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/httpd-24-rhel7" + "kind": "ImageStreamTag", + "name": "2.4-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json b/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json index 044f9ff25..fba65b04f 100755 --- a/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json @@ -122,11 +122,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -134,10 +135,12 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { @@ -181,25 +184,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "httpd-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -271,6 +256,7 @@ ], "labels": { "app": "httpd-example", + "app.openshift.io/runtime": "apache", "template": "httpd-example" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json index 2bea379b1..15428dfdb 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json @@ -167,6 +167,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.16", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.16" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.17", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json index 15d8790e1..6ba668ca2 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json @@ -211,6 +211,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.16", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.16" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.17", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json index e144a50ae..7680a2b0e 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json index da704b43c..3bcf9bbcb 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-rhel-ppc64le.json index 76317618e..0e47d6203 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-rhel-ppc64le.json @@ -160,6 +160,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json index 5d19707fe..060c14ac6 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json @@ -146,6 +146,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-21-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-21-rhel-ppc64le.json new file mode 100755 index 000000000..94a298d87 --- /dev/null +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-21-rhel-ppc64le.json @@ -0,0 +1,43 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json new file mode 100755 index 000000000..d3b2a7082 --- /dev/null +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json @@ -0,0 +1,41 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json index ea945d5dd..993bb7932 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json index a9d4a8d5a..de0a4f886 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json index 02d417ece..690ec7fc6 100755 --- a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json @@ -49,8 +49,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -60,7 +60,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -68,7 +70,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json index 76dc1b1ba..0a2635589 100755 --- a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json @@ -66,8 +66,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -77,7 +77,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -85,7 +87,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json b/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json index 06ab56b14..6881b0541 100755 --- a/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json +++ b/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json @@ -14,37 +14,18 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el8", + "name": "10.3-el7", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-103:latest" + "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -53,18 +34,18 @@ } }, { - "name": "10.3-el7", + "name": "10.5-el7", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", - "version": "10.3" + "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +54,18 @@ } }, { - "name": "10.3", + "name": "10.3-el8", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb,hidden", + "tags": "database,mariadb", "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-103:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +74,18 @@ } }, { - "name": "10.5-el7", + "name": "10.5-el8", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-105:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +94,18 @@ } }, { - "name": "10.5-el8", + "name": "10.5-el9", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 8)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-105:latest" + "name": "registry.redhat.io/rhel9/mariadb-105:latest" }, "generation": null, "importPolicy": {}, @@ -133,18 +114,18 @@ } }, { - "name": "10.5-el9", + "name": "latest", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 9)", + "openshift.io/display-name": "MariaDB 10.5 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/mariadb-105:latest" + "kind": "ImageStreamTag", + "name": "10.5-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json index 4debbecc5..6b7914675 100755 --- a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json @@ -58,10 +58,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -69,7 +70,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -175,26 +178,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json index 840559cb5..cc8550984 100755 --- a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json @@ -75,10 +75,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +87,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json index dcd7c930f..3efbebbd7 100755 --- a/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json @@ -66,10 +66,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -77,7 +78,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,27 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json b/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json index d150c23dc..987585c7e 100755 --- a/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json @@ -41,6 +41,7 @@ "kind": "Service", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,10 +76,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +88,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json index bef553a51..2c614d342 100755 --- a/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json +++ b/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json @@ -5,7 +5,7 @@ "name": "nginx", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (nginx)" + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy" } }, "spec": { @@ -14,19 +14,40 @@ }, "tags": [ { - "name": "latest", + "name": "1.20-ubi7", "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.20/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 UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx" + "tags": "builder,nginx", + "version": "1.20" }, "from": { - "kind": "ImageStreamTag", - "name": "1.20-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/nginx-120:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.22-ubi8", + "annotations": { + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", + "iconClass": "icon-nginx", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git", + "tags": "builder,nginx", + "version": "1.22" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -37,12 +58,11 @@ { "name": "1.20-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", "version": "1.20" }, @@ -57,20 +77,19 @@ } }, { - "name": "1.20-ubi8", + "name": "1.22-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-120:latest" + "name": "registry.redhat.io/ubi9/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +98,19 @@ } }, { - "name": "1.20-ubi7", + "name": "latest", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nginx-120:latest" + "kind": "ImageStreamTag", + "name": "1.22-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json b/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json index 9f84de3ab..57a9655ae 100755 --- a/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json @@ -124,11 +124,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -136,17 +137,20 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "app": "${NAME}", + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { "labels": { + "app": "${NAME}", "name": "${NAME}" - }, - "name": "${NAME}" + } }, "spec": { "containers": [ @@ -183,25 +187,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "nginx-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -272,6 +258,7 @@ } ], "labels": { - "template": "nginx-example" + "app": "${NAME}", + "template": "${NAME}" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json index deb52ecf4..5e0a21b7b 100755 --- a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.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/18/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/20/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,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "18-ubi8" + "name": "20-ubi9" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "18-ubi9", + "name": "20-ubi9", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18/README.md.", + "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 9)", + "openshift.io/display-name": "Node.js 20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-18:latest" + "name": "registry.redhat.io/ubi9/nodejs-20:latest" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "18-ubi9-minimal", + "name": "18-ubi9", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 9 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-18:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "18-ubi8", + "name": "20-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 18 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/18/README.md.", + "description": "Build and run Node.js 20 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/display-name": "Node.js 20 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18:latest" + "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -98,11 +98,11 @@ } }, { - "name": "18-ubi8-minimal", + "name": "18-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -110,7 +110,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-18-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -160,6 +160,90 @@ "type": "Local" } }, + { + "name": "20-ubi8", + "annotations": { + "description": "Build and run Node.js 20 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/20/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-20:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi8-minimal", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "18-ubi8", + "annotations": { + "description": "Build and run Node.js 18 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/18/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-18:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "18-ubi8-minimal", + "annotations": { + "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "16-ubi8", "annotations": { diff --git a/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json b/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json index d35582336..445ee3b08 100755 --- a/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json +++ b/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json @@ -78,28 +78,6 @@ "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": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "5.30-el7", "annotations": { diff --git a/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json b/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json index 10a1f69db..67c1b2bb4 100755 --- a/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "7.3-ubi7", "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/8.0/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 7.3 applications on UBI 7. 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.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP (Latest)", + "openshift.io/display-name": "PHP 7.3 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php", - "tags": "builder,php" + "tags": "builder,php", + "version": "7.3" }, "from": { - "kind": "ImageStreamTag", - "name": "8.0-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/php-73:latest" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,19 @@ } }, { - "name": "8.0-ubi9", + "name": "7.4-ubi8", "annotations": { - "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", + "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 8.0 (UBI 9)", + "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:8.0,php", "tags": "builder,php", - "version": "8.0" + "version": "7.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/php-80:latest" + "name": "registry.redhat.io/ubi8/php-74:latest" }, "generation": null, "importPolicy": {}, @@ -64,7 +63,6 @@ "openshift.io/display-name": "PHP 8.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:8.0,php", "tags": "builder,php", "version": "8.0" }, @@ -79,20 +77,19 @@ } }, { - "name": "7.4-ubi8", + "name": "8.0-ubi9", "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.", + "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.4 (UBI 8)", + "openshift.io/display-name": "PHP 8.0 (UBI 9)", "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" + "version": "8.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-74:latest" + "name": "registry.redhat.io/ubi9/php-80:latest" }, "generation": null, "importPolicy": {}, @@ -101,20 +98,19 @@ } }, { - "name": "7.3-ubi7", + "name": "8.1-ubi9", "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 7. 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.", + "description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 7)", + "openshift.io/display-name": "PHP 8.1 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", "tags": "builder,php", - "version": "7.3" + "version": "8.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/php-73:latest" + "name": "registry.redhat.io/ubi9/php-81:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +119,19 @@ } }, { - "name": "7.3", + "name": "latest", "annotations": { - "description": "Build and run PHP 7.3 applications on RHEL 7. 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.", + "description": "Build and run PHP 8.0 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/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3", + "openshift.io/display-name": "PHP 8.0 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php,hidden", - "version": "7.3" + "tags": "builder,php", + "version": "8.0" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/php-73-rhel7:latest" + "kind": "ImageStreamTag", + "name": "8.0-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json b/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json index 101252626..bdc1bbc80 100755 --- a/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json +++ b/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json @@ -14,57 +14,18 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Provides a PostgreSQL database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major version updates.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql" - }, - "from": { - "kind": "ImageStreamTag", - "name": "15-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "" - } - }, - { - "name": "15-el9", - "annotations": { - "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "15" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-15:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "15-el8", + "name": "10-el7", "annotations": { - "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "15" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-15:latest" + "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +34,18 @@ } }, { - "name": "13-el9", + "name": "12-el7", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-13:latest" + "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +54,18 @@ } }, { - "name": "13-el8", + "name": "13-el7", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-13:latest" + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +74,18 @@ } }, { - "name": "13-el7", + "name": "10-el8", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-10:latest" }, "generation": null, "importPolicy": {}, @@ -153,18 +114,18 @@ } }, { - "name": "12-el7", + "name": "13-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "12" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-13:latest" }, "generation": null, "importPolicy": {}, @@ -173,18 +134,18 @@ } }, { - "name": "12", + "name": "15-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Ephemeral) 12", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql,hidden", - "version": "12" + "tags": "database,postgresql", + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -193,18 +154,18 @@ } }, { - "name": "10-el8", + "name": "13-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-10:latest" + "name": "registry.redhat.io/rhel9/postgresql-13:latest" }, "generation": null, "importPolicy": {}, @@ -213,18 +174,18 @@ } }, { - "name": "10-el7", + "name": "15-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "name": "registry.redhat.io/rhel9/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -233,18 +194,18 @@ } }, { - "name": "10", + "name": "latest", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Ephemeral) 10", + "openshift.io/display-name": "PostgreSQL 15 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql,hidden", - "version": "10" + "tags": "database,postgresql", + "version": "15" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "kind": "ImageStreamTag", + "name": "15-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json index 1a7d47325..5d636e6a9 100755 --- a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json @@ -64,10 +64,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,7 +76,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -176,27 +179,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json index 623bc36dd..92478a97b 100755 --- a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json @@ -81,10 +81,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -92,7 +93,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -193,27 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json index f688a0761..9b4cb3d9e 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json @@ -7,13 +7,12 @@ "annotations": { "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Rails + PostgreSQL", - "openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", - "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/support-url": "https://access.redhat.com", + "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", "tags": "quickstart,ruby,rails", - "template.openshift.io/bindable": "false" + "template.openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", + "template.openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", + "template.openshift.io/provider-display-name": "Red Hat, Inc.", + "template.openshift.io/support-url": "https://access.redhat.com" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", @@ -22,6 +21,10 @@ "apiVersion": "v1", "kind": "Secret", "metadata": { + "annotations": { + "template.openshift.io/expose-password": "{.data['application-password']}", + "template.openshift.io/expose-username": "{.data['application-user']}" + }, "name": "${NAME}" }, "stringData": { @@ -59,6 +62,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -117,7 +123,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +146,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,20 +159,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "${NAME}" - }, - "failurePolicy": "Abort" - } - }, "type": "Recreate" }, "template": { @@ -278,27 +276,89 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "POSTGRESQL_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "SECRET_KEY_BASE", + "valueFrom": { + "secretKeyRef": { + "key": "keybase", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DATABASE_NAME}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + }, + { + "name": "APPLICATION_USER", + "valueFrom": { + "secretKeyRef": { + "key": "application-user", + "name": "${NAME}" + } + } + }, + { + "name": "APPLICATION_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "application-password", + "name": "${NAME}" + } + } + }, + { + "name": "RAILS_ENV", + "value": "${RAILS_ENV}" + } + ], + "image": " ", + "name": "ruby-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -341,11 +401,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -353,7 +414,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -448,26 +511,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -486,6 +530,20 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Postgresql Version", + "description": "Version of Postgresql image to be used (12-el8 by default).", + "value": "12-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json index e7b7be7a4..1a4641f42 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json @@ -96,9 +96,6 @@ "name": "${NAME}:latest" } }, - "postCommit": { - "script": "bundle exec rake test" - }, "source": { "contextDir": "${CONTEXT_DIR}", "git": { @@ -117,7 +114,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +137,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,7 +150,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -280,25 +280,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -324,11 +306,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -336,7 +319,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -429,26 +414,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -467,6 +433,13 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json b/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json index 104f1f03c..72642ac20 100755 --- a/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json @@ -60,10 +60,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -71,7 +72,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -154,27 +157,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json b/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json index d1f4ed9d6..9f3ea41e2 100755 --- a/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json @@ -77,10 +77,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -88,7 +89,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -171,27 +174,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-ppc64le/sso/imagestreams/sso76-openshift-rhel8.json b/assets/operator/ocp-ppc64le/sso/imagestreams/sso76-openshift-rhel8.json index a1fcd2010..879421e9e 100755 --- 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.4.GA" + "version": "7.6.7.GA" } }, "spec": { diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-https.json b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-https.json index e8aa6efea..e14e0333c 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-https.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-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. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-https' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -282,7 +282,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -314,7 +318,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -553,7 +562,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql-persistent.json b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql-persistent.json index e66e3e973..747b03a0b 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql-persistent.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, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-postgresql-persistent' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -333,7 +333,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -365,7 +369,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -803,7 +812,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql.json b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql.json index e04a506c0..3122f9588 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-postgresql.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, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-postgresql' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -340,7 +340,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -372,7 +376,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -781,7 +790,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-postgresql" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-https.json b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-https.json index a0e52814a..58adfec0b 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-https.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-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 re-encrypt TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-x509-https' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.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}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets by using a CA bundle that is automatically injected into any configMap annotated with 'service.beta.openshift.io/inject-cabundle=true' annotation. Refer to: https://github.com/openshift/openshift-docs/blob/enterprise-4.1/release_notes/ocp-4-1-release-notes.adoc#service-ca-bundle-changes for additional details about this CA bundle. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -204,7 +204,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -236,7 +240,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -400,7 +409,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-x509-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-postgresql-persistent.json b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-postgresql-persistent.json index f20c4a552..5ea44913b 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso76-ocp4-x509-postgresql-persistent.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, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-x509-postgresql-persistent' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets by using a CA bundle that is automatically injected into any configMap annotated with 'service.beta.openshift.io/inject-cabundle=true' annotation. Refer to: https://github.com/openshift/openshift-docs/blob/enterprise-4.1/release_notes/ocp-4-1-release-notes.adoc#service-ca-bundle-changes for additional details about this CA bundle. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -254,7 +254,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -286,7 +290,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -649,7 +658,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json index 1b96f4391..dd2c6aac5 100755 --- a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json @@ -139,11 +139,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,7 +152,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -264,25 +267,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -308,11 +293,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -320,7 +306,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -409,26 +397,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json index e9ab73ed7..17dc52fc1 100755 --- a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json @@ -12,8 +12,7 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/support-url": "https://access.redhat.com", - "tags": "quickstart,php,cakephp", - "template.openshift.io/bindable": "false" + "tags": "quickstart,php,cakephp" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/cakephp-ex/blob/master/README.md.", @@ -58,6 +57,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -139,11 +141,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,20 +154,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "cakephp-mysql-persistent" - }, - "failurePolicy": "Retry" - } - }, "type": "Recreate" }, "template": { @@ -241,7 +235,7 @@ "periodSeconds": 60, "timeoutSeconds": 3 }, - "name": "cakephp-mysql-persistent", + "name": "${NAME}", "ports": [ { "containerPort": 8080 @@ -262,27 +256,72 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "DATABASE_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECRET_TOKEN", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-secret-token", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECURITY_SALT", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-security-salt", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_NAME", + "value": "${DATABASE_NAME}" + }, + { + "name": "DATABASE_ENGINE", + "value": "${DATABASE_NAME}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + } + ], + "image": " ", + "name": "cakephp-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -325,11 +364,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -337,7 +377,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -428,26 +470,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json index 3c5a3829f..b71db5074 100755 --- a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -281,8 +266,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", @@ -382,26 +367,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json index f33a6637b..e5696d624 100755 --- a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -298,11 +283,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -310,7 +296,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -401,26 +389,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -446,6 +415,13 @@ "value": "5.30-ubi8", "required": true }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (8.0-el8, 8.0-el9, or latest).", + "value": "8.0-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json b/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json index fc5ce27db..0fab828d4 100755 --- a/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json +++ b/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json @@ -5,7 +5,7 @@ "name": "httpd", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Apache HTTP Server (httpd)" + "openshift.io/display-name": "Apache HTTP Server" } }, "spec": { @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "2.4-ubi8", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major version updates.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server (Latest)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd" + "tags": "builder,httpd", + "version": "2.4" }, "from": { - "kind": "ImageStreamTag", - "name": "2.4-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -38,11 +38,10 @@ "name": "2.4-ubi9", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, @@ -57,20 +56,19 @@ } }, { - "name": "2.4-ubi8", + "name": "2.4-el7", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/httpd-24:latest" + "name": "registry.redhat.io/rhscl/httpd-24-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -82,39 +80,16 @@ "name": "2.4-el8", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", - "version": "2.4" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/httpd-24" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-el7", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/httpd-24-rhel7" + "name": "registry.redhat.io/rhel8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +98,19 @@ } }, { - "name": "2.4", + "name": "latest", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", + "tags": "builder,httpd", "version": "2.4" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/httpd-24-rhel7" + "kind": "ImageStreamTag", + "name": "2.4-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/httpd/templates/httpd-example.json b/assets/operator/ocp-s390x/httpd/templates/httpd-example.json index 044f9ff25..fba65b04f 100755 --- a/assets/operator/ocp-s390x/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-s390x/httpd/templates/httpd-example.json @@ -122,11 +122,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -134,10 +135,12 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { @@ -181,25 +184,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "httpd-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -271,6 +256,7 @@ ], "labels": { "app": "httpd-example", + "app.openshift.io/runtime": "apache", "template": "httpd-example" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json index 2bea379b1..15428dfdb 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json @@ -167,6 +167,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.16", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.16" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.17", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json index 15d8790e1..6ba668ca2 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json @@ -211,6 +211,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.16", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.16" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.17", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json index e144a50ae..7680a2b0e 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json index da704b43c..3bcf9bbcb 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-rhel-s390x.json index 76317618e..0e47d6203 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-rhel-s390x.json @@ -160,6 +160,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json index 5d19707fe..060c14ac6 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json @@ -146,6 +146,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-21-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-21-rhel-s390x.json new file mode 100755 index 000000000..94a298d87 --- /dev/null +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-21-rhel-s390x.json @@ -0,0 +1,43 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json new file mode 100755 index 000000000..d3b2a7082 --- /dev/null +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json @@ -0,0 +1,41 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json index ea945d5dd..993bb7932 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json index a9d4a8d5a..de0a4f886 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json index 02d417ece..690ec7fc6 100755 --- a/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json @@ -49,8 +49,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -60,7 +60,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -68,7 +70,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json index 76dc1b1ba..0a2635589 100755 --- a/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json @@ -66,8 +66,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -77,7 +77,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -85,7 +87,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json b/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json index 06ab56b14..6881b0541 100755 --- a/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json +++ b/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json @@ -14,37 +14,18 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el8", + "name": "10.3-el7", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-103:latest" + "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -53,18 +34,18 @@ } }, { - "name": "10.3-el7", + "name": "10.5-el7", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", - "version": "10.3" + "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +54,18 @@ } }, { - "name": "10.3", + "name": "10.3-el8", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb,hidden", + "tags": "database,mariadb", "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-103:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +74,18 @@ } }, { - "name": "10.5-el7", + "name": "10.5-el8", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-105:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +94,18 @@ } }, { - "name": "10.5-el8", + "name": "10.5-el9", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 8)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-105:latest" + "name": "registry.redhat.io/rhel9/mariadb-105:latest" }, "generation": null, "importPolicy": {}, @@ -133,18 +114,18 @@ } }, { - "name": "10.5-el9", + "name": "latest", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 9)", + "openshift.io/display-name": "MariaDB 10.5 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/mariadb-105:latest" + "kind": "ImageStreamTag", + "name": "10.5-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json index 4debbecc5..6b7914675 100755 --- a/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json @@ -58,10 +58,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -69,7 +70,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -175,26 +178,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json index 840559cb5..cc8550984 100755 --- a/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json @@ -75,10 +75,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +87,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json index dcd7c930f..3efbebbd7 100755 --- a/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json @@ -66,10 +66,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -77,7 +78,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,27 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json b/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json index d150c23dc..987585c7e 100755 --- a/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json @@ -41,6 +41,7 @@ "kind": "Service", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,10 +76,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +88,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json index bef553a51..2c614d342 100755 --- a/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json +++ b/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json @@ -5,7 +5,7 @@ "name": "nginx", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (nginx)" + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy" } }, "spec": { @@ -14,19 +14,40 @@ }, "tags": [ { - "name": "latest", + "name": "1.20-ubi7", "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.20/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 UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx" + "tags": "builder,nginx", + "version": "1.20" }, "from": { - "kind": "ImageStreamTag", - "name": "1.20-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/nginx-120:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.22-ubi8", + "annotations": { + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", + "iconClass": "icon-nginx", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git", + "tags": "builder,nginx", + "version": "1.22" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -37,12 +58,11 @@ { "name": "1.20-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", "version": "1.20" }, @@ -57,20 +77,19 @@ } }, { - "name": "1.20-ubi8", + "name": "1.22-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-120:latest" + "name": "registry.redhat.io/ubi9/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +98,19 @@ } }, { - "name": "1.20-ubi7", + "name": "latest", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nginx-120:latest" + "kind": "ImageStreamTag", + "name": "1.22-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/nginx/templates/nginx-example.json b/assets/operator/ocp-s390x/nginx/templates/nginx-example.json index 9f84de3ab..57a9655ae 100755 --- a/assets/operator/ocp-s390x/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-s390x/nginx/templates/nginx-example.json @@ -124,11 +124,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -136,17 +137,20 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "app": "${NAME}", + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { "labels": { + "app": "${NAME}", "name": "${NAME}" - }, - "name": "${NAME}" + } }, "spec": { "containers": [ @@ -183,25 +187,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "nginx-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -272,6 +258,7 @@ } ], "labels": { - "template": "nginx-example" + "app": "${NAME}", + "template": "${NAME}" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json index deb52ecf4..5e0a21b7b 100755 --- a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.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/18/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/20/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,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "18-ubi8" + "name": "20-ubi9" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "18-ubi9", + "name": "20-ubi9", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18/README.md.", + "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 9)", + "openshift.io/display-name": "Node.js 20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-18:latest" + "name": "registry.redhat.io/ubi9/nodejs-20:latest" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "18-ubi9-minimal", + "name": "18-ubi9", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 9 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-18:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "18-ubi8", + "name": "20-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 18 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/18/README.md.", + "description": "Build and run Node.js 20 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/display-name": "Node.js 20 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18:latest" + "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -98,11 +98,11 @@ } }, { - "name": "18-ubi8-minimal", + "name": "18-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -110,7 +110,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-18-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -160,6 +160,90 @@ "type": "Local" } }, + { + "name": "20-ubi8", + "annotations": { + "description": "Build and run Node.js 20 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/20/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-20:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi8-minimal", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "18-ubi8", + "annotations": { + "description": "Build and run Node.js 18 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/18/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-18:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "18-ubi8-minimal", + "annotations": { + "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "16-ubi8", "annotations": { diff --git a/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json b/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json index d35582336..445ee3b08 100755 --- a/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json +++ b/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json @@ -78,28 +78,6 @@ "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": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "5.30-el7", "annotations": { diff --git a/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json b/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json index 10a1f69db..67c1b2bb4 100755 --- a/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "7.3-ubi7", "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/8.0/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 7.3 applications on UBI 7. 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.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP (Latest)", + "openshift.io/display-name": "PHP 7.3 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php", - "tags": "builder,php" + "tags": "builder,php", + "version": "7.3" }, "from": { - "kind": "ImageStreamTag", - "name": "8.0-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/php-73:latest" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,19 @@ } }, { - "name": "8.0-ubi9", + "name": "7.4-ubi8", "annotations": { - "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", + "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 8.0 (UBI 9)", + "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:8.0,php", "tags": "builder,php", - "version": "8.0" + "version": "7.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/php-80:latest" + "name": "registry.redhat.io/ubi8/php-74:latest" }, "generation": null, "importPolicy": {}, @@ -64,7 +63,6 @@ "openshift.io/display-name": "PHP 8.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:8.0,php", "tags": "builder,php", "version": "8.0" }, @@ -79,20 +77,19 @@ } }, { - "name": "7.4-ubi8", + "name": "8.0-ubi9", "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.", + "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.4 (UBI 8)", + "openshift.io/display-name": "PHP 8.0 (UBI 9)", "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" + "version": "8.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-74:latest" + "name": "registry.redhat.io/ubi9/php-80:latest" }, "generation": null, "importPolicy": {}, @@ -101,20 +98,19 @@ } }, { - "name": "7.3-ubi7", + "name": "8.1-ubi9", "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 7. 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.", + "description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 7)", + "openshift.io/display-name": "PHP 8.1 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", "tags": "builder,php", - "version": "7.3" + "version": "8.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/php-73:latest" + "name": "registry.redhat.io/ubi9/php-81:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +119,19 @@ } }, { - "name": "7.3", + "name": "latest", "annotations": { - "description": "Build and run PHP 7.3 applications on RHEL 7. 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.", + "description": "Build and run PHP 8.0 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/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3", + "openshift.io/display-name": "PHP 8.0 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php,hidden", - "version": "7.3" + "tags": "builder,php", + "version": "8.0" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/php-73-rhel7:latest" + "kind": "ImageStreamTag", + "name": "8.0-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json b/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json index 101252626..bdc1bbc80 100755 --- a/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json +++ b/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json @@ -14,57 +14,18 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Provides a PostgreSQL database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major version updates.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql" - }, - "from": { - "kind": "ImageStreamTag", - "name": "15-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "" - } - }, - { - "name": "15-el9", - "annotations": { - "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "15" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-15:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "15-el8", + "name": "10-el7", "annotations": { - "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "15" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-15:latest" + "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +34,18 @@ } }, { - "name": "13-el9", + "name": "12-el7", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-13:latest" + "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +54,18 @@ } }, { - "name": "13-el8", + "name": "13-el7", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-13:latest" + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +74,18 @@ } }, { - "name": "13-el7", + "name": "10-el8", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-10:latest" }, "generation": null, "importPolicy": {}, @@ -153,18 +114,18 @@ } }, { - "name": "12-el7", + "name": "13-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "12" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-13:latest" }, "generation": null, "importPolicy": {}, @@ -173,18 +134,18 @@ } }, { - "name": "12", + "name": "15-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Ephemeral) 12", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql,hidden", - "version": "12" + "tags": "database,postgresql", + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -193,18 +154,18 @@ } }, { - "name": "10-el8", + "name": "13-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-10:latest" + "name": "registry.redhat.io/rhel9/postgresql-13:latest" }, "generation": null, "importPolicy": {}, @@ -213,18 +174,18 @@ } }, { - "name": "10-el7", + "name": "15-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "name": "registry.redhat.io/rhel9/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -233,18 +194,18 @@ } }, { - "name": "10", + "name": "latest", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Ephemeral) 10", + "openshift.io/display-name": "PostgreSQL 15 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql,hidden", - "version": "10" + "tags": "database,postgresql", + "version": "15" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "kind": "ImageStreamTag", + "name": "15-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json index 1a7d47325..5d636e6a9 100755 --- a/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json @@ -64,10 +64,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,7 +76,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -176,27 +179,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json index 623bc36dd..92478a97b 100755 --- a/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json @@ -81,10 +81,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -92,7 +93,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -193,27 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json index f688a0761..9b4cb3d9e 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json @@ -7,13 +7,12 @@ "annotations": { "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Rails + PostgreSQL", - "openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", - "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/support-url": "https://access.redhat.com", + "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", "tags": "quickstart,ruby,rails", - "template.openshift.io/bindable": "false" + "template.openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", + "template.openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", + "template.openshift.io/provider-display-name": "Red Hat, Inc.", + "template.openshift.io/support-url": "https://access.redhat.com" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", @@ -22,6 +21,10 @@ "apiVersion": "v1", "kind": "Secret", "metadata": { + "annotations": { + "template.openshift.io/expose-password": "{.data['application-password']}", + "template.openshift.io/expose-username": "{.data['application-user']}" + }, "name": "${NAME}" }, "stringData": { @@ -59,6 +62,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -117,7 +123,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +146,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,20 +159,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "${NAME}" - }, - "failurePolicy": "Abort" - } - }, "type": "Recreate" }, "template": { @@ -278,27 +276,89 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "POSTGRESQL_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "SECRET_KEY_BASE", + "valueFrom": { + "secretKeyRef": { + "key": "keybase", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DATABASE_NAME}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + }, + { + "name": "APPLICATION_USER", + "valueFrom": { + "secretKeyRef": { + "key": "application-user", + "name": "${NAME}" + } + } + }, + { + "name": "APPLICATION_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "application-password", + "name": "${NAME}" + } + } + }, + { + "name": "RAILS_ENV", + "value": "${RAILS_ENV}" + } + ], + "image": " ", + "name": "ruby-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -341,11 +401,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -353,7 +414,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -448,26 +511,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -486,6 +530,20 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Postgresql Version", + "description": "Version of Postgresql image to be used (12-el8 by default).", + "value": "12-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json index e7b7be7a4..1a4641f42 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json @@ -96,9 +96,6 @@ "name": "${NAME}:latest" } }, - "postCommit": { - "script": "bundle exec rake test" - }, "source": { "contextDir": "${CONTEXT_DIR}", "git": { @@ -117,7 +114,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +137,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,7 +150,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -280,25 +280,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -324,11 +306,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -336,7 +319,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -429,26 +414,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -467,6 +433,13 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json b/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json index 104f1f03c..72642ac20 100755 --- a/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json @@ -60,10 +60,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -71,7 +72,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -154,27 +157,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-s390x/redis/templates/redis-persistent.json b/assets/operator/ocp-s390x/redis/templates/redis-persistent.json index d1f4ed9d6..9f3ea41e2 100755 --- a/assets/operator/ocp-s390x/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-s390x/redis/templates/redis-persistent.json @@ -77,10 +77,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -88,7 +89,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -171,27 +174,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-s390x/sso/imagestreams/sso76-openshift-rhel8.json b/assets/operator/ocp-s390x/sso/imagestreams/sso76-openshift-rhel8.json index a1fcd2010..879421e9e 100755 --- a/assets/operator/ocp-s390x/sso/imagestreams/sso76-openshift-rhel8.json +++ b/assets/operator/ocp-s390x/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.4.GA" + "version": "7.6.7.GA" } }, "spec": { diff --git a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-https.json b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-https.json index e8aa6efea..e14e0333c 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-https.json +++ b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-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. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-https' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -282,7 +282,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -314,7 +318,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -553,7 +562,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql-persistent.json b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql-persistent.json index e66e3e973..747b03a0b 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql-persistent.json +++ b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql-persistent.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, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-postgresql-persistent' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -333,7 +333,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -365,7 +369,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -803,7 +812,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql.json b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql.json index e04a506c0..3122f9588 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql.json +++ b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-postgresql.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, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-postgresql' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -340,7 +340,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -372,7 +376,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -781,7 +790,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-postgresql" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-https.json b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-https.json index a0e52814a..58adfec0b 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-https.json +++ b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-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 re-encrypt TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-x509-https' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.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}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets by using a CA bundle that is automatically injected into any configMap annotated with 'service.beta.openshift.io/inject-cabundle=true' annotation. Refer to: https://github.com/openshift/openshift-docs/blob/enterprise-4.1/release_notes/ocp-4-1-release-notes.adoc#service-ca-bundle-changes for additional details about this CA bundle. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -204,7 +204,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -236,7 +240,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -400,7 +409,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-x509-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-postgresql-persistent.json b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-postgresql-persistent.json index f20c4a552..5ea44913b 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-postgresql-persistent.json +++ b/assets/operator/ocp-s390x/sso/templates/sso76-ocp4-x509-postgresql-persistent.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, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-x509-postgresql-persistent' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets by using a CA bundle that is automatically injected into any configMap annotated with 'service.beta.openshift.io/inject-cabundle=true' annotation. Refer to: https://github.com/openshift/openshift-docs/blob/enterprise-4.1/release_notes/ocp-4-1-release-notes.adoc#service-ca-bundle-changes for additional details about this CA bundle. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -254,7 +254,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -286,7 +290,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -649,7 +658,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json index 1b96f4391..dd2c6aac5 100755 --- a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json @@ -139,11 +139,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,7 +152,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -264,25 +267,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -308,11 +293,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -320,7 +306,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -409,26 +397,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json index e9ab73ed7..17dc52fc1 100755 --- a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json @@ -12,8 +12,7 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/support-url": "https://access.redhat.com", - "tags": "quickstart,php,cakephp", - "template.openshift.io/bindable": "false" + "tags": "quickstart,php,cakephp" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/cakephp-ex/blob/master/README.md.", @@ -58,6 +57,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -139,11 +141,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,20 +154,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "cakephp-mysql-persistent" - }, - "failurePolicy": "Retry" - } - }, "type": "Recreate" }, "template": { @@ -241,7 +235,7 @@ "periodSeconds": 60, "timeoutSeconds": 3 }, - "name": "cakephp-mysql-persistent", + "name": "${NAME}", "ports": [ { "containerPort": 8080 @@ -262,27 +256,72 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "DATABASE_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECRET_TOKEN", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-secret-token", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECURITY_SALT", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-security-salt", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_NAME", + "value": "${DATABASE_NAME}" + }, + { + "name": "DATABASE_ENGINE", + "value": "${DATABASE_NAME}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + } + ], + "image": " ", + "name": "cakephp-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -325,11 +364,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -337,7 +377,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -428,26 +470,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json index 3c5a3829f..b71db5074 100755 --- a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -281,8 +266,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", @@ -382,26 +367,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json index f33a6637b..e5696d624 100755 --- a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -298,11 +283,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -310,7 +296,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -401,26 +389,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -446,6 +415,13 @@ "value": "5.30-ubi8", "required": true }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (8.0-el8, 8.0-el9, or latest).", + "value": "8.0-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json b/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json index fc5ce27db..0fab828d4 100755 --- a/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json +++ b/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json @@ -5,7 +5,7 @@ "name": "httpd", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Apache HTTP Server (httpd)" + "openshift.io/display-name": "Apache HTTP Server" } }, "spec": { @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "2.4-ubi8", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major version updates.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server (Latest)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd" + "tags": "builder,httpd", + "version": "2.4" }, "from": { - "kind": "ImageStreamTag", - "name": "2.4-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -38,11 +38,10 @@ "name": "2.4-ubi9", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, @@ -57,20 +56,19 @@ } }, { - "name": "2.4-ubi8", + "name": "2.4-el7", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/httpd-24:latest" + "name": "registry.redhat.io/rhscl/httpd-24-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -82,39 +80,16 @@ "name": "2.4-el8", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", - "version": "2.4" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/httpd-24" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-el7", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/httpd-24-rhel7" + "name": "registry.redhat.io/rhel8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +98,19 @@ } }, { - "name": "2.4", + "name": "latest", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", + "tags": "builder,httpd", "version": "2.4" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/httpd-24-rhel7" + "kind": "ImageStreamTag", + "name": "2.4-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json b/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json index 044f9ff25..fba65b04f 100755 --- a/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json @@ -122,11 +122,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -134,10 +135,12 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { @@ -181,25 +184,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "httpd-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -271,6 +256,7 @@ ], "labels": { "app": "httpd-example", + "app.openshift.io/runtime": "apache", "template": "httpd-example" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json index 2bea379b1..15428dfdb 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json @@ -167,6 +167,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.16", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.16" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.17", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json index 61e1fad81..e054a2f6b 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json @@ -255,6 +255,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.16", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.16" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.17", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json index e144a50ae..7680a2b0e 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json index da704b43c..3bcf9bbcb 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-rhel-x86_64.json index 76317618e..0e47d6203 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-rhel-x86_64.json @@ -160,6 +160,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json index 5d19707fe..060c14ac6 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json @@ -146,6 +146,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-21-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-21-rhel-x86_64.json new file mode 100755 index 000000000..94a298d87 --- /dev/null +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-21-rhel-x86_64.json @@ -0,0 +1,43 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json new file mode 100755 index 000000000..d3b2a7082 --- /dev/null +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json @@ -0,0 +1,41 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json index ea945d5dd..993bb7932 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json @@ -202,6 +202,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json index a9d4a8d5a..de0a4f886 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json index 02d417ece..690ec7fc6 100755 --- a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json @@ -49,8 +49,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -60,7 +60,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -68,7 +70,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json index 76dc1b1ba..0a2635589 100755 --- a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json @@ -66,8 +66,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -77,7 +77,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -85,7 +87,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json b/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json index 06ab56b14..6881b0541 100755 --- a/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json +++ b/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json @@ -14,37 +14,18 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el8", + "name": "10.3-el7", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-103:latest" + "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -53,18 +34,18 @@ } }, { - "name": "10.3-el7", + "name": "10.5-el7", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", - "version": "10.3" + "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +54,18 @@ } }, { - "name": "10.3", + "name": "10.3-el8", "annotations": { - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb,hidden", + "tags": "database,mariadb", "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-103:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +74,18 @@ } }, { - "name": "10.5-el7", + "name": "10.5-el8", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-105:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +94,18 @@ } }, { - "name": "10.5-el8", + "name": "10.5-el9", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 8)", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-105:latest" + "name": "registry.redhat.io/rhel9/mariadb-105:latest" }, "generation": null, "importPolicy": {}, @@ -133,18 +114,18 @@ } }, { - "name": "10.5-el9", + "name": "latest", "annotations": { - "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (RHEL 9)", + "openshift.io/display-name": "MariaDB 10.5 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/mariadb-105:latest" + "kind": "ImageStreamTag", + "name": "10.5-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json index 4debbecc5..6b7914675 100755 --- a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json @@ -58,10 +58,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -69,7 +70,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -175,26 +178,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json index 840559cb5..cc8550984 100755 --- a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json @@ -75,10 +75,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +87,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json index dcd7c930f..3efbebbd7 100755 --- a/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json @@ -66,10 +66,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -77,7 +78,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,27 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json b/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json index d150c23dc..987585c7e 100755 --- a/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json @@ -41,6 +41,7 @@ "kind": "Service", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,10 +76,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +88,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json index bef553a51..2c614d342 100755 --- a/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json +++ b/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json @@ -5,7 +5,7 @@ "name": "nginx", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (nginx)" + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy" } }, "spec": { @@ -14,19 +14,40 @@ }, "tags": [ { - "name": "latest", + "name": "1.20-ubi7", "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.20/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 UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx" + "tags": "builder,nginx", + "version": "1.20" }, "from": { - "kind": "ImageStreamTag", - "name": "1.20-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/nginx-120:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.22-ubi8", + "annotations": { + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", + "iconClass": "icon-nginx", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git", + "tags": "builder,nginx", + "version": "1.22" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -37,12 +58,11 @@ { "name": "1.20-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", "version": "1.20" }, @@ -57,20 +77,19 @@ } }, { - "name": "1.20-ubi8", + "name": "1.22-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-120:latest" + "name": "registry.redhat.io/ubi9/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +98,19 @@ } }, { - "name": "1.20-ubi7", + "name": "latest", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nginx-120:latest" + "kind": "ImageStreamTag", + "name": "1.22-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json b/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json index 9f84de3ab..57a9655ae 100755 --- a/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json @@ -124,11 +124,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -136,17 +137,20 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "app": "${NAME}", + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { "labels": { + "app": "${NAME}", "name": "${NAME}" - }, - "name": "${NAME}" + } }, "spec": { "containers": [ @@ -183,25 +187,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "nginx-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -272,6 +258,7 @@ } ], "labels": { - "template": "nginx-example" + "app": "${NAME}", + "template": "${NAME}" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json index deb52ecf4..5e0a21b7b 100755 --- a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.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/18/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/20/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,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "18-ubi8" + "name": "20-ubi9" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "18-ubi9", + "name": "20-ubi9", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18/README.md.", + "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 9)", + "openshift.io/display-name": "Node.js 20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-18:latest" + "name": "registry.redhat.io/ubi9/nodejs-20:latest" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "18-ubi9-minimal", + "name": "18-ubi9", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 9 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-18:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "18-ubi8", + "name": "20-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 18 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/18/README.md.", + "description": "Build and run Node.js 20 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/display-name": "Node.js 20 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18:latest" + "name": "registry.redhat.io/ubi9/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -98,11 +98,11 @@ } }, { - "name": "18-ubi8-minimal", + "name": "18-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -110,7 +110,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + "name": "registry.redhat.io/ubi9/nodejs-18-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -160,6 +160,90 @@ "type": "Local" } }, + { + "name": "20-ubi8", + "annotations": { + "description": "Build and run Node.js 20 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/20/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-20:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi8-minimal", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-20-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "18-ubi8", + "annotations": { + "description": "Build and run Node.js 18 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/18/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-18:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "18-ubi8-minimal", + "annotations": { + "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-18-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "16-ubi8", "annotations": { diff --git a/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json b/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json index d35582336..445ee3b08 100755 --- a/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json +++ b/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json @@ -78,28 +78,6 @@ "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": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "5.30-el7", "annotations": { diff --git a/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json b/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json index 10a1f69db..67c1b2bb4 100755 --- a/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "7.3-ubi7", "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/8.0/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 7.3 applications on UBI 7. 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.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP (Latest)", + "openshift.io/display-name": "PHP 7.3 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php", - "tags": "builder,php" + "tags": "builder,php", + "version": "7.3" }, "from": { - "kind": "ImageStreamTag", - "name": "8.0-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/php-73:latest" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,19 @@ } }, { - "name": "8.0-ubi9", + "name": "7.4-ubi8", "annotations": { - "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", + "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 8.0 (UBI 9)", + "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:8.0,php", "tags": "builder,php", - "version": "8.0" + "version": "7.4" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/php-80:latest" + "name": "registry.redhat.io/ubi8/php-74:latest" }, "generation": null, "importPolicy": {}, @@ -64,7 +63,6 @@ "openshift.io/display-name": "PHP 8.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:8.0,php", "tags": "builder,php", "version": "8.0" }, @@ -79,20 +77,19 @@ } }, { - "name": "7.4-ubi8", + "name": "8.0-ubi9", "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.", + "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.4 (UBI 8)", + "openshift.io/display-name": "PHP 8.0 (UBI 9)", "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" + "version": "8.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-74:latest" + "name": "registry.redhat.io/ubi9/php-80:latest" }, "generation": null, "importPolicy": {}, @@ -101,20 +98,19 @@ } }, { - "name": "7.3-ubi7", + "name": "8.1-ubi9", "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 7. 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.", + "description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 7)", + "openshift.io/display-name": "PHP 8.1 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", "tags": "builder,php", - "version": "7.3" + "version": "8.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/php-73:latest" + "name": "registry.redhat.io/ubi9/php-81:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +119,19 @@ } }, { - "name": "7.3", + "name": "latest", "annotations": { - "description": "Build and run PHP 7.3 applications on RHEL 7. 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.", + "description": "Build and run PHP 8.0 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/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3", + "openshift.io/display-name": "PHP 8.0 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php,hidden", - "version": "7.3" + "tags": "builder,php", + "version": "8.0" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/php-73-rhel7:latest" + "kind": "ImageStreamTag", + "name": "8.0-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json b/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json index 101252626..bdc1bbc80 100755 --- a/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json +++ b/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json @@ -14,57 +14,18 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Provides a PostgreSQL database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major version updates.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql" - }, - "from": { - "kind": "ImageStreamTag", - "name": "15-el8" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "" - } - }, - { - "name": "15-el9", - "annotations": { - "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "15" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-15:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "15-el8", + "name": "10-el7", "annotations": { - "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "15" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-15:latest" + "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -73,18 +34,18 @@ } }, { - "name": "13-el9", + "name": "12-el7", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-13:latest" + "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +54,18 @@ } }, { - "name": "13-el8", + "name": "13-el7", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-13:latest" + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +74,18 @@ } }, { - "name": "13-el7", + "name": "10-el8", "annotations": { - "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "13" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-10:latest" }, "generation": null, "importPolicy": {}, @@ -153,18 +114,18 @@ } }, { - "name": "12-el7", + "name": "13-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "12" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-13:latest" }, "generation": null, "importPolicy": {}, @@ -173,18 +134,18 @@ } }, { - "name": "12", + "name": "15-el8", "annotations": { - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Ephemeral) 12", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql,hidden", - "version": "12" + "tags": "database,postgresql", + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -193,18 +154,18 @@ } }, { - "name": "10-el8", + "name": "13-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-10:latest" + "name": "registry.redhat.io/rhel9/postgresql-13:latest" }, "generation": null, "importPolicy": {}, @@ -213,18 +174,18 @@ } }, { - "name": "10-el7", + "name": "15-el9", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "name": "registry.redhat.io/rhel9/postgresql-15:latest" }, "generation": null, "importPolicy": {}, @@ -233,18 +194,18 @@ } }, { - "name": "10", + "name": "latest", "annotations": { - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Ephemeral) 10", + "openshift.io/display-name": "PostgreSQL 15 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql,hidden", - "version": "10" + "tags": "database,postgresql", + "version": "15" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "kind": "ImageStreamTag", + "name": "15-el8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json index 1a7d47325..5d636e6a9 100755 --- a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json @@ -64,10 +64,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,7 +76,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -176,27 +179,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json index 623bc36dd..92478a97b 100755 --- a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json @@ -81,10 +81,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -92,7 +93,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -193,27 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json index f688a0761..9b4cb3d9e 100755 --- a/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json @@ -7,13 +7,12 @@ "annotations": { "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Rails + PostgreSQL", - "openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", - "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/support-url": "https://access.redhat.com", + "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", "tags": "quickstart,ruby,rails", - "template.openshift.io/bindable": "false" + "template.openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", + "template.openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", + "template.openshift.io/provider-display-name": "Red Hat, Inc.", + "template.openshift.io/support-url": "https://access.redhat.com" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", @@ -22,6 +21,10 @@ "apiVersion": "v1", "kind": "Secret", "metadata": { + "annotations": { + "template.openshift.io/expose-password": "{.data['application-password']}", + "template.openshift.io/expose-username": "{.data['application-user']}" + }, "name": "${NAME}" }, "stringData": { @@ -59,6 +62,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -117,7 +123,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +146,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,20 +159,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "${NAME}" - }, - "failurePolicy": "Abort" - } - }, "type": "Recreate" }, "template": { @@ -278,27 +276,89 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "POSTGRESQL_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "SECRET_KEY_BASE", + "valueFrom": { + "secretKeyRef": { + "key": "keybase", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DATABASE_NAME}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + }, + { + "name": "APPLICATION_USER", + "valueFrom": { + "secretKeyRef": { + "key": "application-user", + "name": "${NAME}" + } + } + }, + { + "name": "APPLICATION_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "application-password", + "name": "${NAME}" + } + } + }, + { + "name": "RAILS_ENV", + "value": "${RAILS_ENV}" + } + ], + "image": " ", + "name": "ruby-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -341,11 +401,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -353,7 +414,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -448,26 +511,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -486,6 +530,20 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Postgresql Version", + "description": "Version of Postgresql image to be used (12-el8 by default).", + "value": "12-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json index e7b7be7a4..1a4641f42 100755 --- a/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json @@ -96,9 +96,6 @@ "name": "${NAME}:latest" } }, - "postCommit": { - "script": "bundle exec rake test" - }, "source": { "contextDir": "${CONTEXT_DIR}", "git": { @@ -117,7 +114,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +137,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,7 +150,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -280,25 +280,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -324,11 +306,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -336,7 +319,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -429,26 +414,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -467,6 +433,13 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json b/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json index 104f1f03c..72642ac20 100755 --- a/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json @@ -60,10 +60,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -71,7 +72,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -154,27 +157,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json b/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json index d1f4ed9d6..9f3ea41e2 100755 --- a/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json @@ -77,10 +77,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -88,7 +89,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -171,27 +174,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/ocp-x86_64/sso/imagestreams/sso76-openshift-rhel8.json b/assets/operator/ocp-x86_64/sso/imagestreams/sso76-openshift-rhel8.json index a1fcd2010..879421e9e 100755 --- a/assets/operator/ocp-x86_64/sso/imagestreams/sso76-openshift-rhel8.json +++ b/assets/operator/ocp-x86_64/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.4.GA" + "version": "7.6.7.GA" } }, "spec": { diff --git a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-https.json b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-https.json index e8aa6efea..e14e0333c 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-https.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-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. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-https' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -282,7 +282,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -314,7 +318,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -553,7 +562,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql-persistent.json b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql-persistent.json index e66e3e973..747b03a0b 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql-persistent.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, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-postgresql-persistent' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -333,7 +333,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -365,7 +369,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -803,7 +812,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql.json b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql.json index e04a506c0..3122f9588 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-postgresql.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, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-postgresql' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_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. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -340,7 +340,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -372,7 +376,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -781,7 +790,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-postgresql" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-https.json b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-https.json index a0e52814a..58adfec0b 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-https.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-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 re-encrypt TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-x509-https' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.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}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets by using a CA bundle that is automatically injected into any configMap annotated with 'service.beta.openshift.io/inject-cabundle=true' annotation. Refer to: https://github.com/openshift/openshift-docs/blob/enterprise-4.1/release_notes/ocp-4-1-release-notes.adoc#service-ca-bundle-changes for additional details about this CA bundle. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -204,7 +204,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -236,7 +240,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -400,7 +409,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-x509-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-postgresql-persistent.json b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-postgresql-persistent.json index f20c4a552..5ea44913b 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso76-ocp4-x509-postgresql-persistent.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, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS. It is intended to be used solely on OpenShift 4.X versions. For OpenShift 3.X variant of this template refer to the 'sso76-ocp3-x509-postgresql-persistent' one.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.6.4.GA" + "version": "7.6.7.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) 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}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets by using a CA bundle that is automatically injected into any configMap annotated with 'service.beta.openshift.io/inject-cabundle=true' annotation. Refer to: https://github.com/openshift/openshift-docs/blob/enterprise-4.1/release_notes/ocp-4-1-release-notes.adoc#service-ca-bundle-changes for additional details about this CA bundle. To enable also dual-network clusters that support both IPv4 and IPv6 address families, all services defined by this template are configured having the 'spec.ipFamilyPolicy' field set to 'PreferDualStack' by default.", @@ -254,7 +254,11 @@ "/opt/eap/bin/livenessProbe.sh" ] }, - "initialDelaySeconds": 60 + "failureThreshold": 10, + "initialDelaySeconds": 30, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "name": "${APPLICATION_NAME}", "ports": [ @@ -286,7 +290,12 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - } + }, + "failureThreshold": 10, + "initialDelaySeconds": 40, + "periodSeconds": 30, + "successThreshold": 1, + "timeoutSeconds": 22 }, "resources": { "limits": { @@ -649,7 +658,7 @@ } ], "labels": { - "rhsso": "7.6.4.GA", + "rhsso": "7.6.7.GA", "template": "sso76-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json index 1b96f4391..dd2c6aac5 100755 --- a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json @@ -139,11 +139,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,7 +152,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -264,25 +267,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -308,11 +293,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -320,7 +306,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -409,26 +397,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json index e9ab73ed7..17dc52fc1 100755 --- a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json @@ -12,8 +12,7 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/support-url": "https://access.redhat.com", - "tags": "quickstart,php,cakephp", - "template.openshift.io/bindable": "false" + "tags": "quickstart,php,cakephp" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/cakephp-ex/blob/master/README.md.", @@ -58,6 +57,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -139,11 +141,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -151,20 +154,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "cakephp-mysql-persistent" - }, - "failurePolicy": "Retry" - } - }, "type": "Recreate" }, "template": { @@ -241,7 +235,7 @@ "periodSeconds": 60, "timeoutSeconds": 3 }, - "name": "cakephp-mysql-persistent", + "name": "${NAME}", "ports": [ { "containerPort": 8080 @@ -262,27 +256,72 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "cakephp-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "DATABASE_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECRET_TOKEN", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-secret-token", + "name": "${NAME}" + } + } + }, + { + "name": "CAKEPHP_SECURITY_SALT", + "valueFrom": { + "secretKeyRef": { + "key": "cakephp-security-salt", + "name": "${NAME}" + } + } + }, + { + "name": "DATABASE_NAME", + "value": "${DATABASE_NAME}" + }, + { + "name": "DATABASE_ENGINE", + "value": "${DATABASE_NAME}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + } + ], + "image": " ", + "name": "cakephp-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -325,11 +364,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -337,7 +377,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -428,26 +470,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json index 3c5a3829f..b71db5074 100755 --- a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -281,8 +266,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", @@ -382,26 +367,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json index f33a6637b..e5696d624 100755 --- a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json @@ -138,11 +138,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -150,7 +151,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "type": "Recreate" @@ -237,25 +240,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dancer-mysql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -298,11 +283,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -310,7 +296,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -401,26 +389,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:8.0-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -446,6 +415,13 @@ "value": "5.30-ubi8", "required": true }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (8.0-el8, 8.0-el9, or latest).", + "value": "8.0-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json b/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json index 9ab58733f..4f5a06a0a 100755 --- a/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json +++ b/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json @@ -5,7 +5,7 @@ "name": "httpd", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Apache HTTP Server (httpd)" + "openshift.io/display-name": "Apache HTTP Server" } }, "spec": { @@ -14,63 +14,19 @@ }, "tags": [ { - "name": "latest", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major version updates.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd" - }, - "from": { - "kind": "ImageStreamTag", - "name": "2.4-ubi9" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-fc", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on Fedora. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (Fedora)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd", - "version": "2.4" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/fedora/httpd-24:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-micro-fc", + "name": "2.4-ubi8", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on Fedora. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 Micro (Fedora)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, "from": { "kind": "DockerImage", - "name": "quay.io/fedora/httpd-24-micro:latest" + "name": "registry.access.redhat.com/ubi8/httpd-24:latest" }, "generation": null, "importPolicy": {}, @@ -82,11 +38,10 @@ "name": "2.4-ubi9", "annotations": { "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", + "iconClass": "icon-httpd", "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", "version": "2.4" }, @@ -101,60 +56,15 @@ } }, { - "name": "2.4-micro-c9s", + "name": "2.4-micro-el8", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 9 Stream. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 Micro (CentOS 9 Stream)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4-micro on CentOS Stream 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4-micro/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4-micro (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", - "version": "2.4" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/httpd-24-micro-c9s:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-ubi8", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd", - "version": "2.4" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/httpd-24:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.4-micro-c8s", - "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 8 Stream. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 Micro (CentOS 8 Stream)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd", - "version": "2.4" + "version": "2.4-micro" }, "from": { "kind": "DockerImage", @@ -167,20 +77,19 @@ } }, { - "name": "2.4-el7", + "name": "2.4-micro-el9", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4 (CentOS 7)", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4-micro on CentOS Stream 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4-micro/README.md.", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4-micro (CentOS Stream 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", "tags": "builder,httpd", - "version": "2.4" + "version": "2.4-micro" }, "from": { "kind": "DockerImage", - "name": "quay.io/centos7/httpd-24-centos7:latest" + "name": "quay.io/sclorg/httpd-24-micro-c9s:latest" }, "generation": null, "importPolicy": {}, @@ -189,20 +98,19 @@ } }, { - "name": "2.4", + "name": "latest", "annotations": { - "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", - "iconClass": "icon-apache", - "openshift.io/display-name": "Apache HTTP Server 2.4", + "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "iconClass": "icon-httpd", + "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/httpd-ex.git", - "supports": "httpd", - "tags": "builder,httpd,hidden", + "tags": "builder,httpd", "version": "2.4" }, "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi9/httpd-24:latest" + "kind": "ImageStreamTag", + "name": "2.4-ubi9" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/httpd/templates/httpd-example.json b/assets/operator/okd-x86_64/httpd/templates/httpd-example.json index 044f9ff25..fba65b04f 100755 --- a/assets/operator/okd-x86_64/httpd/templates/httpd-example.json +++ b/assets/operator/okd-x86_64/httpd/templates/httpd-example.json @@ -122,11 +122,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -134,10 +135,12 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { @@ -181,25 +184,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "httpd-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -271,6 +256,7 @@ ], "labels": { "app": "httpd-example", + "app.openshift.io/runtime": "apache", "template": "httpd-example" } } \ No newline at end of file diff --git a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json index da704b43c..3bcf9bbcb 100755 --- a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json +++ b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json index 5d19707fe..060c14ac6 100755 --- a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json +++ b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-17-runtime-ubi.json @@ -146,6 +146,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json new file mode 100755 index 000000000..d3b2a7082 --- /dev/null +++ b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-21-runtime-ubi.json @@ -0,0 +1,41 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-21-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 21 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json index a9d4a8d5a..de0a4f886 100755 --- a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json +++ b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -184,6 +184,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.18", + "annotations": { + "description": "Run Java applications using OpenJDK 8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.18" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.18" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json b/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json index 02d417ece..690ec7fc6 100755 --- a/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json @@ -49,8 +49,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -60,7 +60,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -68,7 +70,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json b/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json index 76dc1b1ba..0a2635589 100755 --- a/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json @@ -66,8 +66,8 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "template.alpha.openshift.io/wait-for-ready": "true" @@ -77,7 +77,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${JENKINS_SERVICE_NAME}" + "matchLabels": { + "app": "${JENKINS_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -85,7 +87,7 @@ "template": { "metadata": { "labels": { - "name": "${JENKINS_SERVICE_NAME}" + "app": "${JENKINS_SERVICE_NAME}" } }, "spec": { diff --git a/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json b/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json index 3cdd591b9..8afe8198a 100755 --- a/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json +++ b/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json @@ -14,57 +14,18 @@ }, "tags": [ { - "name": "latest", + "name": "10.3-el8", "annotations": { - "description": "Provides a MariaDB database on CentOS. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", + "description": "Provides a MariaDB 10.3 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-c9s" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.5-fc", - "annotations": { - "description": "Provides a MariaDB 10.5 database on Fedora. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (Fedora)", + "openshift.io/display-name": "MariaDB 10.3 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", - "version": "10.5" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/fedora/mariadb-105:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.5-c9s", - "annotations": { - "description": "Provides a MariaDB 10.5 database on CentOS 9 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (CentOS 9 Stream)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb", - "version": "10.5" + "version": "10.3" }, "from": { "kind": "DockerImage", - "name": "quay.io/sclorg/mariadb-105-c9s:latest" + "name": "quay.io/sclorg/mariadb-103-c8s:latest" }, "generation": null, "importPolicy": {}, @@ -73,11 +34,11 @@ } }, { - "name": "10.5-c8s", + "name": "10.5-el8", "annotations": { - "description": "Provides a MariaDB 10.5 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (CentOS 8 Stream)", + "openshift.io/display-name": "MariaDB 10.5 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" @@ -93,31 +54,11 @@ } }, { - "name": "10.5-el7", - "annotations": { - "description": "Provides a MariaDB 10.5 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5 (CentOS 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb", - "version": "10.5" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/centos7/mariadb-105-centos7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.5", + "name": "10.5-el9", "annotations": { - "description": "Provides a MariaDB 10.5 database on CentOS 9 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.5", + "openshift.io/display-name": "MariaDB 10.5 (CentOS Stream 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", "version": "10.5" @@ -133,78 +74,18 @@ } }, { - "name": "10.3-fc", - "annotations": { - "description": "Provides a MariaDB 10.5 database on Fedora. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (Fedora)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/fedora/mariadb-103:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-c8s", - "annotations": { - "description": "Provides a MariaDB 10.5 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (CentOS 8 Stream)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/mariadb-103-c8s:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el7", + "name": "latest", "annotations": { - "description": "Provides a MariaDB 10.3 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3 (CentOS 7)", + "openshift.io/display-name": "MariaDB 10.5 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/centos7/mariadb-103-centos7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3", - "annotations": { - "description": "Provides a MariaDB 10.3 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "openshift.io/display-name": "MariaDB 10.3", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,mariadb,hidden", - "version": "10.3" + "version": "10.5" }, "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/mariadb-103-c8s:latest" + "kind": "ImageStreamTag", + "name": "10.5-el9" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json b/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json index 4debbecc5..6b7914675 100755 --- a/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json @@ -58,10 +58,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -69,7 +70,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -175,26 +178,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json b/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json index 840559cb5..cc8550984 100755 --- a/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json @@ -75,10 +75,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +87,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mariadb" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mariadb:${MARIADB_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json b/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json index 15d18713f..208548fbf 100755 --- a/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json +++ b/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json @@ -24,7 +24,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "8.0-c9s" + "name": "8.0-el9" }, "generation": null, "importPolicy": {}, @@ -53,7 +53,7 @@ } }, { - "name": "8.0-c9s", + "name": "8.0-el9", "annotations": { "description": "Provides a MySQL 8.0 database on CentOS 9 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/README.md.", "iconClass": "icon-mysql-database", @@ -73,7 +73,7 @@ } }, { - "name": "8.0-c8s", + "name": "8.0-el8", "annotations": { "description": "Provides a MySQL 8.0 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/README.md.", "iconClass": "icon-mysql-database", @@ -113,7 +113,7 @@ } }, { - "name": "8.0", + "name": "8.0-el9", "annotations": { "description": "Provides a MySQL 8.0 database on CentOS 9 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/README.md.", "iconClass": "icon-mysql-database", diff --git a/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json b/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json index dcd7c930f..3efbebbd7 100755 --- a/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json @@ -66,10 +66,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -77,7 +78,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,27 +195,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json b/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json index d150c23dc..987585c7e 100755 --- a/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json +++ b/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json @@ -41,6 +41,7 @@ "kind": "Service", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,10 +76,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -86,7 +88,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -192,26 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_VERSION}", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], diff --git a/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json b/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json index 62db5adc1..a940e8c43 100755 --- a/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json +++ b/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json @@ -5,7 +5,7 @@ "name": "nginx", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (nginx)" + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy" } }, "spec": { @@ -14,19 +14,40 @@ }, "tags": [ { - "name": "latest", + "name": "1.20-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/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 UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx" + "tags": "builder,nginx", + "version": "1.20" }, "from": { - "kind": "ImageStreamTag", - "name": "1.20-ubi8" + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi7/nginx-120:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.22-ubi8", + "annotations": { + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", + "iconClass": "icon-nginx", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nginx-ex.git", + "tags": "builder,nginx", + "version": "1.22" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -37,12 +58,11 @@ { "name": "1.20-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", "version": "1.20" }, @@ -57,20 +77,19 @@ } }, { - "name": "1.20-ubi8", + "name": "1.22-ubi9", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nginx-120:latest" + "name": "registry.access.redhat.com/ubi9/nginx-122:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +98,19 @@ } }, { - "name": "1.20-ubi7", + "name": "latest", "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.20/README.md.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", "tags": "builder,nginx", - "version": "1.20" + "version": "1.22" }, "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi7/nginx-120:latest" + "kind": "ImageStreamTag", + "name": "1.22-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/nginx/templates/nginx-example.json b/assets/operator/okd-x86_64/nginx/templates/nginx-example.json index 9f84de3ab..57a9655ae 100755 --- a/assets/operator/okd-x86_64/nginx/templates/nginx-example.json +++ b/assets/operator/okd-x86_64/nginx/templates/nginx-example.json @@ -124,11 +124,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -136,17 +137,20 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "app": "${NAME}", + "name": "${NAME}" + } }, "strategy": { - "type": "Rolling" + "type": "RollingUpdate" }, "template": { "metadata": { "labels": { + "app": "${NAME}", "name": "${NAME}" - }, - "name": "${NAME}" + } }, "spec": { "containers": [ @@ -183,25 +187,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "nginx-example" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -272,6 +258,7 @@ } ], "labels": { - "template": "nginx-example" + "app": "${NAME}", + "template": "${NAME}" } } \ No newline at end of file diff --git a/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json b/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json index d9819c59e..047319f2b 100755 --- a/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json +++ b/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.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/18/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/20/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,49 @@ }, "from": { "kind": "ImageStreamTag", - "name": "18-ubi8" + "name": "20-ubi9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi9", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 9)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi9/nodejs-20:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "20-ubi9-minimal", + "annotations": { + "description": "Build and run Node.js 20 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 20 (UBI 9 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "20" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi9/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +119,19 @@ } }, { - "name": "18-ubi8", + "name": "20-ubi8", "annotations": { - "description": "Build and run Node.js 18 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/18/README.md.", + "description": "Build and run Node.js 20 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/20/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8)", + "openshift.io/display-name": "Node.js 20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-18:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-20:latest" }, "generation": null, "importPolicy": {}, @@ -98,19 +140,19 @@ } }, { - "name": "18-ubi8-minimal", + "name": "20-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", + "description": "Build and run Node.js 20 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 20 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "18" + "version": "20" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-18-minimal:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-20-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -119,19 +161,19 @@ } }, { - "name": "16-ubi9", + "name": "18-ubi8", "annotations": { - "description": "Build and run Node.js 16 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", + "description": "Build and run Node.js 18 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/18/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 9)", + "openshift.io/display-name": "Node.js 18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "16" + "version": "18" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi9/nodejs-16:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-18:latest" }, "generation": null, "importPolicy": {}, @@ -140,19 +182,19 @@ } }, { - "name": "16-ubi9-minimal", + "name": "18-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 16 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", + "description": "Build and run Node.js 18 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/18-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 9 Minimal)", + "openshift.io/display-name": "Node.js 18 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "16" + "version": "18" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi9/nodejs-16-minimal:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-18-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -161,11 +203,11 @@ } }, { - "name": "16-ubi8", + "name": "16-ubi9", "annotations": { - "description": "Build and run Node.js 16 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/16/README.md.", + "description": "Build and run Node.js 16 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -173,7 +215,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-16:latest" + "name": "registry.access.redhat.com/ubi9/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -182,11 +224,11 @@ } }, { - "name": "16-ubi8-minimal", + "name": "16-ubi9-minimal", "annotations": { - "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", + "description": "Build and run Node.js 16 applications on UBI 9 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 9 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -194,7 +236,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-16-minimal:latest" + "name": "registry.access.redhat.com/ubi9/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -203,19 +245,19 @@ } }, { - "name": "14-ubi8", + "name": "16-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.", + "description": "Build and run Node.js 16 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/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-14:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -224,19 +266,19 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-14-minimal:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/openliberty/imagestreams/openliberty.json b/assets/operator/okd-x86_64/openliberty/imagestreams/openliberty.json index ebd1f57a1..ee139333a 100755 --- a/assets/operator/okd-x86_64/openliberty/imagestreams/openliberty.json +++ b/assets/operator/okd-x86_64/openliberty/imagestreams/openliberty.json @@ -14,11 +14,11 @@ }, "tags": [ { - "name": "23.0.0.11-java8", + "name": "24.0.0.3-java8", "annotations": { "description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.", "iconClass": "icon-openliberty", - "openshift.io/display-name": "Open Liberty 23.0.0.11 with Java 8", + "openshift.io/display-name": "Open Liberty 24.0.0.3 with Java 8", "openshift.io/provider-display-name": "IBM", "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", "supports": "jee,java", @@ -26,7 +26,7 @@ }, "from": { "kind": "DockerImage", - "name": "docker.io/openliberty/open-liberty-s2i:23.0.0.11-java8" + "name": "docker.io/openliberty/open-liberty-s2i:24.0.0.3-java8" }, "generation": null, "importPolicy": {}, @@ -35,11 +35,11 @@ } }, { - "name": "23.0.0.11-java11", + "name": "24.0.0.3-java11", "annotations": { "description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.", "iconClass": "icon-openliberty", - "openshift.io/display-name": "Open Liberty 23.0.0.11 with Java 11", + "openshift.io/display-name": "Open Liberty 24.0.0.3 with Java 11", "openshift.io/provider-display-name": "IBM", "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", "supports": "jee,java", @@ -47,7 +47,7 @@ }, "from": { "kind": "DockerImage", - "name": "docker.io/openliberty/open-liberty-s2i:23.0.0.11-java11" + "name": "docker.io/openliberty/open-liberty-s2i:24.0.0.3-java11" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "23.0.0.11-java17", + "name": "24.0.0.3-java17", "annotations": { "description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.", "iconClass": "icon-openliberty", - "openshift.io/display-name": "Open Liberty 23.0.0.11 with Java 17", + "openshift.io/display-name": "Open Liberty 24.0.0.3 with Java 17", "openshift.io/provider-display-name": "IBM", "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", "supports": "jee,java", @@ -68,7 +68,28 @@ }, "from": { "kind": "DockerImage", - "name": "docker.io/openliberty/open-liberty-s2i:23.0.0.11-java17" + "name": "docker.io/openliberty/open-liberty-s2i:24.0.0.3-java17" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "24.0.0.3-java21", + "annotations": { + "description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.", + "iconClass": "icon-openliberty", + "openshift.io/display-name": "Open Liberty 24.0.0.3 with Java 21", + "openshift.io/provider-display-name": "IBM", + "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", + "supports": "jee,java", + "tags": "builder,openliberty,java" + }, + "from": { + "kind": "DockerImage", + "name": "docker.io/openliberty/open-liberty-s2i:24.0.0.3-java21" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json b/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json index eb41762ec..f187bf14e 100755 --- a/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json +++ b/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json @@ -78,28 +78,6 @@ "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.access.redhat.com/ubi8/perl-530:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "5.30-el7", "annotations": { diff --git a/assets/operator/okd-x86_64/php/imagestreams/php-centos.json b/assets/operator/okd-x86_64/php/imagestreams/php-centos.json index 36139ba0e..42b560526 100755 --- a/assets/operator/okd-x86_64/php/imagestreams/php-centos.json +++ b/assets/operator/okd-x86_64/php/imagestreams/php-centos.json @@ -14,19 +14,19 @@ }, "tags": [ { - "name": "latest", + "name": "7.3-ubi7", "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/8.0/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 7.3 applications on UBI 7. 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.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP (Latest)", + "openshift.io/display-name": "PHP 7.3 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php", - "tags": "builder,php" + "tags": "builder,php", + "version": "7.3" }, "from": { - "kind": "ImageStreamTag", - "name": "8.0-ubi8" + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi7/php-73:latest" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,19 @@ } }, { - "name": "8.0-ubi9", + "name": "7.4-ubi8", "annotations": { - "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", + "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 8.0 (UBI 9)", + "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:8.0,php", "tags": "builder,php", - "version": "8.0" + "version": "7.4" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi9/php-80:latest" + "name": "registry.access.redhat.com/ubi8/php-74:latest" }, "generation": null, "importPolicy": {}, @@ -64,7 +63,6 @@ "openshift.io/display-name": "PHP 8.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:8.0,php", "tags": "builder,php", "version": "8.0" }, @@ -79,20 +77,19 @@ } }, { - "name": "7.4-ubi8", + "name": "8.0-ubi9", "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.", + "description": "Build and run PHP 8.0 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.4 (UBI 8)", + "openshift.io/display-name": "PHP 8.0 (UBI 9)", "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" + "version": "8.0" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/php-74:latest" + "name": "registry.access.redhat.com/ubi9/php-80:latest" }, "generation": null, "importPolicy": {}, @@ -101,20 +98,19 @@ } }, { - "name": "7.3-ubi7", + "name": "8.1-ubi9", "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 7. 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.", + "description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 7)", + "openshift.io/display-name": "PHP 8.1 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", "tags": "builder,php", - "version": "7.3" + "version": "8.1" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi7/php-73:latest" + "name": "registry.access.redhat.com/ubi9/php-81:latest" }, "generation": null, "importPolicy": {}, @@ -123,20 +119,19 @@ } }, { - "name": "7.3", + "name": "latest", "annotations": { - "description": "Build and run PHP 7.3 applications on CentOS 7. 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.", + "description": "Build and run PHP 8.0 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/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3", + "openshift.io/display-name": "PHP 8.0 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php,hidden", - "version": "7.3" + "tags": "builder,php", + "version": "8.0" }, "from": { - "kind": "DockerImage", - "name": "quay.io/centos7/php-73-centos7:latest" + "kind": "ImageStreamTag", + "name": "8.0-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json b/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json index fe45af193..deda232ec 100755 --- a/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json +++ b/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json @@ -14,17 +14,18 @@ }, "tags": [ { - "name": "latest", + "name": "10-el8", "annotations": { - "description": "Provides a PostgreSQL database on CentOS Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major version updates.", + "description": "Provides a PostgreSQL 10 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL (Latest)", + "openshift.io/display-name": "PostgreSQL 10 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql" + "tags": "database,postgresql", + "version": "10" }, "from": { - "kind": "ImageStreamTag", - "name": "15-el9" + "kind": "DockerImage", + "name": "quay.io/sclorg/postgresql-10-c8s:latest" }, "generation": null, "importPolicy": {}, @@ -33,18 +34,18 @@ } }, { - "name": "15-el9", + "name": "12-el8", "annotations": { - "description": "Provides a PostgreSQL 15 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 12 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 9)", + "openshift.io/display-name": "PostgreSQL 12 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "15" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-15-c9s:latest" + "name": "quay.io/sclorg/postgresql-12-c8s:latest" }, "generation": null, "importPolicy": {}, @@ -53,18 +54,18 @@ } }, { - "name": "13-el9", + "name": "13-el8", "annotations": { - "description": "Provides a PostgreSQL 13 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 9)", + "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", "version": "13" }, "from": { "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-13-c9s:latest" + "name": "quay.io/sclorg/postgresql-13-c8s:latest" }, "generation": null, "importPolicy": {}, @@ -93,18 +94,18 @@ } }, { - "name": "13-el8", + "name": "13-el9", "annotations": { - "description": "Provides a PostgreSQL 13 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 13 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 8)", + "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", "version": "13" }, "from": { "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-13-c8s:latest" + "name": "quay.io/sclorg/postgresql-13-c9s:latest" }, "generation": null, "importPolicy": {}, @@ -113,18 +114,18 @@ } }, { - "name": "12-el8", + "name": "15-el9", "annotations": { - "description": "Provides a PostgreSQL 12 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 12 (CentOS Stream 8)", + "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "12" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-12-c8s:latest" + "name": "quay.io/sclorg/postgresql-15-c9s:latest" }, "generation": null, "importPolicy": {}, @@ -133,18 +134,18 @@ } }, { - "name": "10-el8", + "name": "latest", "annotations": { - "description": "Provides a PostgreSQL 10 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "description": "Provides a PostgreSQL 15 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 10 (CentOS Stream 8)", + "openshift.io/display-name": "PostgreSQL 15 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "database,postgresql", - "version": "10" + "version": "15" }, "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-10-c8s:latest" + "kind": "ImageStreamTag", + "name": "15-el9" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json b/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json index 1a7d47325..5d636e6a9 100755 --- a/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json @@ -64,10 +64,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -75,7 +76,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -176,27 +179,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json b/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json index 623bc36dd..92478a97b 100755 --- a/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json @@ -81,10 +81,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -92,7 +93,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -193,27 +196,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json b/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json index f688a0761..9b4cb3d9e 100755 --- a/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json @@ -7,13 +7,12 @@ "annotations": { "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Rails + PostgreSQL", - "openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", - "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/support-url": "https://access.redhat.com", + "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", "tags": "quickstart,ruby,rails", - "template.openshift.io/bindable": "false" + "template.openshift.io/documentation-url": "https://github.com/sclorg/rails-ex", + "template.openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", + "template.openshift.io/provider-display-name": "Red Hat, Inc.", + "template.openshift.io/support-url": "https://access.redhat.com" } }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.", @@ -22,6 +21,10 @@ "apiVersion": "v1", "kind": "Secret", "metadata": { + "annotations": { + "template.openshift.io/expose-password": "{.data['application-password']}", + "template.openshift.io/expose-username": "{.data['application-user']}" + }, "name": "${NAME}" }, "stringData": { @@ -59,6 +62,9 @@ "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + }, "name": "${NAME}" }, "spec": { @@ -117,7 +123,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +146,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,20 +159,11 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { - "recreateParams": { - "pre": { - "execNewPod": { - "command": [ - "./migrate-database.sh" - ], - "containerName": "${NAME}" - }, - "failurePolicy": "Abort" - } - }, "type": "Recreate" }, "template": { @@ -278,27 +276,89 @@ } } } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" + ], + "initContainers": [ + { + "command": [ + "./migrate-database.sh" + ], + "env": [ + { + "name": "DATABASE_SERVICE_NAME", + "value": "${DATABASE_SERVICE_NAME}" + }, + { + "name": "POSTGRESQL_USER", + "valueFrom": { + "secretKeyRef": { + "key": "database-user", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "database-password", + "name": "${NAME}" + } + } + }, + { + "name": "SECRET_KEY_BASE", + "valueFrom": { + "secretKeyRef": { + "key": "keybase", + "name": "${NAME}" + } + } + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DATABASE_NAME}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + }, + { + "name": "APPLICATION_DOMAIN", + "value": "${APPLICATION_DOMAIN}" + }, + { + "name": "APPLICATION_USER", + "valueFrom": { + "secretKeyRef": { + "key": "application-user", + "name": "${NAME}" + } + } + }, + { + "name": "APPLICATION_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "application-password", + "name": "${NAME}" + } + } + }, + { + "name": "RAILS_ENV", + "value": "${RAILS_ENV}" + } + ], + "image": " ", + "name": "ruby-init-container" } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" + ] } - ] + } } }, { @@ -341,11 +401,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -353,7 +414,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -448,26 +511,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -486,6 +530,20 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Postgresql Version", + "description": "Version of Postgresql image to be used (12-el8 by default).", + "value": "12-el8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json b/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json index e7b7be7a4..1a4641f42 100755 --- a/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json +++ b/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json @@ -96,9 +96,6 @@ "name": "${NAME}:latest" } }, - "postCommit": { - "script": "bundle exec rake test" - }, "source": { "contextDir": "${CONTEXT_DIR}", "git": { @@ -117,7 +114,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:${RUBY_VERSION}", "namespace": "${NAMESPACE}" } }, @@ -140,11 +137,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the application server", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${NAME}" @@ -152,7 +150,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${NAME}" + "matchLabels": { + "name": "${NAME}" + } }, "strategy": { "recreateParams": { @@ -280,25 +280,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { @@ -324,11 +306,12 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { "description": "Defines how to deploy the database", + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -336,7 +319,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -429,26 +414,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:12-el8", - "namespace": "${NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } } ], @@ -467,6 +433,13 @@ "value": "openshift", "required": true }, + { + "name": "RUBY_VERSION", + "displayName": "Ruby Version", + "description": "Version of Ruby image to be used (3.0-ubi8 by default).", + "value": "3.0-ubi8", + "required": true + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json b/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json index 104f1f03c..72642ac20 100755 --- a/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json +++ b/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json @@ -60,10 +60,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -71,7 +72,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -154,27 +157,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} } diff --git a/assets/operator/okd-x86_64/redis/templates/redis-persistent.json b/assets/operator/okd-x86_64/redis/templates/redis-persistent.json index d1f4ed9d6..9f3ea41e2 100755 --- a/assets/operator/okd-x86_64/redis/templates/redis-persistent.json +++ b/assets/operator/okd-x86_64/redis/templates/redis-persistent.json @@ -77,10 +77,11 @@ } }, { - "apiVersion": "apps.openshift.io/v1", - "kind": "DeploymentConfig", + "apiVersion": "apps/v1", + "kind": "Deployment", "metadata": { "annotations": { + "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]", "template.alpha.openshift.io/wait-for-ready": "true" }, "name": "${DATABASE_SERVICE_NAME}" @@ -88,7 +89,9 @@ "spec": { "replicas": 1, "selector": { - "name": "${DATABASE_SERVICE_NAME}" + "matchLabels": { + "name": "${DATABASE_SERVICE_NAME}" + } }, "strategy": { "type": "Recreate" @@ -171,27 +174,7 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:${REDIS_VERSION}", - "namespace": "${NAMESPACE}" - }, - "lastTriggeredImage": "" - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } }, "status": {} }