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

Add node references (#1123)

Browse Source 
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
19 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/controller/docker-compose.yml
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ services:
ports:
- "6379"
redis-slave:
redis-node:
image: gcr.io/google_samples/gb-redisslave:v1
ports:
- "6379"
script/test/fixtures/controller/output-k8s-daemonset-template.json
Vendored
+7 -7
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -197,10 +197,10 @@
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -212,13 +212,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/controller/output-k8s-deployment-template.json
Vendored
+7 -7
View File
@@ -70,10 +70,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -89,7 +89,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -193,10 +193,10 @@
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -209,13 +209,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/controller/output-k8s-rc-template.json
Vendored
+7 -7
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -194,10 +194,10 @@
"kind": "ReplicationController",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -210,13 +210,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/examples/output-k8s.json
Vendored
+7 -7
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -192,10 +192,10 @@
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -208,13 +208,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/examples/output-os.json
Vendored
+12 -12
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -296,10 +296,10 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -319,11 +319,11 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"redis-slave"
"redis-node"
],
"from": {
"kind": "ImageStreamTag",
"name": "redis-slave:v1"
"name": "redis-node:v1"
}
}
}
@@ -331,19 +331,19 @@
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": " ",
"ports": [
{
@@ -369,10 +369,10 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
script/test/fixtures/examples/output-v3-k8s.json
Vendored
+7 -7
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -192,10 +192,10 @@
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -208,13 +208,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/examples/output-v3-os.json
Vendored
+12 -12
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -296,10 +296,10 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -319,11 +319,11 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"redis-slave"
"redis-node"
],
"from": {
"kind": "ImageStreamTag",
"name": "redis-slave:v1"
"name": "redis-node:v1"
}
}
}
@@ -331,19 +331,19 @@
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": " ",
"ports": [
{
@@ -369,10 +369,10 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
script/test/fixtures/keyonly-envs/env.yml
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ services:
image: k8s.gcr.io/redis:e2e
ports:
- "6379"
redis-slave:
redis-node:
image: gcr.io/google_samples/gb-redisslave:v1
ports:
- "6379"
script/test/fixtures/keyonly-envs/output-k8s-template.json
Vendored
+7 -7
View File
@@ -67,10 +67,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -86,7 +86,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -201,10 +201,10 @@
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -217,13 +217,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/v3/docker-compose.yaml
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ services:
ports:
- "6379"
redis-slave:
redis-node:
image: gcr.io/google_samples/gb-redisslave:v1
ports:
- "6379"
script/test/fixtures/v3/output-k8s-template.json
Vendored
+7 -7
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -192,10 +192,10 @@
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -208,13 +208,13 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
script/test/fixtures/v3/output-os-template.json
Vendored
+12 -12
View File
@@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"status": {
@@ -296,10 +296,10 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"annotations": {
"kompose.cmd": "%CMD%",
@@ -319,11 +319,11 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"redis-slave"
"redis-node"
],
"from": {
"kind": "ImageStreamTag",
"name": "redis-slave:v1"
"name": "redis-node:v1"
}
}
}
@@ -331,19 +331,19 @@
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-node",
"image": " ",
"ports": [
{
@@ -369,10 +369,10 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-node",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-node"
}
},
"spec": {