deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Fix ImageStream tags in openshift provider mode (#1461)

Browse Source 
* Fix ImageStream tags in openshift provider mode

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>
This commit is contained in:
Shivam Sandbhor 2021-11-20 11:01:56 +05:30 committed by GitHub
parent 40646f4715
commit a46582bda2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/transformer/openshift/openshift.go
View File

@ -56,9 +56,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig,
if service.Image == "" { if service.Image == "" {
service.Image = name service.Image = name
} }
// Retrieve tags and image name for mapping // Retrieve tags and image name for mapping
var importPolicy imageapi.TagImportPolicy var importPolicy imageapi.TagImportPolicy
if opt.InsecureRepository { if opt.InsecureRepository {
importPolicy = imageapi.TagImportPolicy{Insecure: true} importPolicy = imageapi.TagImportPolicy{Insecure: true}
@ -74,6 +72,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig,
Name: service.Image, Name: service.Image,
}, },
ImportPolicy: importPolicy, ImportPolicy: importPolicy,
Name: GetImageTag(service.Image),
}) })
} }

4
script/test/fixtures/change-in-volume/output-os-empty-vols-template.json vendored
View File

@ -143,7 +143,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -264,7 +264,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/configmap-volume/output-os-withlabel.json vendored
View File

@ -109,7 +109,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -260,7 +260,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/configmap-volume/output-os.json vendored
View File

@ -106,7 +106,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -254,7 +254,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

2
script/test/fixtures/deploy/placement/output-placement-os.json vendored
View File

@ -170,7 +170,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/expose/output-ocp.json vendored
View File

@ -145,7 +145,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -253,7 +253,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

8
script/test/fixtures/healthcheck/output-healthcheck-os.json vendored
View File

@ -248,7 +248,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -376,7 +376,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -507,7 +507,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -638,7 +638,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/multiple-files/output-ocp.json vendored
View File

@ -84,7 +84,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -183,7 +183,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/multiple-type-volumes/output-os.json vendored
View File

@ -102,7 +102,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -258,7 +258,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/pvc-request-size/output-os.json vendored
View File

@ -180,7 +180,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -324,7 +324,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/statefulset/output-os.json vendored
View File

@ -259,7 +259,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -481,7 +481,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

2
script/test/fixtures/storage-class-name/output-os.json vendored
View File

@ -136,7 +136,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

2
script/test/fixtures/v2/output-os.json vendored
View File

@ -432,7 +432,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

4
script/test/fixtures/v3.0/output-os.json vendored
View File

@ -121,7 +121,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
@ -233,7 +233,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",

2
script/test/fixtures/volume-mounts/windows/output-os.json vendored
View File

@ -130,7 +130,7 @@
}, },
"tags": [ "tags": [
{ {
"name": "", "name": "latest",
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",