chore(helm): add validation for prefix and suffix and capture regression (#5250)

* chore(helm): add valiation.tpl and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add valiation.tpl and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add validation.tpl and capture regression

Co-authored-by: Michel Loiseleur <[email protected]>

* chore(helm): add validation.tpl and capture regression

Co-authored-by: Michel Loiseleur <[email protected]>

* chore(helm): add validation.tpl and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add validation.tpl and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add validation for prefix and suffix and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add validation for prefix and suffix and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add validation for prefix and suffix and capture regression

Signed-off-by: ivan katliarchuk <[email protected]>

* chore(helm): add validation for prefix and suffix and capture regression

Co-authored-by: Steve Hipwell <[email protected]>

---------

Signed-off-by: ivan katliarchuk <[email protected]>
Co-authored-by: Michel Loiseleur <[email protected]>
Co-authored-by: Steve Hipwell <[email protected]>

Author: 3 people

charts/external-dns/CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Correctly handles 'txtPrefix' and 'txtSuffix' arguments when both are provided. ([#5250](https://github.com/kubernetes-sigs/external-dns/pull/5250)) _@ivankatliarchuk_
 - Add missing types in the schema for empty values ([#5228](https://github.com/kubernetes-sigs/external-dns/pull/5228)) _@ivankatliarchuk_
 - Add missing types in the schema for empty values ([#5207](https://github.com/kubernetes-sigs/external-dns/pull/5207)) _@t3mi_
 

charts/external-dns/templates/deployment.yaml

@@ -100,10 +100,12 @@ spec:
             {{- if .Values.txtOwnerId }}
             - --txt-owner-id={{ .Values.txtOwnerId }}
             {{- end }}
+            {{- if and .Values.txtPrefix .Values.txtSuffix }}
+            {{- fail (printf "'txtPrefix' and 'txtSuffix' are mutually exclusive") }}
+            {{- end }}
             {{- if .Values.txtPrefix }}
             - --txt-prefix={{ .Values.txtPrefix }}
-            {{- end }}
-            {{- if and (eq .Values.txtPrefix "") (ne .Values.txtSuffix "") }}
+            {{- else if .Values.txtSuffix }}
             - --txt-suffix={{ .Values.txtSuffix }}
             {{- end }}
             {{- if .Values.namespaced }}

charts/external-dns/tests/deployment-flags_test.yaml

@@ -6,7 +6,6 @@ release:
 tests:
   - it: should provide expected default flags
     asserts:
-      # - matchSnapshot: {}
       - exists :
           path: spec.template.spec.containers[?(@.name == "external-dns")]
       - equal :
@@ -21,13 +20,10 @@ tests:
             - --registry=txt
             - --provider=aws
 
-  - it: should configure txtPrefix and ignore txtSuffix if not empty
+  - it: should configure 'txtSuffix' when not empty with 'txtPrefix' empty
     set:
-      provider:
-        name: cloudflare
-      txtPrefix: "test-prefix"
+      txtPrefix: ""
       txtSuffix: "test-suffix"
-      txtOwnerId: "testing"
     asserts:
       - exists :
           path: spec.template.spec.containers[?(@.name == "external-dns")]
@@ -41,35 +37,24 @@ tests:
             - --source=ingress
             - --policy=upsert-only
             - --registry=txt
-            - --txt-owner-id=testing
-            - --txt-prefix=test-prefix
-            - --provider=cloudflare
+            - --txt-suffix=test-suffix
+            - --provider=aws
       - notContains:
+          path: spec.template.spec.containers[?(@.name == "external-dns")].args
+          content: "--txt-prefix=test-prefix"
+      - contains:
           path: spec.template.spec.containers[?(@.name == "external-dns")].args
           content: "--txt-suffix=test-suffix"
 
-  - it: should configure 'txtSuffix' when not empty with 'txtPrefix' empty
+  - it: should configure 'txtSuffix' when set and 'txtPrefix' is not present
     set:
-      txtPrefix: ""
-      txtSuffix: "test-suffix"
+      txtSuffix: "custom-suffix"
     asserts:
       - exists :
           path: spec.template.spec.containers[?(@.name == "external-dns")]
-      - equal :
-          path: spec.template.spec.containers[?(@.name == "external-dns")].args
-          value:
-            - --log-level=info
-            - --log-format=text
-            - --interval=1m
-            - --source=service
-            - --source=ingress
-            - --policy=upsert-only
-            - --registry=txt
-            - --txt-suffix=test-suffix
-            - --provider=aws
-      - notContains:
+      - contains:
           path: spec.template.spec.containers[?(@.name == "external-dns")].args
-          content: "--txt-prefix=test-prefix"
+          content: "--txt-suffix=custom-suffix"
 
   - it: should be able configure multiple sources
     set:
@@ -117,3 +102,11 @@ tests:
             - --zone-id-filter=/hostedzone/Z00003
             - --zone-id-filter=/hostedzone/Z00004
             - --zone-id-filter=/hostedzone/Z00005
+
+  - it: should throw error when txtPrefix and txtSuffix are set
+    set:
+        txtPrefix: "test-prefix"
+        txtSuffix: "test-suffix"
+    asserts:
+     - failedTemplate:
+          errorMessage: "'txtPrefix' and 'txtSuffix' are mutually exclusive"