From 0dc4f025dce66e0d4d7dc935a1dda2c9f0877984 Mon Sep 17 00:00:00 2001 From: "alfonso.alongi" Date: Sat, 12 Feb 2022 13:01:21 +0100 Subject: [PATCH 1/2] Remove wrong unused labels jws56jdk8ubi8 and jws56jdk11ubi8. Add samples.operator.openshift.io/managed label --- templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json | 6 +++--- templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json index b6c917c..3a24d5f 100644 --- a/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json +++ b/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json @@ -18,11 +18,11 @@ "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8", "openshift.io/provider-display-name": "Red Hat, Inc.", "version": "5.6" + }, + "labels": { + "samples.operator.openshift.io/managed": "true" } }, - "labels": { - "jws56jdk11ubi8": "5.6.1" - }, "spec": { "tags": [ { diff --git a/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json index 0bfb6a5..ba72625 100644 --- a/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json +++ b/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json @@ -18,11 +18,11 @@ "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8", "openshift.io/provider-display-name": "Red Hat, Inc.", "version": "5.6" + }, + "labels": { + "samples.operator.openshift.io/managed": "true" } }, - "labels": { - "jws56jdk8ubi8": "5.6.1" - }, "spec": { "tags": [ { From cb6ad4afa8da8bc200ddff925fd0f37e7ec7c27c Mon Sep 17 00:00:00 2001 From: "alfonso.alongi" Date: Sat, 12 Feb 2022 13:14:53 +0100 Subject: [PATCH 2/2] fix image stream json file formatting --- .../jws56-openj9-tomcat9-ubi8-image-stream.json | 14 +++++++------- .../jws56-openjdk11-tomcat9-ubi8-image-stream.json | 8 ++++---- .../jws56-openjdk8-tomcat9-ubi8-image-stream.json | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/jws56-openj9-tomcat9-ubi8-image-stream.json b/templates/jws56-openj9-tomcat9-ubi8-image-stream.json index 2c96696..b562ab2 100644 --- a/templates/jws56-openj9-tomcat9-ubi8-image-stream.json +++ b/templates/jws56-openj9-tomcat9-ubi8-image-stream.json @@ -37,14 +37,14 @@ "version": "latest", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { "kind": "DockerImage", "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:latest" }, - "importPolicy": { + "importPolicy": { "insecure": true } }, @@ -60,14 +60,14 @@ "version": "1.2", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { "kind": "DockerImage", "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:5.6.0" }, - "importPolicy": { + "importPolicy": { "insecure": true } }, @@ -83,14 +83,14 @@ "version": "1.2", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { "kind": "DockerImage", "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:5.6.1" }, - "importPolicy": { + "importPolicy": { "insecure": true } } @@ -98,4 +98,4 @@ } } ] -} +} \ No newline at end of file diff --git a/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json index 3a24d5f..a46fd88 100644 --- a/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json +++ b/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json @@ -37,7 +37,7 @@ "version": "latest", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { @@ -57,7 +57,7 @@ "version": "1.2", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { @@ -77,7 +77,7 @@ "version": "1.2", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { @@ -89,4 +89,4 @@ } } ] -} +} \ No newline at end of file diff --git a/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json index ba72625..7306df9 100644 --- a/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json +++ b/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json @@ -37,7 +37,7 @@ "version": "latest", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { @@ -57,7 +57,7 @@ "version": "1.2", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { @@ -77,7 +77,7 @@ "version": "1.2", "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8" }, - "referencePolicy": { + "referencePolicy": { "type": "Local" }, "from": { @@ -89,4 +89,4 @@ } } ] -} +} \ No newline at end of file