LaconicNetwork/kompose
7
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into kompose_labels_test

Browse Source
This commit is contained in:
Anush Shetty
2017-05-25 12:19:02 +05:30
parent d2ad889367 93f5c0103c
commit 5f34c7368c
126 changed files with 2769 additions and 1944 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/cmd/tests.sh
+17 -7
View File
@@ -20,15 +20,13 @@ source $KOMPOSE_ROOT/script/test/cmd/lib.sh
# Get current branch and remote url of git repository
branch=$(git branch | grep \* | cut -d ' ' -f2-)
uri=$(git remote get-url origin)
uri=$(git config --get remote.origin.url)
if [[ $uri != *".git"* ]]; then
uri="${uri}.git"
fi
# Warning Template
warning="Buildconfig using $uri::$branch as source."
# Replacing variables with current branch and uri
sed -e "s;%URI%;$uri;g" -e "s;%REF%;$branch;g" $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-os-template.json > /tmp/output-os.json
#######
# Tests related to docker-compose file in /script/test/fixtures/etherpad
@@ -58,11 +56,15 @@ unset $(cat $KOMPOSE_ROOT/script/test/fixtures/gitlab/envs | cut -d'=' -f1)
# kubernetes test
convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-k8s.json" "Kubernetes provider doesn't support build key - ignoring"
# openshift test
# Replacing variables with current branch and uri
sed -e "s;%URI%;$uri;g" -e "s;%REF%;$branch;g" $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-os-template.json > /tmp/output-os.json
convert::expect_success_and_warning "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/docker-compose.yml convert --stdout -j" "/tmp/output-os.json" "$warning"
rm /tmp/output-os.json
######
# Tests related to docker-compose file in /script/test/fixtures/entrypoint-command
# kubernetes test
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-k8s.json"
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-k8s.json"
# openshift test
convert::expect_success "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-os.json"
@@ -209,6 +211,8 @@ convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixture
####
# Test regarding build context (running kompose from various directories)
# Replacing variables with current branch and uri
sed -e "s;%URI%;$uri;g" -e "s;%REF%;$branch;g" $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-os-template.json > /tmp/output-os.json
CURRENT_DIR=$(pwd)
cd "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/"
convert::expect_success_and_warning "kompose convert --provider openshift --stdout -j" "/tmp/output-os.json" "$warning"
@@ -217,6 +221,15 @@ convert::expect_success_and_warning "kompose convert --provider openshift --stdo
cd "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/node"
convert::expect_success_and_warning "kompose convert --provider openshift --stdout -j -f ../docker-compose.yml" "/tmp/output-os.json" "$warning"
cd $CURRENT_DIR
rm /tmp/output-os.json
# Test the presence of build args in buildconfig
# Replacing variables with current branch and uri
sed -e "s;%URI%;$uri;g" -e "s;%REF%;$branch;g" $KOMPOSE_ROOT/script/test/fixtures/buildargs/output-os-template.json > /tmp/output-buildarg-os.json
export $(cat $KOMPOSE_ROOT/script/test/fixtures/buildargs/envs)
convert::expect_success_and_warning "kompose --provider openshift -f $KOMPOSE_ROOT/script/test/fixtures/buildargs/docker-compose.yml convert --stdout -j" "/tmp/output-buildarg-os.json" "$warning"
rm /tmp/output-buildarg-os.json
# Test related to support docker-compose.yaml beside docker-compose.yml
# Store the original path
@@ -234,7 +247,4 @@ convert::expect_success "kompose --provider=openshift convert --stdout -j" "$KOM
# Return back to the original path
cd $CURRENT_DIR
# Removes generated output
rm -rf /tmp/output-os.json
exit $EXIT_STATUS
script/test/fixtures/buildargs/README.md
Vendored
+11
View File
@@ -0,0 +1,11 @@
## Docker Compose Buildargs
### Usage
The simplest thing to do:
```bash
export $(cat envs)
```
To customize the values edit `envs` file.
script/test/fixtures/buildargs/build/Dockerfile
Vendored
+2
View File
@@ -0,0 +1,2 @@
FROM busybox
RUN touch /test
script/test/fixtures/buildargs/docker-compose.yml
Vendored
+16
View File
@@ -0,0 +1,16 @@
version: "2"
services:
foo:
build:
context: "./build"
args:
NAME: web
command: "sleep 3600"
foo1:
build:
context: "./build"
args:
- NAME=web
- foo
command: "sleep 3600"
script/test/fixtures/buildargs/envs
Vendored
+1
View File
@@ -0,0 +1 @@
foo=bar
script/test/fixtures/buildargs/output-os-template.json
Vendored
+325
View File
@@ -0,0 +1,325 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "foo1",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {
"ports": [
{
"name": "headless",
"port": 55555,
"targetPort": 0
}
],
"selector": {
"io.kompose.service": "foo1"
},
"clusterIP": "None"
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"ports": [
{
"name": "headless",
"port": 55555,
"targetPort": 0
}
],
"selector": {
"io.kompose.service": "foo"
},
"clusterIP": "None"
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "foo1",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"foo1"
],
"from": {
"kind": "ImageStreamTag",
"name": "foo1:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "foo1"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {
"containers": [
{
"name": "foo1",
"image": " ",
"args": [
"sleep",
"3600"
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "foo1",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "foo1",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "%URI%",
"ref": "%REF%"
},
"contextDir": "script/test/fixtures/buildargs/build/"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {
"env": [
{
"name": "NAME",
"value": "web"
},
{
"name": "foo",
"value": "bar"
}
]
}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "foo1:latest"
}
},
"resources": {},
"postCommit": {},
"nodeSelector": null
},
"status": {
"lastVersion": 0
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"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": " ",
"args": [
"sleep",
"3600"
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "%URI%",
"ref": "%REF%"
},
"contextDir": "script/test/fixtures/buildargs/build/"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {
"env": [
{
"name": "NAME",
"value": "web"
}
]
}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "foo:latest"
}
},
"resources": {},
"postCommit": {},
"nodeSelector": null
},
"status": {
"lastVersion": 0
}
}
]
}
script/test/fixtures/bundles/dab/output-k8s.json
Vendored
+8 -2
View File
@@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/bundles/dsb/output-k8s.json
Vendored
+18 -3
View File
@@ -146,6 +146,9 @@
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"com.example.description": "Postgres Database"
}
@@ -184,7 +187,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -220,7 +226,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "result",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "result"
}
},
"spec": {
"replicas": 1,
@@ -257,6 +266,9 @@
"metadata": {
"name": "vote",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "vote"
},
"annotations": {
"com.example.description": "Vote"
}
@@ -295,7 +307,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "worker",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/entrypoint-command/output-k8s.json
Vendored
+4 -1
View File
@@ -35,7 +35,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "base",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "base"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/envvars-separators/output-k8s.json
Vendored
+52 -13
View File
@@ -356,7 +356,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-api",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-api"
}
},
"spec": {
"replicas": 1,
@@ -430,7 +433,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-bitbucket-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-bitbucket-scm-collector"
}
},
"spec": {
"replicas": 1,
@@ -499,7 +505,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-chat-ops-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-chat-ops-collector"
}
},
"spec": {
"replicas": 1,
@@ -568,7 +577,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-github-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-github-scm-collector"
}
},
"spec": {
"replicas": 1,
@@ -637,7 +649,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jenkins-build-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-build-collector"
}
},
"spec": {
"replicas": 1,
@@ -706,7 +721,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jenkins-cucumber-test-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-cucumber-test-collector"
}
},
"spec": {
"replicas": 1,
@@ -775,7 +793,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jira-feature-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jira-feature-collector"
}
},
"spec": {
"replicas": 1,
@@ -854,7 +875,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-sonar-codequality-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-sonar-codequality-collector"
}
},
"spec": {
"replicas": 1,
@@ -923,7 +947,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-subversion-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-subversion-scm-collector"
}
},
"spec": {
"replicas": 1,
@@ -992,7 +1019,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-udeploy-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-udeploy-collector"
}
},
"spec": {
"replicas": 1,
@@ -1075,7 +1105,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-ui",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-ui"
}
},
"spec": {
"replicas": 1,
@@ -1111,7 +1144,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-versionone-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-versionone-collector"
}
},
"spec": {
"replicas": 1,
@@ -1180,7 +1216,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mongodb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mongodb"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/etherpad/output-k8s.json
Vendored
+8 -2
View File
@@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
}
},
"spec": {
"replicas": 1,
@@ -118,7 +121,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json
Vendored
+7 -1
View File
@@ -68,7 +68,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -105,6 +108,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "batman.example.com"
}
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json
Vendored
+7 -1
View File
@@ -63,7 +63,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -100,6 +103,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "batman.example.com"
}
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json
Vendored
+7 -1
View File
@@ -68,7 +68,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -105,6 +108,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True"
}
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json
Vendored
+7 -1
View File
@@ -63,7 +63,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -100,6 +103,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True"
}
script/test/fixtures/gitlab/output-k8s.json
Vendored
+12 -3
View File
@@ -96,7 +96,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "gitlab",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "gitlab"
}
},
"spec": {
"replicas": 1,
@@ -172,7 +175,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "postgresql",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "postgresql"
}
},
"spec": {
"replicas": 1,
@@ -222,7 +228,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/keyonly-envs/output-k8s.json
Vendored
+12 -3
View File
@@ -86,7 +86,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "frontend",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
}
},
"spec": {
"replicas": 1,
@@ -140,7 +143,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-master",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
}
},
"spec": {
"replicas": 1,
@@ -176,7 +182,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/mem-limit/output-k8s.json
Vendored
+4 -1
View File
@@ -40,7 +40,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/mem-limit/output-mb-k8s.json
Vendored
+4 -1
View File
@@ -40,7 +40,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/multiple-compose-files/output-k8s.json
Vendored
+8 -2
View File
@@ -70,7 +70,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
}
},
"spec": {
"replicas": 1,
@@ -131,7 +134,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/nginx-node-redis/output-k8s.json
Vendored
+20 -5
View File
@@ -138,7 +138,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"replicas": 1,
@@ -173,7 +176,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"replicas": 1,
@@ -208,7 +214,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"replicas": 1,
@@ -243,7 +252,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"replicas": 1,
@@ -278,7 +290,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/nginx-node-redis/output-os-template.json
Vendored
+17 -5
View File
@@ -216,7 +216,10 @@
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"triggers": [
@@ -337,7 +340,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"triggers": [
@@ -458,7 +464,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"triggers": [
@@ -579,7 +588,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"triggers": [
@@ -709,4 +721,4 @@
}
}
]
}
}
script/test/fixtures/ports-with-ip/output-k8s.json
Vendored
+8 -2
View File
@@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -106,7 +109,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/ports-with-proto/output-k8s.json
Vendored
+8 -2
View File
@@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -106,7 +109,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/service-name-change/output-k8s.json
Vendored
+8 -2
View File
@@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,
@@ -149,7 +152,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/stdin-true/output-k8s.json
Vendored
+4 -1
View File
@@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/tty-true/output-k8s.json
Vendored
+4 -1
View File
@@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json
Vendored
+4 -1
View File
@@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "httpd",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/volume-mounts/volumes-from/output-k8s.json
Vendored
+8 -2
View File
@@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"replicas": 1,
@@ -144,7 +147,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/yaml-and-yml/output-k8s.json
Vendored
+8 -2
View File
@@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,
script/test/fixtures/yaml-and-yml/yml/output-k8s.json
Vendored
+8 -2
View File
@@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,