kubernetes
/
kompose
mirror of https://github.com/kubernetes/kompose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add node references (#1123) 

Removes old Kubernetes references to master / slave and converts them to
master / node.
This commit is contained in:
Charlie Drage 2019-06-14 10:43:11 -04:00 committed by GitHub
parent 464fa3332b
commit cd7c8a3d9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -14,10 +14,10 @@ Convert [`docker-compose.yaml`](https://raw.githubusercontent.com/kubernetes/kom
$ kompose convert -f docker-compose.yaml $ kompose convert -f docker-compose.yaml
INFO Kubernetes file "frontend-service.yaml" created INFO Kubernetes file "frontend-service.yaml" created
INFO Kubernetes file "redis-master-service.yaml" created INFO Kubernetes file "redis-master-service.yaml" created
INFO Kubernetes file "redis-slave-service.yaml" created INFO Kubernetes file "redis-node-service.yaml" created
INFO Kubernetes file "frontend-deployment.yaml" created INFO Kubernetes file "frontend-deployment.yaml" created
INFO Kubernetes file "redis-master-deployment.yaml" created INFO Kubernetes file "redis-master-deployment.yaml" created
INFO Kubernetes file "redis-slave-deployment.yaml" created INFO Kubernetes file "redis-node-deployment.yaml" created
``` ```
Other examples are provided in the _examples_ [directory](./examples). Other examples are provided in the _examples_ [directory](./examples).

28
docs/getting-started.md
View File

@ -48,10 +48,10 @@ Run `kompose convert` in the same directory as your `docker-compose.yaml` file.
$ kompose convert $ kompose convert
INFO Kubernetes file "frontend-service.yaml" created INFO Kubernetes file "frontend-service.yaml" created
INFO Kubernetes file "redis-master-service.yaml" created INFO Kubernetes file "redis-master-service.yaml" created
INFO Kubernetes file "redis-slave-service.yaml" created INFO Kubernetes file "redis-node-service.yaml" created
INFO Kubernetes file "frontend-deployment.yaml" created INFO Kubernetes file "frontend-deployment.yaml" created
INFO Kubernetes file "redis-master-deployment.yaml" created INFO Kubernetes file "redis-master-deployment.yaml" created
INFO Kubernetes file "redis-slave-deployment.yaml" created INFO Kubernetes file "redis-node-deployment.yaml" created
``` ```
Alternatively, you can convert and deploy directly to Kubernetes with `kompose up`. Alternatively, you can convert and deploy directly to Kubernetes with `kompose up`.
@ -152,13 +152,13 @@ Run `kompose convert --provider=openshift` in the same directory as your `docker
$ kompose convert --provider=openshift $ kompose convert --provider=openshift
INFO OpenShift file "frontend-service.yaml" created INFO OpenShift file "frontend-service.yaml" created
INFO OpenShift file "redis-master-service.yaml" created INFO OpenShift file "redis-master-service.yaml" created
INFO OpenShift file "redis-slave-service.yaml" created INFO OpenShift file "redis-node-service.yaml" created
INFO OpenShift file "frontend-deploymentconfig.yaml" created INFO OpenShift file "frontend-deploymentconfig.yaml" created
INFO OpenShift file "frontend-imagestream.yaml" created INFO OpenShift file "frontend-imagestream.yaml" created
INFO OpenShift file "redis-master-deploymentconfig.yaml" created INFO OpenShift file "redis-master-deploymentconfig.yaml" created
INFO OpenShift file "redis-master-imagestream.yaml" created INFO OpenShift file "redis-master-imagestream.yaml" created
INFO OpenShift file "redis-slave-deploymentconfig.yaml" created INFO OpenShift file "redis-node-deploymentconfig.yaml" created
INFO OpenShift file "redis-slave-imagestream.yaml" created INFO OpenShift file "redis-node-imagestream.yaml" created
``` ```
Alternatively, you can convert and deploy directly to OpenShift with `kompose up --provider=openshift`. Alternatively, you can convert and deploy directly to OpenShift with `kompose up --provider=openshift`.
@ -171,13 +171,13 @@ If you need different kind of resources, use the 'kompose convert' and 'oc creat
INFO Deploying application in "myproject" namespace INFO Deploying application in "myproject" namespace
INFO Successfully created Service: frontend INFO Successfully created Service: frontend
INFO Successfully created Service: redis-master INFO Successfully created Service: redis-master
INFO Successfully created Service: redis-slave INFO Successfully created Service: redis-node
INFO Successfully created DeploymentConfig: frontend INFO Successfully created DeploymentConfig: frontend
INFO Successfully created ImageStream: frontend INFO Successfully created ImageStream: frontend
INFO Successfully created DeploymentConfig: redis-master INFO Successfully created DeploymentConfig: redis-master
INFO Successfully created ImageStream: redis-master INFO Successfully created ImageStream: redis-master
INFO Successfully created DeploymentConfig: redis-slave INFO Successfully created DeploymentConfig: redis-node
INFO Successfully created ImageStream: redis-slave INFO Successfully created ImageStream: redis-node
Your application has been deployed to OpenShift. You can run 'oc get dc,svc,is,pvc' for details. Your application has been deployed to OpenShift. You can run 'oc get dc,svc,is,pvc' for details.
``` ```
@ -290,13 +290,13 @@ Run `kompose convert --provider=openshift` in the same directory as your `docker
$ kompose convert --provider=openshift $ kompose convert --provider=openshift
INFO OpenShift file "frontend-service.yaml" created INFO OpenShift file "frontend-service.yaml" created
INFO OpenShift file "redis-master-service.yaml" created INFO OpenShift file "redis-master-service.yaml" created
INFO OpenShift file "redis-slave-service.yaml" created INFO OpenShift file "redis-node-service.yaml" created
INFO OpenShift file "frontend-deploymentconfig.yaml" created INFO OpenShift file "frontend-deploymentconfig.yaml" created
INFO OpenShift file "frontend-imagestream.yaml" created INFO OpenShift file "frontend-imagestream.yaml" created
INFO OpenShift file "redis-master-deploymentconfig.yaml" created INFO OpenShift file "redis-master-deploymentconfig.yaml" created
INFO OpenShift file "redis-master-imagestream.yaml" created INFO OpenShift file "redis-master-imagestream.yaml" created
INFO OpenShift file "redis-slave-deploymentconfig.yaml" created INFO OpenShift file "redis-node-deploymentconfig.yaml" created
INFO OpenShift file "redis-slave-imagestream.yaml" created INFO OpenShift file "redis-node-imagestream.yaml" created
``` ```
Alternatively, you can convert and deploy directly to OpenShift with `kompose up --provider=openshift`. Alternatively, you can convert and deploy directly to OpenShift with `kompose up --provider=openshift`.
@ -309,13 +309,13 @@ If you need different kind of resources, use the 'kompose convert' and 'oc creat
INFO Deploying application in "myproject" namespace INFO Deploying application in "myproject" namespace
INFO Successfully created Service: frontend INFO Successfully created Service: frontend
INFO Successfully created Service: redis-master INFO Successfully created Service: redis-master
INFO Successfully created Service: redis-slave INFO Successfully created Service: redis-node
INFO Successfully created DeploymentConfig: frontend INFO Successfully created DeploymentConfig: frontend
INFO Successfully created ImageStream: frontend INFO Successfully created ImageStream: frontend
INFO Successfully created DeploymentConfig: redis-master INFO Successfully created DeploymentConfig: redis-master
INFO Successfully created ImageStream: redis-master INFO Successfully created ImageStream: redis-master
INFO Successfully created DeploymentConfig: redis-slave INFO Successfully created DeploymentConfig: redis-node
INFO Successfully created ImageStream: redis-slave INFO Successfully created ImageStream: redis-node
Your application has been deployed to OpenShift. You can run 'oc get dc,svc,is,pvc' for details. Your application has been deployed to OpenShift. You can run 'oc get dc,svc,is,pvc' for details.
``` ```

2
docs/introduction.md
View File

@ -36,7 +36,7 @@ $ kubectl get po
NAME READY STATUS RESTARTS AGE NAME READY STATUS RESTARTS AGE
frontend-591253677-5t038 1/1 Running 0 10s frontend-591253677-5t038 1/1 Running 0 10s
redis-master-2410703502-9hshf 1/1 Running 0 10s redis-master-2410703502-9hshf 1/1 Running 0 10s
redis-slave-4049176185-hr1lr 1/1 Running 0 10s redis-node-4049176185-hr1lr 1/1 Running 0 10s
``` ```
A more detailed guide is available in our [getting started guide](/docs/getting-started.md). A more detailed guide is available in our [getting started guide](/docs/getting-started.md).

34
docs/user-guide.md
View File

@ -41,18 +41,18 @@ INFO Kubernetes file "frontend-service.yaml" created
INFO Kubernetes file "mlbparks-service.yaml" created INFO Kubernetes file "mlbparks-service.yaml" created
INFO Kubernetes file "mongodb-service.yaml" created INFO Kubernetes file "mongodb-service.yaml" created
INFO Kubernetes file "redis-master-service.yaml" created INFO Kubernetes file "redis-master-service.yaml" created
INFO Kubernetes file "redis-slave-service.yaml" created INFO Kubernetes file "redis-node-service.yaml" created
INFO Kubernetes file "frontend-deployment.yaml" created INFO Kubernetes file "frontend-deployment.yaml" created
INFO Kubernetes file "mlbparks-deployment.yaml" created INFO Kubernetes file "mlbparks-deployment.yaml" created
INFO Kubernetes file "mongodb-deployment.yaml" created INFO Kubernetes file "mongodb-deployment.yaml" created
INFO Kubernetes file "mongodb-claim0-persistentvolumeclaim.yaml" created INFO Kubernetes file "mongodb-claim0-persistentvolumeclaim.yaml" created
INFO Kubernetes file "redis-master-deployment.yaml" created INFO Kubernetes file "redis-master-deployment.yaml" created
INFO Kubernetes file "redis-slave-deployment.yaml" created INFO Kubernetes file "redis-node-deployment.yaml" created
$ ls $ ls
mlbparks-deployment.yaml mongodb-service.yaml redis-slave-service.jsonmlbparks-service.yaml mlbparks-deployment.yaml mongodb-service.yaml redis-node-service.jsonmlbparks-service.yaml
frontend-deployment.yaml mongodb-claim0-persistentvolumeclaim.yaml redis-master-service.yaml frontend-deployment.yaml mongodb-claim0-persistentvolumeclaim.yaml redis-master-service.yaml
frontend-service.yaml mongodb-deployment.yaml redis-slave-deployment.yaml frontend-service.yaml mongodb-deployment.yaml redis-node-deployment.yaml
redis-master-deployment.yaml redis-master-deployment.yaml
``` ```
@ -104,10 +104,10 @@ We are going to create Kubernetes deployments and services for your Dockerized a
If you need different kind of resources, use the 'kompose convert' and 'kubectl create -f' commands instead. If you need different kind of resources, use the 'kompose convert' and 'kubectl create -f' commands instead.
INFO Successfully created service: redis-master INFO Successfully created service: redis-master
INFO Successfully created service: redis-slave INFO Successfully created service: redis-node
INFO Successfully created service: frontend INFO Successfully created service: frontend
INFO Successfully created deployment: redis-master INFO Successfully created deployment: redis-master
INFO Successfully created deployment: redis-slave INFO Successfully created deployment: redis-node
INFO Successfully created deployment: frontend INFO Successfully created deployment: frontend
Your application has been deployed to Kubernetes. You can run 'kubectl get deployment,svc,pods' for details. Your application has been deployed to Kubernetes. You can run 'kubectl get deployment,svc,pods' for details.
@ -116,18 +116,18 @@ $ kubectl get deployment,svc,pods
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
deploy/frontend 1 1 1 1 4m deploy/frontend 1 1 1 1 4m
deploy/redis-master 1 1 1 1 4m deploy/redis-master 1 1 1 1 4m
deploy/redis-slave 1 1 1 1 4m deploy/redis-node 1 1 1 1 4m
NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE
svc/frontend 10.0.174.12 <none> 80/TCP 4m svc/frontend 10.0.174.12 <none> 80/TCP 4m
svc/kubernetes 10.0.0.1 <none> 443/TCP 13d svc/kubernetes 10.0.0.1 <none> 443/TCP 13d
svc/redis-master 10.0.202.43 <none> 6379/TCP 4m svc/redis-master 10.0.202.43 <none> 6379/TCP 4m
svc/redis-slave 10.0.1.85 <none> 6379/TCP 4m svc/redis-node 10.0.1.85 <none> 6379/TCP 4m
NAME READY STATUS RESTARTS AGE NAME READY STATUS RESTARTS AGE
po/frontend-2768218532-cs5t5 1/1 Running 0 4m po/frontend-2768218532-cs5t5 1/1 Running 0 4m
po/redis-master-1432129712-63jn8 1/1 Running 0 4m po/redis-master-1432129712-63jn8 1/1 Running 0 4m
po/redis-slave-2504961300-nve7b 1/1 Running 0 4m po/redis-node-2504961300-nve7b 1/1 Running 0 4m
``` ```
Note: Note:
- You must have a running Kubernetes cluster with a pre-configured kubectl context. - You must have a running Kubernetes cluster with a pre-configured kubectl context.
@ -139,11 +139,11 @@ $ kompose --file ./examples/docker-guestbook.yml --provider openshift up
We are going to create OpenShift DeploymentConfigs and Services for your Dockerized application. We are going to create OpenShift DeploymentConfigs and Services for your Dockerized application.
If you need different kind of resources, use the 'kompose convert' and 'oc create -f' commands instead. If you need different kind of resources, use the 'kompose convert' and 'oc create -f' commands instead.
INFO Successfully created service: redis-slave INFO Successfully created service: redis-node
INFO Successfully created service: frontend INFO Successfully created service: frontend
INFO Successfully created service: redis-master INFO Successfully created service: redis-master
INFO Successfully created deployment: redis-slave INFO Successfully created deployment: redis-node
INFO Successfully created ImageStream: redis-slave INFO Successfully created ImageStream: redis-node
INFO Successfully created deployment: frontend INFO Successfully created deployment: frontend
INFO Successfully created ImageStream: frontend INFO Successfully created ImageStream: frontend
INFO Successfully created deployment: redis-master INFO Successfully created deployment: redis-master
@ -155,15 +155,15 @@ $ oc get dc,svc,is
NAME REVISION DESIRED CURRENT TRIGGERED BY NAME REVISION DESIRED CURRENT TRIGGERED BY
dc/frontend 0 1 0 config,image(frontend:v4) dc/frontend 0 1 0 config,image(frontend:v4)
dc/redis-master 0 1 0 config,image(redis-master:e2e) dc/redis-master 0 1 0 config,image(redis-master:e2e)
dc/redis-slave 0 1 0 config,image(redis-slave:v1) dc/redis-node 0 1 0 config,image(redis-node:v1)
NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE
svc/frontend 172.30.46.64 <none> 80/TCP 8s svc/frontend 172.30.46.64 <none> 80/TCP 8s
svc/redis-master 172.30.144.56 <none> 6379/TCP 8s svc/redis-master 172.30.144.56 <none> 6379/TCP 8s
svc/redis-slave 172.30.75.245 <none> 6379/TCP 8s svc/redis-node 172.30.75.245 <none> 6379/TCP 8s
NAME DOCKER REPO TAGS UPDATED NAME DOCKER REPO TAGS UPDATED
is/frontend 172.30.12.200:5000/fff/frontend is/frontend 172.30.12.200:5000/fff/frontend
is/redis-master 172.30.12.200:5000/fff/redis-master is/redis-master 172.30.12.200:5000/fff/redis-master
is/redis-slave 172.30.12.200:5000/fff/redis-slave v1 is/redis-node 172.30.12.200:5000/fff/redis-node v1
``` ```
Note: Note:
@ -177,8 +177,8 @@ Once you have deployed "composed" application to Kubernetes, `$ kompose down` wi
$ kompose --file docker-guestbook.yml down $ kompose --file docker-guestbook.yml down
INFO Successfully deleted service: redis-master INFO Successfully deleted service: redis-master
INFO Successfully deleted deployment: redis-master INFO Successfully deleted deployment: redis-master
INFO Successfully deleted service: redis-slave INFO Successfully deleted service: redis-node
INFO Successfully deleted deployment: redis-slave INFO Successfully deleted deployment: redis-node
INFO Successfully deleted service: frontend INFO Successfully deleted service: frontend
INFO Successfully deleted deployment: frontend INFO Successfully deleted deployment: frontend
``` ```

2
examples/docker-compose-v3.yaml
View File

@ -7,7 +7,7 @@ services:
ports: ports:
- "6379" - "6379"
redis-slave: redis-node:
image: gcr.io/google_samples/gb-redisslave:v1 image: gcr.io/google_samples/gb-redisslave:v1
ports: ports:
- "6379" - "6379"

2
examples/docker-compose.yaml
View File

@ -7,7 +7,7 @@ services:
ports: ports:
- "6379" - "6379"
redis-slave: redis-node:
image: gcr.io/google_samples/gb-redisslave:v1 image: gcr.io/google_samples/gb-redisslave:v1
ports: ports:
- "6379" - "6379"

2
script/test/fixtures/controller/docker-compose.yml vendored
View File

@ -7,7 +7,7 @@ services:
ports: ports:
- "6379" - "6379"
redis-slave: redis-node:
image: gcr.io/google_samples/gb-redisslave:v1 image: gcr.io/google_samples/gb-redisslave:v1
ports: ports:
- "6379" - "6379"

14
script/test/fixtures/controller/output-k8s-daemonset-template.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -197,10 +197,10 @@
"kind": "DaemonSet", "kind": "DaemonSet",
"apiVersion": "extensions/v1beta1", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -212,13 +212,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

14
script/test/fixtures/controller/output-k8s-deployment-template.json vendored
View File

@ -70,10 +70,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -89,7 +89,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -193,10 +193,10 @@
"kind": "Deployment", "kind": "Deployment",
"apiVersion": "extensions/v1beta1", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -209,13 +209,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

14
script/test/fixtures/controller/output-k8s-rc-template.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -194,10 +194,10 @@
"kind": "ReplicationController", "kind": "ReplicationController",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -210,13 +210,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

14
script/test/fixtures/examples/output-k8s.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -192,10 +192,10 @@
"kind": "Deployment", "kind": "Deployment",
"apiVersion": "extensions/v1beta1", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -208,13 +208,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

24
script/test/fixtures/examples/output-os.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -296,10 +296,10 @@
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -319,11 +319,11 @@
"imageChangeParams": { "imageChangeParams": {
"automatic": true, "automatic": true,
"containerNames": [ "containerNames": [
"redis-slave" "redis-node"
], ],
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "redis-slave:v1" "name": "redis-node:v1"
} }
} }
} }
@ -331,19 +331,19 @@
"replicas": 1, "replicas": 1,
"test": false, "test": false,
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"template": { "template": {
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": " ", "image": " ",
"ports": [ "ports": [
{ {
@ -369,10 +369,10 @@
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {

14
script/test/fixtures/examples/output-v3-k8s.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -192,10 +192,10 @@
"kind": "Deployment", "kind": "Deployment",
"apiVersion": "extensions/v1beta1", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -208,13 +208,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

24
script/test/fixtures/examples/output-v3-os.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -296,10 +296,10 @@
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -319,11 +319,11 @@
"imageChangeParams": { "imageChangeParams": {
"automatic": true, "automatic": true,
"containerNames": [ "containerNames": [
"redis-slave" "redis-node"
], ],
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "redis-slave:v1" "name": "redis-node:v1"
} }
} }
} }
@ -331,19 +331,19 @@
"replicas": 1, "replicas": 1,
"test": false, "test": false,
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"template": { "template": {
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": " ", "image": " ",
"ports": [ "ports": [
{ {
@ -369,10 +369,10 @@
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {

2
script/test/fixtures/keyonly-envs/env.yml vendored
View File

@ -5,7 +5,7 @@ services:
image: k8s.gcr.io/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"
redis-slave: redis-node:
image: gcr.io/google_samples/gb-redisslave:v1 image: gcr.io/google_samples/gb-redisslave:v1
ports: ports:
- "6379" - "6379"

14
script/test/fixtures/keyonly-envs/output-k8s-template.json vendored
View File

@ -67,10 +67,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -86,7 +86,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -201,10 +201,10 @@
"kind": "Deployment", "kind": "Deployment",
"apiVersion": "extensions/v1beta1", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -217,13 +217,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

2
script/test/fixtures/v3/docker-compose.yaml vendored
View File

@ -7,7 +7,7 @@ services:
ports: ports:
- "6379" - "6379"
redis-slave: redis-node:
image: gcr.io/google_samples/gb-redisslave:v1 image: gcr.io/google_samples/gb-redisslave:v1
ports: ports:
- "6379" - "6379"

14
script/test/fixtures/v3/output-k8s-template.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -192,10 +192,10 @@
"kind": "Deployment", "kind": "Deployment",
"apiVersion": "extensions/v1beta1", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -208,13 +208,13 @@
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1", "image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [ "ports": [
{ {

24
script/test/fixtures/v3/output-os-template.json vendored
View File

@ -69,10 +69,10 @@
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -88,7 +88,7 @@
} }
], ],
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"status": { "status": {
@ -296,10 +296,10 @@
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"annotations": { "annotations": {
"kompose.cmd": "%CMD%", "kompose.cmd": "%CMD%",
@ -319,11 +319,11 @@
"imageChangeParams": { "imageChangeParams": {
"automatic": true, "automatic": true,
"containerNames": [ "containerNames": [
"redis-slave" "redis-node"
], ],
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "redis-slave:v1" "name": "redis-node:v1"
} }
} }
} }
@ -331,19 +331,19 @@
"replicas": 1, "replicas": 1,
"test": false, "test": false,
"selector": { "selector": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
}, },
"template": { "template": {
"metadata": { "metadata": {
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "redis-slave", "name": "redis-node",
"image": " ", "image": " ",
"ports": [ "ports": [
{ {
@ -369,10 +369,10 @@
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-slave", "name": "redis-node",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
"io.kompose.service": "redis-slave" "io.kompose.service": "redis-node"
} }
}, },
"spec": { "spec": {