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

Fix ConfigMap name clash if env_file name is equal (#2001)

Browse Source 
* Fix ConfigMap name clash if env_file name is equal #2000

* Generate envFrom instead of single env entries from env_file entries #1999

* Fix failing test fixture outputs
This commit is contained in:
robertaistleitner
2025-04-15 11:39:45 -04:00
committed by GitHub
parent 1c8109e980
commit 1b29e031e3
8 changed files with 45 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/configmap-pod/output-k8s.yaml
Vendored
+5 -16
View File
@@ -23,22 +23,11 @@ metadata:
name: redis
spec:
containers:
- env:
- name: ALLOW_EMPTY_PASSWORD
valueFrom:
configMapKeyRef:
key: ALLOW_EMPTY_PASSWORD
name: foo-env
- name: BAR
valueFrom:
configMapKeyRef:
key: BAR
name: bar-env
- name: FOO
valueFrom:
configMapKeyRef:
key: FOO
name: bar-env
- envFrom:
- configMapRef:
name: foo-env
- configMapRef:
name: bar-env
image: bitnami/redis:latest
name: redis
ports:
script/test/fixtures/configmap-pod/output-os.yaml
Vendored
+5 -16
View File
@@ -23,22 +23,11 @@ metadata:
name: redis
spec:
containers:
- env:
- name: ALLOW_EMPTY_PASSWORD
valueFrom:
configMapKeyRef:
key: ALLOW_EMPTY_PASSWORD
name: foo-env
- name: BAR
valueFrom:
configMapKeyRef:
key: BAR
name: bar-env
- name: FOO
valueFrom:
configMapKeyRef:
key: FOO
name: bar-env
- envFrom:
- configMapRef:
name: foo-env
- configMapRef:
name: bar-env
image: bitnami/redis:latest
name: redis
ports:
script/test/fixtures/env/output-k8s.yaml
Vendored
+6 -23
View File
@@ -52,17 +52,9 @@ spec:
io.kompose.service: another-namenode
spec:
containers:
- env:
- name: BAR
valueFrom:
configMapKeyRef:
key: BAR
name: hadoop-hive-namenode-env
- name: FOO
valueFrom:
configMapKeyRef:
key: FOO
name: hadoop-hive-namenode-env
- envFrom:
- configMapRef:
name: hadoop-hive-namenode-env
image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8
name: another-namenode
ports:
@@ -72,7 +64,6 @@ spec:
protocol: TCP
restartPolicy: Always
---
apiVersion: v1
data:
@@ -103,18 +94,11 @@ spec:
spec:
containers:
- env:
- name: BAR
valueFrom:
configMapKeyRef:
key: BAR
name: hadoop-hive-namenode-env
- name: CLUSTER_NAME
value: test
- name: FOO
valueFrom:
configMapKeyRef:
key: FOO
name: hadoop-hive-namenode-env
envFrom:
- configMapRef:
name: hadoop-hive-namenode-env
image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8
name: namenode
ports:
@@ -124,4 +108,3 @@ spec:
protocol: TCP
restartPolicy: Always
script/test/fixtures/env/output-os.yaml
Vendored
+6 -21
View File
@@ -62,17 +62,9 @@ spec:
io.kompose.service: another-namenode
spec:
containers:
- env:
- name: BAR
valueFrom:
configMapKeyRef:
key: BAR
name: hadoop-hive-namenode-env
- name: FOO
valueFrom:
configMapKeyRef:
key: FOO
name: hadoop-hive-namenode-env
- envFrom:
- configMapRef:
name: hadoop-hive-namenode-env
image: ' '
name: another-namenode
ports:
@@ -129,18 +121,11 @@ spec:
spec:
containers:
- env:
- name: BAR
valueFrom:
configMapKeyRef:
key: BAR
name: hadoop-hive-namenode-env
- name: CLUSTER_NAME
value: test
- name: FOO
valueFrom:
configMapKeyRef:
key: FOO
name: hadoop-hive-namenode-env
envFrom:
- configMapRef:
name: hadoop-hive-namenode-env
image: ' '
name: namenode
ports: