Merge pull request quarkusio#10926 from geoand/quarkusio#10925

Make sure that minikube manifests have all env vars
ia3andy · Jul 23, 2020 · 7fc6af5 · 7fc6af5
2 parents d5fa09d + 9d45d37
commit 7fc6af5
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 2 deletions.
diff --git a/...nsions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItem.java b/...nsions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItem.java
@@ -185,6 +185,11 @@ public String getTarget() {
         return target;
     }
 
+    public KubernetesEnvBuildItem newWithTarget(String newTarget) {
+        return new KubernetesEnvBuildItem(this.name, this.value, this.configmap, this.secret, this.field, this.type, newTarget,
+                this.oldStyle);
+    }
+
     public String toString() {
         switch (type) {
             case var:

diff --git a/...anilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/...anilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java
@@ -39,7 +39,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -246,7 +245,12 @@ public void createLabels(KubernetesConfig kubernetesConfig, OpenshiftConfig open
     @BuildStep
     public List<KubernetesEnvBuildItem> createEnv(KubernetesConfig kubernetesConfig, OpenshiftConfig openshiftConfig,
             KnativeConfig knativeConfig) {
-        List<KubernetesEnvBuildItem> items = new LinkedList<>(kubernetesConfig.convertToBuildItems());
+
+        Collection<KubernetesEnvBuildItem> kubernetesEnvBuildItems = kubernetesConfig.convertToBuildItems();
+        List<KubernetesEnvBuildItem> items = new ArrayList<>(kubernetesEnvBuildItems);
+        for (KubernetesEnvBuildItem kubernetesEnvBuildItem : kubernetesEnvBuildItems) {
+            items.add(kubernetesEnvBuildItem.newWithTarget(MINIKUBE));
+        }
         items.addAll(openshiftConfig.convertToBuildItems());
         items.addAll(knativeConfig.convertToBuildItems());
         return items;

diff --git a/...us-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java b/...us-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java
@@ -0,0 +1,73 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.EnvFromSource;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class MinikubeWithMixedStyleEnvTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("minikube-with-mixed-style-env")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("minikube-with-mixed-style-env.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("minikube.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("minikube.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("minikube.yml"));
+
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+            assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
+                assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                    assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                        assertThat(t.getSpec()).satisfies(podSpec -> {
+                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                                assertThat(container.getEnv())
+                                        .filteredOn(env -> "FROMFIELD".equals(env.getName()))
+                                        .hasOnlyOneElementSatisfying(
+                                                env -> assertThat(env.getValueFrom().getFieldRef().getFieldPath())
+                                                        .isEqualTo("metadata.name"));
+                                assertThat(container.getEnv())
+                                        .filteredOn(env -> "ENVVAR".equals(env.getName()))
+                                        .hasOnlyOneElementSatisfying(env -> assertThat(env.getValue()).isEqualTo("value"));
+                                final List<EnvFromSource> envFrom = container.getEnvFrom();
+                                assertThat(envFrom).hasSize(2);
+                                assertThat(envFrom)
+                                        .filteredOn(e -> e.getSecretRef() != null)
+                                        .hasOnlyOneElementSatisfying(
+                                                e -> assertThat(e.getSecretRef().getName()).isEqualTo("secretName"));
+                                assertThat(envFrom)
+                                        .filteredOn(e -> e.getConfigMapRef() != null)
+                                        .hasOnlyOneElementSatisfying(
+                                                e -> assertThat(e.getConfigMapRef().getName()).isEqualTo("configName"));
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/...bernetes/quarkus-standard-way/src/test/resources/minikube-with-mixed-style-env.properties b/...bernetes/quarkus-standard-way/src/test/resources/minikube-with-mixed-style-env.properties
@@ -0,0 +1,7 @@
+quarkus.kubernetes.deployment-target=minikube
+quarkus.kubernetes.env-vars.envvar.value=value
+quarkus.kubernetes.env-vars.my-name.secret=secretName
+quarkus.kubernetes.env.fields.fromfield=metadata.name
+quarkus.kubernetes.env.configmaps=configName
+
+