Merge pull request #26543 from geoand/k8s-labels

Allow overriding of various k8s labels
quarkusio · Jul 4, 2022 · 85375e3 · 85375e3
2 parents 64f47d0 + 80bd1c8
commit 85375e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...s/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeProcessor.java b/...s/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeProcessor.java
@@ -76,6 +76,7 @@ public class KnativeProcessor {
     private static final String KNATIVE_UTILIZATION_PERCENTAGE = "autoscaling.knative.dev/target-utilization-percentage";
     private static final String KNATIVE_AUTOSCALING_TARGET = "autoscaling.knative.dev/target";
     private static final String KNATIVE_CONTAINER_CONCURRENCY = "container-concurrency";
+    private static final String KNATIVE_DEV_VISIBILITY = "networking.knative.dev/visibility";
 
     @BuildStep
     public void checkKnative(ApplicationInfoBuildItem applicationInfo, KnativeConfig config,
@@ -171,8 +172,11 @@ public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applic
                 });
 
         if (config.clusterLocal) {
-            result.add(new DecoratorBuildItem(KNATIVE,
-                    new AddLabelDecorator(name, "networking.knative.dev/visibility", "cluster-local")));
+            if (labels.stream().noneMatch(l -> l.getKey().equals(KNATIVE_DEV_VISIBILITY))) {
+                result.add(new DecoratorBuildItem(KNATIVE,
+                        new AddLabelDecorator(name, KNATIVE_DEV_VISIBILITY, "cluster-local")));
+            }
+
         }
 
         /**

diff --git a/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java b/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java
@@ -67,6 +67,7 @@ public class OpenshiftProcessor {
     private static final int OPENSHIFT_PRIORITY = DEFAULT_PRIORITY;
     private static final String OPENSHIFT_INTERNAL_REGISTRY = "image-registry.openshift-image-registry.svc:5000";
     private static final String DOCKERIO_REGISTRY = "docker.io";
+    private static final String OPENSHIFT_V3_APP = "app";
 
     @BuildStep
     public void checkOpenshift(ApplicationInfoBuildItem applicationInfo, OpenshiftConfig config,
@@ -197,7 +198,9 @@ public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applic
         if (config.flavor == v3) {
             //Openshift 3.x doesn't recognize 'app.kubernetes.io/name', it uses 'app' instead.
             //The decorator will be applied even on non-openshift resources is it may affect for example: knative
-            result.add(new DecoratorBuildItem(new AddLabelDecorator(name, "app", name)));
+            if (labels.stream().noneMatch(l -> l.getKey().equals(OPENSHIFT_V3_APP))) {
+                result.add(new DecoratorBuildItem(new AddLabelDecorator(name, OPENSHIFT_V3_APP, name)));
+            }
 
             // The presence of optional is causing issues in OCP 3.11, so we better remove them.
             // The following 4 decorator will set the optional property to null, so that it won't make it into the file.