Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #771 from cdrage/add-global
Add deploy: mode: global support
- Loading branch information
Showing
8 changed files
with
245 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| version: "3" | ||
|
|
||
| services: | ||
| foo: | ||
| deploy: | ||
| mode: global | ||
| replicas: 6 | ||
| image: redis |
76 changes: 76 additions & 0 deletions
76
script/test/fixtures/v3/output-deploy-mode-k8s-template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| { | ||
| "kind": "List", | ||
| "apiVersion": "v1", | ||
| "metadata": {}, | ||
| "items": [ | ||
| { | ||
| "kind": "Service", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "foo", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "annotations": { | ||
| "kompose.cmd": "%CMD%", | ||
| "kompose.version": "%VERSION%" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "ports": [ | ||
| { | ||
| "name": "headless", | ||
| "port": 55555, | ||
| "targetPort": 0 | ||
| } | ||
| ], | ||
| "selector": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "clusterIP": "None" | ||
| }, | ||
| "status": { | ||
| "loadBalancer": {} | ||
| } | ||
| }, | ||
| { | ||
| "kind": "Deployment", | ||
| "apiVersion": "extensions/v1beta1", | ||
| "metadata": { | ||
| "name": "foo", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "annotations": { | ||
| "kompose.cmd": "%CMD%", | ||
| "kompose.version": "%VERSION%" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "replicas": 1, | ||
| "template": { | ||
| "metadata": { | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "containers": [ | ||
| { | ||
| "name": "foo", | ||
| "image": "redis", | ||
| "resources": {} | ||
| } | ||
| ], | ||
| "restartPolicy": "Always" | ||
| } | ||
| }, | ||
| "strategy": {} | ||
| }, | ||
| "status": {} | ||
| } | ||
| ] | ||
| } |
128 changes: 128 additions & 0 deletions
128
script/test/fixtures/v3/output-deploy-mode-os-template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| { | ||
| "kind": "List", | ||
| "apiVersion": "v1", | ||
| "metadata": {}, | ||
| "items": [ | ||
| { | ||
| "kind": "Service", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "foo", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "annotations": { | ||
| "kompose.cmd": "%CMD%", | ||
| "kompose.version": "%VERSION%" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "ports": [ | ||
| { | ||
| "name": "headless", | ||
| "port": 55555, | ||
| "targetPort": 0 | ||
| } | ||
| ], | ||
| "selector": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "clusterIP": "None" | ||
| }, | ||
| "status": { | ||
| "loadBalancer": {} | ||
| } | ||
| }, | ||
| { | ||
| "kind": "DeploymentConfig", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "foo", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "annotations": { | ||
| "kompose.cmd": "%CMD%", | ||
| "kompose.version": "%VERSION%" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "strategy": { | ||
| "resources": {} | ||
| }, | ||
| "triggers": [ | ||
| { | ||
| "type": "ConfigChange" | ||
| }, | ||
| { | ||
| "type": "ImageChange", | ||
| "imageChangeParams": { | ||
| "automatic": true, | ||
| "containerNames": [ | ||
| "foo" | ||
| ], | ||
| "from": { | ||
| "kind": "ImageStreamTag", | ||
| "name": "foo:latest" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "replicas": 1, | ||
| "test": false, | ||
| "selector": { | ||
| "io.kompose.service": "foo" | ||
| }, | ||
| "template": { | ||
| "metadata": { | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "containers": [ | ||
| { | ||
| "name": "foo", | ||
| "image": " ", | ||
| "resources": {} | ||
| } | ||
| ], | ||
| "restartPolicy": "Always" | ||
| } | ||
| } | ||
| }, | ||
| "status": {} | ||
| }, | ||
| { | ||
| "kind": "ImageStream", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "foo", | ||
| "creationTimestamp": null, | ||
| "labels": { | ||
| "io.kompose.service": "foo" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "tags": [ | ||
| { | ||
| "name": "latest", | ||
| "annotations": null, | ||
| "from": { | ||
| "kind": "DockerImage", | ||
| "name": "redis" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {} | ||
| } | ||
| ] | ||
| }, | ||
| "status": { | ||
| "dockerImageRepository": "" | ||
| } | ||
| } | ||
| ] | ||
| } |