fix: ImageEnricher#mergeEnvVariables causes error for empty env varia…

…bles eclipse-jkube#3220 Signed-off-by: Marco Carletti <[email protected]>
mcarlett · Jul 9, 2024 · 9df0152 · 9df0152
1 parent bad7998
commit 9df0152
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/...-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ImageEnricher.java b/...-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ImageEnricher.java
@@ -284,7 +284,7 @@ private void mergeEnvVariables(Container container) {
                 EnvVar newEnvVar =
                     new EnvVarBuilder()
                         .withName(resourceEnvEntry.getKey())
-                        .withValue(resourceEnvEntry.getValue())
+                        .withValue(Optional.ofNullable(resourceEnvEntry.getValue()).orElse(""))
                         .build();
 
                 EnvVar oldEnvVar = containerEnvVars.stream()

diff --git a/kubernetes-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml
@@ -72,6 +72,7 @@ items:
       spec:
         containers:
         - env:
+          - name: MY_ENV_empty
           - name: MY_ENV_key
             value: MY_ENV_value
           - name: KUBERNETES_NAMESPACE

diff --git a/kubernetes-maven-plugin/it/src/it/env-metadata/pom.xml b/kubernetes-maven-plugin/it/src/it/env-metadata/pom.xml
@@ -51,6 +51,7 @@
         <configuration>
           <resources>
             <env>
+              <MY_ENV_empty></MY_ENV_empty>
               <MY_ENV_key>MY_ENV_value</MY_ENV_key>
               <KUBERNETES_NAMESPACE>this_will_not_be_overridden</KUBERNETES_NAMESPACE>
             </env>