fix(Traefik Hub): 🐛 handle main and latest build

traefik · Feb 6, 2025 · cb40c04 · cb40c04
1 parent 203787d
commit cb40c04
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/traefik/templates/requirements.yaml b/traefik/templates/requirements.yaml
@@ -54,7 +54,14 @@
     {{ fail "When using Traefik Hub image tag needs to be specified !" }}
   {{- end -}}
 
-  {{ $hubVersion := (split "@" (default "v3" $.Values.image.tag))._0 | replace "latest-" "" }}
+  {{ $hubVersion := (split "@" (default "v3" $.Values.image.tag))._0 }}
+
+  {{/*
+  Consider non semver versions as latest one
+  */}}
+  {{- if not (regexMatch "v[0-9]+.[0-9]+.[0-9]+" (default "" $.Values.image.tag)) -}}
+    {{ $hubVersion = "v3.99" }}
+  {{- end }}
 
   {{- if and (semverCompare "<v3.9.0" $hubVersion) .Values.hub.tracing.additionalTraceHeaders.enabled }}
     {{ fail "ERROR: additionalTraceHeaders is a feature only available for traefik-hub >= v3.9.0."}}

diff --git a/traefik/tests/requirements-config_test.yaml b/traefik/tests/requirements-config_test.yaml
@@ -192,3 +192,35 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: "ERROR: microcks provider is a feature only available for traefik-hub >= v3.7.0."
+  - it: should not fail when using hub.tracing.additionalTraceHeaders on Traefik Hub main builds
+    set:
+      image:
+        registry: "ghcr.io"
+        repository: "traefik/traefik-hub"
+        tag: main-1af57d3-1737730202
+      tracing:
+        otlp:
+          enabled: true
+      hub:
+        token: "xxx"
+        tracing:
+          additionalTraceHeaders:
+            enabled: true
+    asserts:
+      - notFailedTemplate: {}
+  - it: should not fail when using hub.tracing.additionalTraceHeaders on Traefik Hub latest v3 builds
+    set:
+      image:
+        registry: "ghcr.io"
+        repository: "traefik/traefik-hub"
+        tag: latest-v3
+      tracing:
+        otlp:
+          enabled: true
+      hub:
+        token: "xxx"
+        tracing:
+          additionalTraceHeaders:
+            enabled: true
+    asserts:
+      - notFailedTemplate: {}