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

Remove duplicate of configmap (#1206)

Browse Source 
* also change the name of the generated cm
This commit is contained in:
Hang Yan
2019-12-26 08:53:41 +08:00
committed by GitHub
parent 4cbe106351
commit 73ec0abab2
7 changed files with 231 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/configmap/output-k8s-template.json
Vendored
+5 -5
View File
@@ -79,7 +79,7 @@
"name": "ALLOW_EMPTY_PASSWORD",
"valueFrom": {
"configMapKeyRef": {
"name": "redis-foo-env",
"name": "foo-env",
"key": "ALLOW_EMPTY_PASSWORD"
}
}
@@ -88,7 +88,7 @@
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"name": "redis-bar-env",
"name": "bar-env",
"key": "BAR"
}
}
@@ -97,7 +97,7 @@
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"name": "redis-bar-env",
"name": "bar-env",
"key": "FOO"
}
}
@@ -117,7 +117,7 @@
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "redis-foo-env",
"name": "foo-env",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-foo-env"
@@ -131,7 +131,7 @@
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "redis-bar-env",
"name": "bar-env",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-bar-env"
script/test/fixtures/env/docker-compose.yml
Vendored
+5 -1
View File
@@ -10,4 +10,8 @@ services:
- ./hadoop-hive-namenode.env
ports:
- "50070:50070"
- "8020:8020"
- "8020:8020"
another-namenode:
image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8
env_file:
- ./hadoop-hive-namenode.env
script/test/fixtures/env/output-k8s.json
Vendored
+79 -17
View File
@@ -38,6 +38,83 @@
"loadBalancer": {}
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "another-namenode",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "another-namenode"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "another-namenode"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"name": "another-namenode",
"image": "bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8",
"env": [
{
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"name": "hadoop-hive-namenode-env",
"key": "BAR"
}
}
},
{
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"name": "hadoop-hive-namenode-env",
"key": "FOO"
}
}
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
},
{
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "hadoop-hive-namenode-env",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "another-namenode-hadoop-hive-namenode-env"
}
},
"data": {
"BAR": "FOO",
"FOO": "BAR"
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
@@ -91,7 +168,7 @@
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"name": "namenode-hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "BAR"
}
}
@@ -104,7 +181,7 @@
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"name": "namenode-hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "FOO"
}
}
@@ -128,21 +205,6 @@
},
"status": {}
},
{
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "namenode-hadoop-hive-namenode-env",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "namenode-hadoop-hive-namenode-env"
}
},
"data": {
"BAR": "FOO",
"FOO": "BAR"
}
},
{
"kind": "PersistentVolumeClaim",
"apiVersion": "v1",
script/test/fixtures/env/output-os.json
Vendored
+114 -4
View File
@@ -42,10 +42,10 @@
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "namenode-hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "namenode-hadoop-hive-namenode-env"
"io.kompose.service": "another-namenode-hadoop-hive-namenode-env"
}
},
"data": {
@@ -53,6 +53,116 @@
"FOO": "BAR"
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "another-namenode",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "another-namenode"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"another-namenode"
],
"from": {
"kind": "ImageStreamTag",
"name": "another-namenode:2.0.0-hadoop2.7.4-java8"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "another-namenode"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "another-namenode"
}
},
"spec": {
"containers": [
{
"name": "another-namenode",
"image": " ",
"env": [
{
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"name": "hadoop-hive-namenode-env",
"key": "BAR"
}
}
},
{
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"name": "hadoop-hive-namenode-env",
"key": "FOO"
}
}
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "another-namenode",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "another-namenode"
}
},
"spec": {
"tags": [
{
"name": "2.0.0-hadoop2.7.4-java8",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
@@ -128,7 +238,7 @@
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"name": "namenode-hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "BAR"
}
}
@@ -141,7 +251,7 @@
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"name": "namenode-hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "FOO"
}
}