deep-stack/kompose
4
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Removes the TCP output on the Kubernetes / OpenShift artifacts

Browse Source 
If TCP is passed in as the protocol, by default, we add TCP as the
protocol within the Kubernetes or OpenShift artifacts.

By default, TCP is already selected within Kubernetes and thus having
the TCP output is redundant.

This commit checks to see if TCP has already been selected, and if it
has, ignores adding it to the list of ports.

Closes https://github.com/kubernetes-incubator/kompose/issues/392
This commit is contained in:
Charlie Drage
2017-02-01 13:33:49 -05:00
parent a30e05fbae
commit cb6c9e9755
36 changed files with 115 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json
Vendored
+3 -9
View File
@@ -17,7 +17,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -47,13 +46,11 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
},
{
"name": "4000",
"protocol": "TCP",
"port": 4000,
"targetPort": 4000
}
@@ -89,8 +86,7 @@
"image": "redis:3.0",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
@@ -129,12 +125,10 @@
"image": "tuna/docker-counter23",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
},
{
"containerPort": 4000,
"protocol": "TCP"
"containerPort": 4000
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json
Vendored
+2 -6
View File
@@ -20,7 +20,6 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
}
@@ -47,7 +46,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -86,8 +84,7 @@
"image": "tuna/docker-counter23",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
}
],
"resources": {}
@@ -151,8 +148,7 @@
"image": "redis:3.0",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json
Vendored
+3 -9
View File
@@ -17,7 +17,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -47,13 +46,11 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
},
{
"name": "4000",
"protocol": "TCP",
"port": 4000,
"targetPort": 4000
}
@@ -89,8 +86,7 @@
"image": "redis:3.0",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
@@ -129,12 +125,10 @@
"image": "tuna/docker-counter23",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
},
{
"containerPort": 4000,
"protocol": "TCP"
"containerPort": 4000
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json
Vendored
+2 -6
View File
@@ -17,7 +17,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -47,7 +46,6 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
}
@@ -83,8 +81,7 @@
"image": "redis:3.0",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
@@ -123,8 +120,7 @@
"image": "tuna/docker-counter23",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json
Vendored
+3 -9
View File
@@ -20,13 +20,11 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
},
{
"name": "4000",
"protocol": "TCP",
"port": 4000,
"targetPort": 4000
}
@@ -53,7 +51,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -120,12 +117,10 @@
"image": " ",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
},
{
"containerPort": 4000,
"protocol": "TCP"
"containerPort": 4000
}
],
"resources": {}
@@ -235,8 +230,7 @@
"image": " ",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json
Vendored
+2 -6
View File
@@ -17,7 +17,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -47,7 +46,6 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
}
@@ -111,8 +109,7 @@
"image": " ",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
@@ -203,8 +200,7 @@
"image": " ",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json
Vendored
+3 -9
View File
@@ -17,7 +17,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -47,13 +46,11 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
},
{
"name": "4000",
"protocol": "TCP",
"port": 4000,
"targetPort": 4000
}
@@ -117,8 +114,7 @@
"image": " ",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
@@ -209,12 +205,10 @@
"image": " ",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
},
{
"containerPort": 4000,
"protocol": "TCP"
"containerPort": 4000
}
],
"resources": {}
script/test/fixtures/expose-service/provider-files/openshift-expose-true.json
Vendored
+2 -6
View File
@@ -17,7 +17,6 @@
"ports": [
{
"name": "6379",
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
@@ -47,7 +46,6 @@
"ports": [
{
"name": "5000",
"protocol": "TCP",
"port": 5000,
"targetPort": 5000
}
@@ -111,8 +109,7 @@
"image": " ",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
"containerPort": 6379
}
],
"resources": {}
@@ -203,8 +200,7 @@
"image": " ",
"ports": [
{
"containerPort": 5000,
"protocol": "TCP"
"containerPort": 5000
}
],
"resources": {}