Fix ImageStream tags in openshift provider mode (kubernetes#1461)

* Fix ImageStream tags in openshift provider mode Signed-off-by: Shivam Sandbhor <[email protected]>
hangyan · Nov 20, 2021 · a46582b · a46582b
1 parent 40646f4
commit a46582b
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 28 deletions.
diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go
@@ -56,9 +56,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig,
 	if service.Image == "" {
 		service.Image = name
 	}
-
 	// Retrieve tags and image name for mapping
-
 	var importPolicy imageapi.TagImportPolicy
 	if opt.InsecureRepository {
 		importPolicy = imageapi.TagImportPolicy{Insecure: true}
@@ -74,6 +72,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig,
 					Name: service.Image,
 				},
 				ImportPolicy: importPolicy,
+				Name:         GetImageTag(service.Image),
 			})
 	}
 

diff --git a/script/test/fixtures/change-in-volume/output-os-empty-vols-template.json b/script/test/fixtures/change-in-volume/output-os-empty-vols-template.json
@@ -143,7 +143,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -264,7 +264,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/configmap-volume/output-os-withlabel.json b/script/test/fixtures/configmap-volume/output-os-withlabel.json
@@ -109,7 +109,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -260,7 +260,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/configmap-volume/output-os.json b/script/test/fixtures/configmap-volume/output-os.json
@@ -106,7 +106,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -254,7 +254,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/deploy/placement/output-placement-os.json b/script/test/fixtures/deploy/placement/output-placement-os.json
@@ -170,7 +170,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/expose/output-ocp.json b/script/test/fixtures/expose/output-ocp.json
@@ -145,7 +145,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -253,7 +253,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/healthcheck/output-healthcheck-os.json b/script/test/fixtures/healthcheck/output-healthcheck-os.json
@@ -248,7 +248,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -376,7 +376,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -507,7 +507,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -638,7 +638,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/multiple-files/output-ocp.json b/script/test/fixtures/multiple-files/output-ocp.json
@@ -84,7 +84,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -183,7 +183,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/multiple-type-volumes/output-os.json b/script/test/fixtures/multiple-type-volumes/output-os.json
@@ -102,7 +102,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -258,7 +258,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/pvc-request-size/output-os.json b/script/test/fixtures/pvc-request-size/output-os.json
@@ -180,7 +180,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -324,7 +324,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/statefulset/output-os.json b/script/test/fixtures/statefulset/output-os.json
@@ -259,7 +259,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -481,7 +481,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/storage-class-name/output-os.json b/script/test/fixtures/storage-class-name/output-os.json
@@ -136,7 +136,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/v2/output-os.json b/script/test/fixtures/v2/output-os.json
@@ -432,7 +432,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/v3.0/output-os.json b/script/test/fixtures/v3.0/output-os.json
@@ -121,7 +121,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",
@@ -233,7 +233,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",

diff --git a/script/test/fixtures/volume-mounts/windows/output-os.json b/script/test/fixtures/volume-mounts/windows/output-os.json
@@ -130,7 +130,7 @@
         },
         "tags": [
           {
-            "name": "",
+            "name": "latest",
             "annotations": null,
             "from": {
               "kind": "DockerImage",