feat(providers): add nativeLBByDefault support

traefik · Jul 4, 2024 · e75a85c · e75a85c
1 parent 647439d
commit e75a85c
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 23 deletions.
diff --git a/traefik/templates/_podtemplate.tpl b/traefik/templates/_podtemplate.tpl
@@ -449,42 +449,48 @@
           {{- end }}
           {{- if .Values.providers.kubernetesCRD.enabled }}
           - "--providers.kubernetescrd"
-          {{- if .Values.providers.kubernetesCRD.labelSelector }}
+           {{- if .Values.providers.kubernetesCRD.labelSelector }}
           - "--providers.kubernetescrd.labelSelector={{ .Values.providers.kubernetesCRD.labelSelector }}"
-          {{- end }}
-          {{- if .Values.providers.kubernetesCRD.ingressClass }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesCRD.ingressClass }}
           - "--providers.kubernetescrd.ingressClass={{ .Values.providers.kubernetesCRD.ingressClass }}"
-          {{- end }}
-          {{- if .Values.providers.kubernetesCRD.allowCrossNamespace }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesCRD.allowCrossNamespace }}
           - "--providers.kubernetescrd.allowCrossNamespace=true"
-          {{- end }}
-          {{- if .Values.providers.kubernetesCRD.allowExternalNameServices }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesCRD.allowExternalNameServices }}
           - "--providers.kubernetescrd.allowExternalNameServices=true"
-          {{- end }}
-          {{- if .Values.providers.kubernetesCRD.allowEmptyServices }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesCRD.allowEmptyServices }}
           - "--providers.kubernetescrd.allowEmptyServices=true"
-          {{- end }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesCRD.nativeLBByDefault }}
+          - "--providers.kubernetescrd.nativeLBByDefault=true"
+           {{- end }}
           {{- end }}
           {{- if .Values.providers.kubernetesIngress.enabled }}
           - "--providers.kubernetesingress"
-          {{- if .Values.providers.kubernetesIngress.allowExternalNameServices }}
+           {{- if .Values.providers.kubernetesIngress.allowExternalNameServices }}
           - "--providers.kubernetesingress.allowExternalNameServices=true"
-          {{- end }}
-          {{- if .Values.providers.kubernetesIngress.allowEmptyServices }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesIngress.allowEmptyServices }}
           - "--providers.kubernetesingress.allowEmptyServices=true"
-          {{- end }}
-          {{- if and .Values.service.enabled .Values.providers.kubernetesIngress.publishedService.enabled }}
+           {{- end }}
+           {{- if and .Values.service.enabled .Values.providers.kubernetesIngress.publishedService.enabled }}
           - "--providers.kubernetesingress.ingressendpoint.publishedservice={{ template "providers.kubernetesIngress.publishedServicePath" . }}"
-          {{- end }}
-          {{- if .Values.providers.kubernetesIngress.labelSelector }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesIngress.labelSelector }}
           - "--providers.kubernetesingress.labelSelector={{ .Values.providers.kubernetesIngress.labelSelector }}"
-          {{- end }}
-          {{- if .Values.providers.kubernetesIngress.ingressClass }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesIngress.ingressClass }}
           - "--providers.kubernetesingress.ingressClass={{ .Values.providers.kubernetesIngress.ingressClass }}"
-          {{- end }}
-          {{- if .Values.providers.kubernetesIngress.disableIngressClassLookup }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesIngress.disableIngressClassLookup }}
           - "--providers.kubernetesingress.disableIngressClassLookup=true"
-          {{- end }}
+           {{- end }}
+           {{- if .Values.providers.kubernetesIngress.nativeLBByDefault }}
+          - "--providers.kubernetesingress.nativeLBByDefault=true"
+           {{- end }}
           {{- end }}
           {{- if .Values.experimental.kubernetesGateway.enabled }}
           - "--providers.kubernetesgateway"

diff --git a/traefik/tests/traefik-config_test.yaml b/traefik/tests/traefik-config_test.yaml
@@ -167,6 +167,28 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].args
           content: "--providers.kubernetesingress.ingressClass=foo"
+  - it: should be possible to set nativeLBByDefault
+    set:
+      providers:
+        kubernetesIngress:
+          nativeLBByDefault: true
+        kubernetesCRD:
+          nativeLBByDefault: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--providers.kubernetescrd.nativeLBByDefault=true"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--providers.kubernetesingress.nativeLBByDefault=true"
+  - it: should not set nativeLBByDefault by default
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: "--providers.kubernetescrd.nativeLBByDefault=true"
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: "--providers.kubernetesingress.nativeLBByDefault=true"
 
   - it: should have a plugin storage and args if the experimental feature is enabled
     set:

diff --git a/traefik/values.yaml b/traefik/values.yaml
@@ -225,7 +225,8 @@ providers:
     # labelSelector: environment=production,method=traefik
     # -- Array of namespaces to watch. If left empty, Traefik watches all namespaces.
     namespaces: []
-    # - "default"
+    # -- Defines whether to use Native Kubernetes load-balancing mode by default.
+    nativeLBByDefault:
 
   kubernetesIngress:
     # -- Load Kubernetes Ingress provider
@@ -249,6 +250,8 @@ providers:
       # Published Kubernetes Service to copy status from. Format: namespace/servicename
       # By default this Traefik service
       # pathOverride: ""
+    # -- Defines whether to use Native Kubernetes load-balancing mode by default.
+    nativeLBByDefault:
 
   file:
     # -- Create a file provider