forked from LaconicNetwork/kompose
feat(1765): update tests, move unit test to proper file, improve removeEmptyInterfaces algo
Signed-off-by: Martin Jirku <martin@jirku.sk>
This commit is contained in:
Martin Jirku
@@ -2,7 +2,6 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
@@ -18,7 +17,6 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mysql
|
||||
name: mysql
|
||||
@@ -34,7 +32,6 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: postgresql
|
||||
name: postgresql
|
||||
@@ -50,7 +47,6 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: redis
|
||||
name: redis
|
||||
@@ -66,7 +62,6 @@ spec:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
@@ -75,10 +70,8 @@ spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: mongo
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: mongo
|
||||
@@ -101,14 +94,12 @@ spec:
|
||||
tcpSocket:
|
||||
port: 9090
|
||||
timeoutSeconds: 1
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mysql
|
||||
name: mysql
|
||||
@@ -117,10 +108,8 @@ spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: mysql
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: mysql
|
||||
@@ -143,14 +132,12 @@ spec:
|
||||
tcpSocket:
|
||||
port: 9091
|
||||
timeoutSeconds: 2
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: postgresql
|
||||
name: postgresql
|
||||
@@ -159,10 +146,8 @@ spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: postgresql
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: postgresql
|
||||
@@ -187,14 +172,12 @@ spec:
|
||||
port: 8080
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 1
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: redis
|
||||
name: redis
|
||||
@@ -203,10 +186,8 @@ spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
io.kompose.service: redis
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: redis
|
||||
@@ -232,6 +213,5 @@ spec:
|
||||
failureThreshold: 5
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 1
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
|
||||
|
||||
+4
-44
@@ -2,7 +2,6 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
@@ -18,7 +17,6 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mysql
|
||||
name: mysql
|
||||
@@ -34,7 +32,6 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: postgresql
|
||||
name: postgresql
|
||||
@@ -50,7 +47,6 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: redis
|
||||
name: redis
|
||||
@@ -66,7 +62,6 @@ spec:
|
||||
apiVersion: apps.openshift.io/v1
|
||||
kind: DeploymentConfig
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
@@ -74,11 +69,8 @@ spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
io.kompose.service: mongo
|
||||
strategy:
|
||||
resources: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: mongo
|
||||
@@ -101,7 +93,6 @@ spec:
|
||||
tcpSocket:
|
||||
port: 9090
|
||||
timeoutSeconds: 1
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
test: false
|
||||
triggers:
|
||||
@@ -119,7 +110,6 @@ spec:
|
||||
apiVersion: image.openshift.io/v1
|
||||
kind: ImageStream
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mongo
|
||||
name: mongo
|
||||
@@ -127,12 +117,9 @@ spec:
|
||||
lookupPolicy:
|
||||
local: false
|
||||
tags:
|
||||
- annotations: null
|
||||
from:
|
||||
- from:
|
||||
kind: DockerImage
|
||||
name: mongo
|
||||
generation: null
|
||||
importPolicy: {}
|
||||
name: latest
|
||||
referencePolicy:
|
||||
type: ""
|
||||
@@ -141,7 +128,6 @@ spec:
|
||||
apiVersion: apps.openshift.io/v1
|
||||
kind: DeploymentConfig
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mysql
|
||||
name: mysql
|
||||
@@ -149,11 +135,8 @@ spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
io.kompose.service: mysql
|
||||
strategy:
|
||||
resources: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: mysql
|
||||
@@ -176,7 +159,6 @@ spec:
|
||||
tcpSocket:
|
||||
port: 9091
|
||||
timeoutSeconds: 2
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
test: false
|
||||
triggers:
|
||||
@@ -194,7 +176,6 @@ spec:
|
||||
apiVersion: image.openshift.io/v1
|
||||
kind: ImageStream
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: mysql
|
||||
name: mysql
|
||||
@@ -202,12 +183,9 @@ spec:
|
||||
lookupPolicy:
|
||||
local: false
|
||||
tags:
|
||||
- annotations: null
|
||||
from:
|
||||
- from:
|
||||
kind: DockerImage
|
||||
name: mysql
|
||||
generation: null
|
||||
importPolicy: {}
|
||||
name: latest
|
||||
referencePolicy:
|
||||
type: ""
|
||||
@@ -216,7 +194,6 @@ spec:
|
||||
apiVersion: apps.openshift.io/v1
|
||||
kind: DeploymentConfig
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: postgresql
|
||||
name: postgresql
|
||||
@@ -224,11 +201,8 @@ spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
io.kompose.service: postgresql
|
||||
strategy:
|
||||
resources: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: postgresql
|
||||
@@ -253,7 +227,6 @@ spec:
|
||||
port: 8080
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 1
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
test: false
|
||||
triggers:
|
||||
@@ -271,7 +244,6 @@ spec:
|
||||
apiVersion: image.openshift.io/v1
|
||||
kind: ImageStream
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: postgresql
|
||||
name: postgresql
|
||||
@@ -279,12 +251,9 @@ spec:
|
||||
lookupPolicy:
|
||||
local: false
|
||||
tags:
|
||||
- annotations: null
|
||||
from:
|
||||
- from:
|
||||
kind: DockerImage
|
||||
name: postgresql
|
||||
generation: null
|
||||
importPolicy: {}
|
||||
name: latest
|
||||
referencePolicy:
|
||||
type: ""
|
||||
@@ -293,7 +262,6 @@ spec:
|
||||
apiVersion: apps.openshift.io/v1
|
||||
kind: DeploymentConfig
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: redis
|
||||
name: redis
|
||||
@@ -301,11 +269,8 @@ spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
io.kompose.service: redis
|
||||
strategy:
|
||||
resources: {}
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.network/healthcheck-default: "true"
|
||||
io.kompose.service: redis
|
||||
@@ -331,7 +296,6 @@ spec:
|
||||
failureThreshold: 5
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 1
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
test: false
|
||||
triggers:
|
||||
@@ -349,7 +313,6 @@ spec:
|
||||
apiVersion: image.openshift.io/v1
|
||||
kind: ImageStream
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
labels:
|
||||
io.kompose.service: redis
|
||||
name: redis
|
||||
@@ -357,12 +320,9 @@ spec:
|
||||
lookupPolicy:
|
||||
local: false
|
||||
tags:
|
||||
- annotations: null
|
||||
from:
|
||||
- from:
|
||||
kind: DockerImage
|
||||
name: redis
|
||||
generation: null
|
||||
importPolicy: {}
|
||||
name: latest
|
||||
referencePolicy:
|
||||
type: ""
|
||||
|
||||
Reference in New Issue
Block a user