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

Fix: Make the out flag print to one file using seperator (#1541)

Browse Source 
* fix: make the out flag print to one file using seperator

* fix: comment an unused function

* fix: update test script

* fix: update output k8s

* fix: update the json output error condition

* fix: update envvars interpolation tests

* chore: update e2e tests to support yaml generation instead of JSON format

* fix: update e2e tests according to ci environment

* fix: apply PR changes
This commit is contained in:
AhmedGrati
2022-12-01 09:47:50 +01:00
committed by GitHub
parent 4c14b06333
commit 91391eb84f
63 changed files with 4919 additions and 7499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/envvars-interpolation/output-k8s.json
Vendored
-60
View File
@@ -1,60 +0,0 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Deployment",
"apiVersion": "apps/v1",
"metadata": {
"name": "myservice",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "myservice"
}
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "myservice"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "myservice"
}
},
"spec": {
"containers": [
{
"name": "myservice",
"image": "alpine",
"args": [
"curl",
"$(PROTOCOL)://$(DOMAIN)/"
],
"env": [
{
"name": "DOMAIN",
"value": "google.com"
},
{
"name": "PROTOCOL",
"value": "https"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
}
]
}
script/test/fixtures/envvars-interpolation/output-k8s.yaml
Vendored
+35
View File
@@ -0,0 +1,35 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
creationTimestamp: null
labels:
io.kompose.service: myservice
name: myservice
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: myservice
strategy: {}
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: myservice
spec:
containers:
- args:
- curl
- $(PROTOCOL)://$(DOMAIN)/
env:
- name: DOMAIN
value: google.com
- name: PROTOCOL
value: https
image: alpine
name: myservice
resources: {}
restartPolicy: Always
status: {}
script/test/fixtures/envvars-interpolation/output-os.json
Vendored
-120
View File
@@ -1,120 +0,0 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "myservice",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "myservice"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"myservice"
],
"from": {
"kind": "ImageStreamTag",
"name": "myservice:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "myservice"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "myservice"
}
},
"spec": {
"containers": [
{
"name": "myservice",
"image": " ",
"args": [
"curl",
"$(PROTOCOL)://$(DOMAIN)/"
],
"env": [
{
"name": "DOMAIN",
"value": "google.com"
},
{
"name": "PROTOCOL",
"value": "https"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {
"latestVersion": 0,
"observedGeneration": 0,
"replicas": 0,
"updatedReplicas": 0,
"availableReplicas": 0,
"unavailableReplicas": 0
}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "myservice",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "myservice"
}
},
"spec": {
"lookupPolicy": {
"local": false
},
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "alpine"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": ""
}
}
]
},
"status": {
"dockerImageRepository": ""
}
}
]
}
script/test/fixtures/envvars-interpolation/output-os.yaml
Vendored
+76
View File
@@ -0,0 +1,76 @@
---
apiVersion: v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
labels:
io.kompose.service: myservice
name: myservice
spec:
replicas: 1
selector:
io.kompose.service: myservice
strategy:
resources: {}
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: myservice
spec:
containers:
- args:
- curl
- $(PROTOCOL)://$(DOMAIN)/
env:
- name: DOMAIN
value: google.com
- name: PROTOCOL
value: https
image: ' '
name: myservice
resources: {}
restartPolicy: Always
test: false
triggers:
- type: ConfigChange
- imageChangeParams:
automatic: true
containerNames:
- myservice
from:
kind: ImageStreamTag
name: myservice:latest
type: ImageChange
status:
availableReplicas: 0
latestVersion: 0
observedGeneration: 0
replicas: 0
unavailableReplicas: 0
updatedReplicas: 0
---
apiVersion: v1
kind: ImageStream
metadata:
creationTimestamp: null
labels:
io.kompose.service: myservice
name: myservice
spec:
lookupPolicy:
local: false
tags:
- annotations: null
from:
kind: DockerImage
name: alpine
generation: null
importPolicy: {}
name: latest
referencePolicy:
type: ""
status:
dockerImageRepository: ""