From 8663114ce2104d9b6f29952c15e4ec8c96015a8d Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Fri, 13 May 2022 17:42:02 +0530 Subject: [PATCH 1/6] Jira SO-19: Remove non-groupified APIs in openshift/library templates Signed-off-by: Feny Mehta --- amq/amq62-image-stream.json | 2 +- amq/amq63-basic.json | 4 ++-- amq/amq63-persistent-ssl.json | 6 +++--- amq/amq63-persistent.json | 6 +++--- amq/amq63-ssl.json | 4 ++-- datagrid/datagrid71-image-stream.json | 4 ++-- eap/eap64-image-stream.json | 2 +- eap/eap70-image-stream.json | 2 +- eap/eap71-image-stream.json | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/amq/amq62-image-stream.json b/amq/amq62-image-stream.json index 3a6b66ca..e07c2984 100644 --- a/amq/amq62-image-stream.json +++ b/amq/amq62-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-amq-62", "annotations": { diff --git a/amq/amq63-basic.json b/amq/amq63-basic.json index a58cb335..16e63b1c 100644 --- a/amq/amq63-basic.json +++ b/amq/amq63-basic.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "annotations": { "description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone or in a mesh. This template doesn't feature SSL support.", @@ -224,7 +224,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { diff --git a/amq/amq63-persistent-ssl.json b/amq/amq63-persistent-ssl.json index 3cf80802..e69df1e3 100644 --- a/amq/amq63-persistent-ssl.json +++ b/amq/amq63-persistent-ssl.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "annotations": { "iconClass": "icon-amq", @@ -372,7 +372,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { @@ -587,7 +587,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { diff --git a/amq/amq63-persistent.json b/amq/amq63-persistent.json index f2077a92..f28ac14a 100644 --- a/amq/amq63-persistent.json +++ b/amq/amq63-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "annotations": { "iconClass": "icon-amq", @@ -241,7 +241,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { @@ -405,7 +405,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { diff --git a/amq/amq63-ssl.json b/amq/amq63-ssl.json index 28b7569d..2c53e032 100644 --- a/amq/amq63-ssl.json +++ b/amq/amq63-ssl.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "annotations": { "iconClass": "icon-amq", @@ -358,7 +358,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { diff --git a/datagrid/datagrid71-image-stream.json b/datagrid/datagrid71-image-stream.json index 17996734..2ddee05c 100644 --- a/datagrid/datagrid71-image-stream.json +++ b/datagrid/datagrid71-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-datagrid71-openshift", "annotations": { @@ -102,7 +102,7 @@ }, { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-datagrid71-client-openshift", "annotations": { diff --git a/eap/eap64-image-stream.json b/eap/eap64-image-stream.json index f76555c8..7285a875 100644 --- a/eap/eap64-image-stream.json +++ b/eap/eap64-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-eap64-openshift", "annotations": { diff --git a/eap/eap70-image-stream.json b/eap/eap70-image-stream.json index bffd0800..a936aa07 100644 --- a/eap/eap70-image-stream.json +++ b/eap/eap70-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-eap70-openshift", "annotations": { diff --git a/eap/eap71-image-stream.json b/eap/eap71-image-stream.json index 5fa3d08d..2ab64c7e 100644 --- a/eap/eap71-image-stream.json +++ b/eap/eap71-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-eap71-openshift", "annotations": { From d7bc748fcb2b7cb95ba70095b0ac9711f32eac4f Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 Jun 2022 15:57:21 +0530 Subject: [PATCH 2/6] Update amq62-image-stream.json --- amq/amq62-image-stream.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amq/amq62-image-stream.json b/amq/amq62-image-stream.json index e07c2984..3a6b66ca 100644 --- a/amq/amq62-image-stream.json +++ b/amq/amq62-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", + "apiVersion": "v1", "metadata": { "name": "jboss-amq-62", "annotations": { From da6873a336f4089c0f4ef3dd67d4c86d627a2ac3 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 Jun 2022 15:59:02 +0530 Subject: [PATCH 3/6] Update eap71-image-stream.json --- eap/eap71-image-stream.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eap/eap71-image-stream.json b/eap/eap71-image-stream.json index 2ab64c7e..5fa3d08d 100644 --- a/eap/eap71-image-stream.json +++ b/eap/eap71-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", + "apiVersion": "v1", "metadata": { "name": "jboss-eap71-openshift", "annotations": { From c3645cf0edbd76ca6f163220e97d45eb6f13f08f Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 Jun 2022 16:03:15 +0530 Subject: [PATCH 4/6] Update datagrid71-image-stream.json --- datagrid/datagrid71-image-stream.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datagrid/datagrid71-image-stream.json b/datagrid/datagrid71-image-stream.json index 2ddee05c..17996734 100644 --- a/datagrid/datagrid71-image-stream.json +++ b/datagrid/datagrid71-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", + "apiVersion": "v1", "metadata": { "name": "jboss-datagrid71-openshift", "annotations": { @@ -102,7 +102,7 @@ }, { "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", + "apiVersion": "v1", "metadata": { "name": "jboss-datagrid71-client-openshift", "annotations": { From a1c0f941717c65281a1f29ab717578d4099f1633 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 Jun 2022 16:04:15 +0530 Subject: [PATCH 5/6] Update eap64-image-stream.json --- eap/eap64-image-stream.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eap/eap64-image-stream.json b/eap/eap64-image-stream.json index 7285a875..f76555c8 100644 --- a/eap/eap64-image-stream.json +++ b/eap/eap64-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", + "apiVersion": "v1", "metadata": { "name": "jboss-eap64-openshift", "annotations": { From 1df6733f52718f7b1295dcbffa994d6518c0ab59 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 Jun 2022 16:04:35 +0530 Subject: [PATCH 6/6] Update eap70-image-stream.json --- eap/eap70-image-stream.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eap/eap70-image-stream.json b/eap/eap70-image-stream.json index a936aa07..bffd0800 100644 --- a/eap/eap70-image-stream.json +++ b/eap/eap70-image-stream.json @@ -11,7 +11,7 @@ "items": [ { "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", + "apiVersion": "v1", "metadata": { "name": "jboss-eap70-openshift", "annotations": {