Merge pull request #322 from yselkowitz/dg73-update

Update datagrid to 7.3-v1.9
openshift · Jun 13, 2022 · 59e6d3d · 59e6d3d
2 parents 1904434 + 95d1bd2
commit 59e6d3d
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 6 deletions.
diff --git a/official.yaml b/official.yaml
@@ -9,7 +9,7 @@ variables:
   ips_ds_version: 6.4.12.GA
   rhdm_version: 7.12.1.GA
   rhpam_version: 7.12.1.GA
-  datagrid_version: 7.3-v1.4
+  datagrid_version: 7.3-v1.9
   rhamp_version: master
   fuse_version: "7.3"
 data:
@@ -563,7 +563,7 @@ data:
           - ocp
           - online-professional
     imagestreams:
-      - location: https://raw.githubusercontent.com/jboss-container-images/jboss-datagrid-7-openshift-image/{datagrid_version}/templates/datagrid73-image-stream.json
+      - location: https://raw.githubusercontent.com/jboss-container-images/jboss-datagrid-7-openshift-image/{datagrid_version}/image-streams/datagrid73-image-stream.json
         docs: https://access.redhat.com/documentation/en-us/red_hat_jboss_data_grid/7.3/html/data_grid_for_openshift/
         regex: jboss-datagrid
         suffix: rhel7

diff --git a/official/datagrid/imagestreams/jboss-datagrid73-openshift-rhel7.json b/official/datagrid/imagestreams/jboss-datagrid73-openshift-rhel7.json
@@ -1,13 +1,13 @@
 {
 	"kind": "ImageStream",
-	"apiVersion": "v1",
+	"apiVersion": "image.openshift.io/v1",
 	"metadata": {
 		"name": "jboss-datagrid73-openshift",
 		"creationTimestamp": null,
 		"annotations": {
 			"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3",
 			"openshift.io/provider-display-name": "Red Hat, Inc.",
-			"version": "1.4"
+			"version": "1.8"
 		}
 	},
 	"spec": {
@@ -114,6 +114,86 @@
 				"referencePolicy": {
 					"type": "Local"
 				}
+			},
+			{
+				"name": "1.5",
+				"annotations": {
+					"description": "Red Hat JBoss Data Grid 7.3 image",
+					"iconClass": "icon-datagrid",
+					"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3",
+					"supports": "datagrid:7.3",
+					"tags": "datagrid,jboss,hidden",
+					"version": "1.5"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "1.6",
+				"annotations": {
+					"description": "Red Hat JBoss Data Grid 7.3 image",
+					"iconClass": "icon-datagrid",
+					"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3",
+					"supports": "datagrid:7.3",
+					"tags": "datagrid,jboss,hidden",
+					"version": "1.6"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "1.7",
+				"annotations": {
+					"description": "Red Hat JBoss Data Grid 7.3 image",
+					"iconClass": "icon-datagrid",
+					"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3",
+					"supports": "datagrid:7.3",
+					"tags": "datagrid,jboss,hidden",
+					"version": "1.7"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.7"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
+			},
+			{
+				"name": "1.8",
+				"annotations": {
+					"description": "Red Hat JBoss Data Grid 7.3 image",
+					"iconClass": "icon-datagrid",
+					"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3",
+					"supports": "datagrid:7.3",
+					"tags": "datagrid,jboss,hidden",
+					"version": "1.8"
+				},
+				"from": {
+					"kind": "DockerImage",
+					"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.8"
+				},
+				"generation": null,
+				"importPolicy": {},
+				"referencePolicy": {
+					"type": "Local"
+				}
 			}
 		]
 	},

diff --git a/official/datagrid/templates/cache-service.json b/official/datagrid/templates/cache-service.json
@@ -1,6 +1,6 @@
 {
 	"kind": "Template",
-	"apiVersion": "v1",
+	"apiVersion": "template.openshift.io/v1",
 	"metadata": {
 		"name": "cache-service",
 		"creationTimestamp": null,
@@ -54,6 +54,7 @@
 						"port": 8888
 					}
 				],
+				"publishNotReadyAddresses": true,
 				"selector": {
 					"deploymentConfig": "${APPLICATION_NAME}"
 				}

diff --git a/official/datagrid/templates/datagrid-service.json b/official/datagrid/templates/datagrid-service.json
@@ -1,6 +1,6 @@
 {
 	"kind": "Template",
-	"apiVersion": "v1",
+	"apiVersion": "template.openshift.io/v1",
 	"metadata": {
 		"name": "datagrid-service",
 		"creationTimestamp": null,
@@ -54,6 +54,7 @@
 						"port": 8888
 					}
 				],
+				"publishNotReadyAddresses": true,
 				"selector": {
 					"deploymentConfig": "${APPLICATION_NAME}"
 				}