Merge pull request #10550 from geoand/#10167

Add labels and annotation to minikube manifests
quarkusio · Jul 8, 2020 · a745df1 · a745df1
2 parents 6b5b582 + 6baafc9
commit a745df1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
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
@@ -184,6 +184,7 @@ public List<KubernetesAnnotationBuildItem> createAnnotations(KubernetesConfig ku
             Optional<MetricsConfigurationBuildItem> metricsConfiguration, List<KubernetesPortBuildItem> kubernetesPorts) {
         List<KubernetesAnnotationBuildItem> result = new ArrayList<KubernetesAnnotationBuildItem>();
         addAnnotations(kubernetesConfig, KUBERNETES, metricsConfiguration, kubernetesPorts, result);
+        addAnnotations(kubernetesConfig, MINIKUBE, metricsConfiguration, kubernetesPorts, result);
         addAnnotations(openshiftConfig, OPENSHIFT, metricsConfiguration, kubernetesPorts, result);
         addAnnotations(knativeConfig, KNATIVE, metricsConfiguration, kubernetesPorts, result);
         return result;
@@ -211,6 +212,7 @@ public void createLabels(KubernetesConfig kubernetesConfig, OpenshiftConfig open
             BuildProducer<ContainerImageLabelBuildItem> containerImageLabelsProducer) {
         kubernetesConfig.labels.forEach((k, v) -> {
             kubernetesLabelsProducer.produce(new KubernetesLabelBuildItem(k, v, KUBERNETES));
+            kubernetesLabelsProducer.produce(new KubernetesLabelBuildItem(k, v, MINIKUBE));
             containerImageLabelsProducer.produce(new ContainerImageLabelBuildItem(k, v));
         });
         openshiftConfig.labels.forEach((k, v) -> {

diff --git a/...ard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java b/...ard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java
@@ -1,6 +1,7 @@
 package io.quarkus.it.kubernetes;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
@@ -42,6 +43,11 @@ public void assertGeneratedResources() throws IOException {
 
         assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
+                assertThat(d.getMetadata()).satisfies(m -> {
+                    assertThat(m.getName()).isEqualTo("minikube-with-application-properties");
+                    assertThat(m.getLabels()).contains(entry("foo", "bar"));
+                    assertThat(m.getAnnotations()).contains(entry("bar", "baz"));
+                });
 
                 assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(1);

diff --git a/...s/kubernetes/quarkus-standard-way/src/test/resources/minikube-with-application.properties b/...s/kubernetes/quarkus-standard-way/src/test/resources/minikube-with-application.properties
@@ -1,3 +1,5 @@
 quarkus.kubernetes.deployment-target=minikube
 quarkus.http.port=9090
 quarkus.kubernetes.node-port=31999
+quarkus.kubernetes.labels.foo=bar
+quarkus.kubernetes.annotations.bar=baz