Switch traefik to use the domainUID and clusterName labels instead of the app label

Author: moreaut

kubernetes/internal/weblogic-domain-traefik-template.yaml

@@ -18,19 +18,18 @@ metadata:
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
-    app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
+      weblogic.domainUID: %DOMAIN_UID%
+      weblogic.clusterName: %CLUSTER_NAME%
   template:
     metadata:
       labels:
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         weblogic.clusterName: %CLUSTER_NAME%
-        app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
     spec:
       serviceAccountName: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
       terminationGracePeriodSeconds: 60
@@ -86,7 +85,6 @@ metadata:
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
-    app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
 data:
   traefik.toml: |
     # traefik.toml
@@ -112,7 +110,8 @@ metadata:
     weblogic.clusterName: %CLUSTER_NAME%
 spec:
   selector:
-    app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
+    weblogic.domainUID: %DOMAIN_UID%
+    weblogic.clusterName: %CLUSTER_NAME%
   ports:
   - port: 80
     name: http
@@ -129,10 +128,10 @@ metadata:
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
-    app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
 spec:
   selector:
-    app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
+    weblogic.domainUID: %DOMAIN_UID%
+    weblogic.clusterName: %CLUSTER_NAME%
   ports:
   - port: 8080
     name: dash

operator/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

@@ -438,18 +438,17 @@ protected ExtensionsV1beta1Deployment getExpectedTraefikDeployment() {
           .namespace(getInputs().getNamespace())
           .putLabelsItem(DOMAINUID_LABEL, getInputs().getDomainUID())
           .putLabelsItem(DOMAINNAME_LABEL, getInputs().getDomainName())
-          .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName())
-          .putLabelsItem(APP_LABEL, getTraefikScope()))
+          .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName()))
         .spec(newDeploymentSpec()
           .replicas(1)
           .selector(newLabelSelector()
-            .putMatchLabelsItem(APP_LABEL, getTraefikScope()))
+            .putMatchLabelsItem(DOMAINUID_LABEL, getInputs().getDomainUID())
+            .putMatchLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName()))
           .template(newPodTemplateSpec()
             .metadata(newObjectMeta()
               .putLabelsItem(DOMAINUID_LABEL, getInputs().getDomainUID())
               .putLabelsItem(DOMAINNAME_LABEL, getInputs().getDomainName())
-              .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName())
-              .putLabelsItem(APP_LABEL, getTraefikScope()))
+              .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName()))
             .spec(newPodSpec()
               .serviceAccountName(getTraefikScope())
               .terminationGracePeriodSeconds(60L)
@@ -524,8 +523,7 @@ protected V1ConfigMap getExpectedTraefikConfigMap() {
           .namespace(getInputs().getNamespace())
           .putLabelsItem(DOMAINUID_LABEL, getInputs().getDomainUID())
           .putLabelsItem(DOMAINNAME_LABEL, getInputs().getDomainName())
-          .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName())
-          .putLabelsItem(APP_LABEL, getTraefikScope()))
+          .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName()))
         .putDataItem(PROPERTY_TRAEFIK_TOML, "");
   }
 
@@ -557,7 +555,8 @@ protected V1Service getExpectedTraefikService() {
           .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName()))
         .spec(newServiceSpec()
           .type("NodePort")
-          .putSelectorItem(APP_LABEL, getTraefikScope())
+          .putSelectorItem(DOMAINUID_LABEL, getInputs().getDomainUID())
+          .putSelectorItem(CLUSTERNAME_LABEL, getInputs().getClusterName())
           .addPortsItem(newServicePort()
             .name("http")
             .targetPort(newIntOrString("http"))
@@ -584,11 +583,11 @@ protected V1Service getExpectedTraefikDashboardService() {
           .namespace(getInputs().getNamespace())
           .putLabelsItem(DOMAINUID_LABEL, getInputs().getDomainUID())
           .putLabelsItem(DOMAINNAME_LABEL, getInputs().getDomainName())
-          .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName())
-          .putLabelsItem(APP_LABEL, getTraefikScope()))
+          .putLabelsItem(CLUSTERNAME_LABEL, getInputs().getClusterName()))
         .spec(newServiceSpec()
           .type("NodePort")
-          .putSelectorItem(APP_LABEL, getTraefikScope())
+          .putSelectorItem(DOMAINUID_LABEL, getInputs().getDomainUID())
+          .putSelectorItem(CLUSTERNAME_LABEL, getInputs().getClusterName())
           .addPortsItem(newServicePort()
             .name("dash")
             .targetPort(newIntOrString("dash"))