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

* 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
-249
View File
@@ -1,249 +0,0 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"ports": [
{
"name": "3306",
"port": 3306,
"targetPort": 3306
}
],
"selector": {
"io.kompose.service": "db"
},
"clusterIP": "None",
"type": "ClusterIP"
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"ports": [
{
"name": "8000",
"port": 8000,
"targetPort": 80
}
],
"selector": {
"io.kompose.service": "wordpress"
},
"clusterIP": "None",
"type": "ClusterIP"
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "StatefulSet",
"apiVersion": "apps/v1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "db"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"containers": [
{
"name": "db",
"image": "mysql:5.7",
"ports": [
{
"containerPort": 3306
}
],
"env": [
{
"name": "MYSQL_DATABASE",
"value": "wordpress"
},
{
"name": "MYSQL_PASSWORD",
"value": "wordpress"
},
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "somewordpress"
},
{
"name": "MYSQL_USER",
"value": "wordpress"
}
],
"resources": {},
"volumeMounts": [
{
"name": "db-data",
"mountPath": "/var/lib/mysql"
}
]
}
],
"restartPolicy": "Always"
}
},
"volumeClaimTemplates": [
{
"metadata": {
"name": "db-data",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db-data"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
],
"serviceName": "db",
"updateStrategy": {}
},
"status": {
"replicas": 0
}
},
{
"kind": "StatefulSet",
"apiVersion": "apps/v1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "wordpress"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"containers": [
{
"name": "wordpress",
"image": "wordpress:latest",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "WORDPRESS_DB_HOST",
"value": "db:3306"
},
{
"name": "WORDPRESS_DB_NAME",
"value": "wordpress"
},
{
"name": "WORDPRESS_DB_PASSWORD",
"value": "wordpress"
},
{
"name": "WORDPRESS_DB_USER",
"value": "wordpress"
}
],
"resources": {},
"volumeMounts": [
{
"name": "wordpress-data",
"mountPath": "/var/www/html"
}
]
}
],
"restartPolicy": "Always"
}
},
"volumeClaimTemplates": [
{
"metadata": {
"name": "wordpress-data",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress-data"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
],
"serviceName": "wordpress",
"updateStrategy": {}
},
"status": {
"replicas": 0
}
}
]
}
+152
View File
@@ -0,0 +1,152 @@
---
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
name: db
spec:
clusterIP: None
ports:
- name: "3306"
port: 3306
targetPort: 3306
selector:
io.kompose.service: db
type: ClusterIP
status:
loadBalancer: {}
---
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
name: wordpress
spec:
clusterIP: None
ports:
- name: "8000"
port: 8000
targetPort: 80
selector:
io.kompose.service: wordpress
type: ClusterIP
status:
loadBalancer: {}
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
name: db
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: db
serviceName: db
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
spec:
containers:
- env:
- name: MYSQL_DATABASE
value: wordpress
- name: MYSQL_PASSWORD
value: wordpress
- name: MYSQL_ROOT_PASSWORD
value: somewordpress
- name: MYSQL_USER
value: wordpress
image: mysql:5.7
name: db
ports:
- containerPort: 3306
resources: {}
volumeMounts:
- mountPath: /var/lib/mysql
name: db-data
restartPolicy: Always
updateStrategy: {}
volumeClaimTemplates:
- metadata:
creationTimestamp: null
labels:
io.kompose.service: db-data
name: db-data
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 100Mi
status: {}
status:
replicas: 0
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
name: wordpress
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: wordpress
serviceName: wordpress
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
spec:
containers:
- env:
- name: WORDPRESS_DB_HOST
value: db:3306
- name: WORDPRESS_DB_NAME
value: wordpress
- name: WORDPRESS_DB_PASSWORD
value: wordpress
- name: WORDPRESS_DB_USER
value: wordpress
image: wordpress:latest
name: wordpress
ports:
- containerPort: 80
resources: {}
volumeMounts:
- mountPath: /var/www/html
name: wordpress-data
restartPolicy: Always
updateStrategy: {}
volumeClaimTemplates:
- metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress-data
name: wordpress-data
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 100Mi
status: {}
status:
replicas: 0
-503
View File
@@ -1,503 +0,0 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"ports": [
{
"name": "3306",
"port": 3306,
"targetPort": 3306
}
],
"selector": {
"io.kompose.service": "db"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"ports": [
{
"name": "8000",
"port": 8000,
"targetPort": 80
}
],
"selector": {
"io.kompose.service": "wordpress"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "StatefulSet",
"apiVersion": "apps/v1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "db"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"containers": [
{
"name": "db",
"image": "mysql:5.7",
"ports": [
{
"containerPort": 3306
}
],
"env": [
{
"name": "MYSQL_DATABASE",
"value": "wordpress"
},
{
"name": "MYSQL_PASSWORD",
"value": "wordpress"
},
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "somewordpress"
},
{
"name": "MYSQL_USER",
"value": "wordpress"
}
],
"resources": {},
"volumeMounts": [
{
"name": "db-data",
"mountPath": "/var/lib/mysql"
}
]
}
],
"restartPolicy": "Always"
}
},
"volumeClaimTemplates": [
{
"metadata": {
"name": "db-data",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db-data"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
],
"serviceName": "db",
"updateStrategy": {}
},
"status": {
"replicas": 0
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"strategy": {
"type": "Recreate",
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"db"
],
"from": {
"kind": "ImageStreamTag",
"name": "db:5.7"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "db"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"containers": [
{
"name": "db",
"image": " ",
"ports": [
{
"containerPort": 3306
}
],
"env": [
{
"name": "MYSQL_DATABASE",
"value": "wordpress"
},
{
"name": "MYSQL_PASSWORD",
"value": "wordpress"
},
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "somewordpress"
},
{
"name": "MYSQL_USER",
"value": "wordpress"
}
],
"resources": {},
"volumeMounts": [
{
"name": "db-data",
"mountPath": "/var/lib/mysql"
}
]
}
],
"restartPolicy": "Always"
}
}
},
"status": {
"latestVersion": 0,
"observedGeneration": 0,
"replicas": 0,
"updatedReplicas": 0,
"availableReplicas": 0,
"unavailableReplicas": 0
}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"lookupPolicy": {
"local": false
},
"tags": [
{
"name": "5.7",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "mysql:5.7"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": ""
}
}
]
},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "StatefulSet",
"apiVersion": "apps/v1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "wordpress"
}
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"containers": [
{
"name": "wordpress",
"image": "wordpress:latest",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "WORDPRESS_DB_HOST",
"value": "db:3306"
},
{
"name": "WORDPRESS_DB_NAME",
"value": "wordpress"
},
{
"name": "WORDPRESS_DB_PASSWORD",
"value": "wordpress"
},
{
"name": "WORDPRESS_DB_USER",
"value": "wordpress"
}
],
"resources": {},
"volumeMounts": [
{
"name": "wordpress-data",
"mountPath": "/var/www/html"
}
]
}
],
"restartPolicy": "Always"
}
},
"volumeClaimTemplates": [
{
"metadata": {
"name": "wordpress-data",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress-data"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
],
"serviceName": "wordpress",
"updateStrategy": {}
},
"status": {
"replicas": 0
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"strategy": {
"type": "Recreate",
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"wordpress"
],
"from": {
"kind": "ImageStreamTag",
"name": "wordpress:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "wordpress"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"containers": [
{
"name": "wordpress",
"image": " ",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "WORDPRESS_DB_HOST",
"value": "db:3306"
},
{
"name": "WORDPRESS_DB_NAME",
"value": "wordpress"
},
{
"name": "WORDPRESS_DB_PASSWORD",
"value": "wordpress"
},
{
"name": "WORDPRESS_DB_USER",
"value": "wordpress"
}
],
"resources": {},
"volumeMounts": [
{
"name": "wordpress-data",
"mountPath": "/var/www/html"
}
]
}
],
"restartPolicy": "Always"
}
}
},
"status": {
"latestVersion": 0,
"observedGeneration": 0,
"replicas": 0,
"updatedReplicas": 0,
"availableReplicas": 0,
"unavailableReplicas": 0
}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"lookupPolicy": {
"local": false
},
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "wordpress:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": ""
}
}
]
},
"status": {
"dockerImageRepository": ""
}
}
]
}
+314
View File
@@ -0,0 +1,314 @@
---
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
name: db
spec:
ports:
- name: "3306"
port: 3306
targetPort: 3306
selector:
io.kompose.service: db
status:
loadBalancer: {}
---
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
name: wordpress
spec:
ports:
- name: "8000"
port: 8000
targetPort: 80
selector:
io.kompose.service: wordpress
status:
loadBalancer: {}
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
name: db
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: db
serviceName: db
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
spec:
containers:
- env:
- name: MYSQL_DATABASE
value: wordpress
- name: MYSQL_PASSWORD
value: wordpress
- name: MYSQL_ROOT_PASSWORD
value: somewordpress
- name: MYSQL_USER
value: wordpress
image: mysql:5.7
name: db
ports:
- containerPort: 3306
resources: {}
volumeMounts:
- mountPath: /var/lib/mysql
name: db-data
restartPolicy: Always
updateStrategy: {}
volumeClaimTemplates:
- metadata:
creationTimestamp: null
labels:
io.kompose.service: db-data
name: db-data
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 100Mi
status: {}
status:
replicas: 0
---
apiVersion: v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
name: db
spec:
replicas: 1
selector:
io.kompose.service: db
strategy:
resources: {}
type: Recreate
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: db
spec:
containers:
- env:
- name: MYSQL_DATABASE
value: wordpress
- name: MYSQL_PASSWORD
value: wordpress
- name: MYSQL_ROOT_PASSWORD
value: somewordpress
- name: MYSQL_USER
value: wordpress
image: ' '
name: db
ports:
- containerPort: 3306
resources: {}
volumeMounts:
- mountPath: /var/lib/mysql
name: db-data
restartPolicy: Always
test: false
triggers:
- type: ConfigChange
- imageChangeParams:
automatic: true
containerNames:
- db
from:
kind: ImageStreamTag
name: db:5.7
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: db
name: db
spec:
lookupPolicy:
local: false
tags:
- annotations: null
from:
kind: DockerImage
name: mysql:5.7
generation: null
importPolicy: {}
name: "5.7"
referencePolicy:
type: ""
status:
dockerImageRepository: ""
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
name: wordpress
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: wordpress
serviceName: wordpress
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
spec:
containers:
- env:
- name: WORDPRESS_DB_HOST
value: db:3306
- name: WORDPRESS_DB_NAME
value: wordpress
- name: WORDPRESS_DB_PASSWORD
value: wordpress
- name: WORDPRESS_DB_USER
value: wordpress
image: wordpress:latest
name: wordpress
ports:
- containerPort: 80
resources: {}
volumeMounts:
- mountPath: /var/www/html
name: wordpress-data
restartPolicy: Always
updateStrategy: {}
volumeClaimTemplates:
- metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress-data
name: wordpress-data
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 100Mi
status: {}
status:
replicas: 0
---
apiVersion: v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
name: wordpress
spec:
replicas: 1
selector:
io.kompose.service: wordpress
strategy:
resources: {}
type: Recreate
template:
metadata:
creationTimestamp: null
labels:
io.kompose.service: wordpress
spec:
containers:
- env:
- name: WORDPRESS_DB_HOST
value: db:3306
- name: WORDPRESS_DB_NAME
value: wordpress
- name: WORDPRESS_DB_PASSWORD
value: wordpress
- name: WORDPRESS_DB_USER
value: wordpress
image: ' '
name: wordpress
ports:
- containerPort: 80
resources: {}
volumeMounts:
- mountPath: /var/www/html
name: wordpress-data
restartPolicy: Always
test: false
triggers:
- type: ConfigChange
- imageChangeParams:
automatic: true
containerNames:
- wordpress
from:
kind: ImageStreamTag
name: wordpress: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: wordpress
name: wordpress
spec:
lookupPolicy:
local: false
tags:
- annotations: null
from:
kind: DockerImage
name: wordpress:latest
generation: null
importPolicy: {}
name: latest
referencePolicy:
type: ""
status:
dockerImageRepository: ""