Merge pull request k3s-io#435 from axivo/fix/chart-validation

fix: combine post-install chart values

Author: fmunteanu

roles/argo-cd/tasks/validation.yaml

@@ -77,6 +77,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             argocd_postinstall: true
@@ -85,6 +89,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ argocd_vars.kubernetes.helm.repository.org }}'
@@ -98,7 +106,7 @@
                 --namespace {{ argocd_vars.kubernetes.namespace }}
                 --version {{ argocd_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/cert-manager/tasks/validation.yaml

@@ -56,6 +56,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             certmanager_postinstall: true
@@ -64,6 +68,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ certmanager_vars.kubernetes.helm.repository.org }}'
@@ -77,7 +85,7 @@
                 --namespace {{ certmanager_vars.kubernetes.namespace }}
                 --version {{ certmanager_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/cilium/tasks/validation.yaml

@@ -98,6 +98,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart setup fact
           ansible.builtin.set_fact:
             cilium_setup: false
@@ -106,6 +110,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             cilium_postinstall: true
@@ -114,6 +122,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ cilium_vars.kubernetes.helm.repository.org }}'
@@ -127,7 +139,7 @@
                 --namespace {{ cilium_vars.kubernetes.namespace }}
                 --version {{ cilium_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/coredns/tasks/validation.yaml

@@ -34,6 +34,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             coredns_postinstall: true
@@ -42,6 +46,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ coredns_vars.kubernetes.helm.repository.org }}'
@@ -55,7 +63,7 @@
                 --namespace {{ coredns_vars.kubernetes.namespace }}
                 --version {{ coredns_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/external-dns/tasks/validation.yaml

@@ -42,6 +42,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             externaldns_postinstall: true
@@ -50,6 +54,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ externaldns_vars.kubernetes.helm.repository.org }}'
@@ -63,7 +71,7 @@
                 --namespace {{ externaldns_vars.kubernetes.namespace }}
                 --version {{ externaldns_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/kured/tasks/validation.yaml

@@ -34,6 +34,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             kured_postinstall: true
@@ -42,6 +46,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ kured_vars.kubernetes.helm.repository.org }}'
@@ -55,7 +63,7 @@
                 --namespace {{ kured_vars.kubernetes.namespace }}
                 --version {{ kured_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/longhorn/tasks/validation.yaml

@@ -62,6 +62,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             longhorn_postinstall: true
@@ -70,6 +74,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ longhorn_vars.kubernetes.helm.repository.org }}'
@@ -83,7 +91,7 @@
                 --namespace {{ longhorn_vars.kubernetes.namespace }}
                 --version {{ longhorn_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/metrics-server/tasks/validation.yaml

@@ -35,6 +35,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             metricsserver_postinstall: true
@@ -43,6 +47,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ metricsserver_vars.kubernetes.helm.repository.name }}'
@@ -56,7 +64,7 @@
                 --namespace {{ metricsserver_vars.kubernetes.namespace }}
                 --version {{ metricsserver_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3

roles/victoria-logs/tasks/validation.yaml

@@ -34,6 +34,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Set chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml }}"
+
         - name: Update chart postinstall fact
           ansible.builtin.set_fact:
             victorialogs_postinstall: true
@@ -42,6 +46,10 @@
           ansible.builtin.debug:
             msg: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
 
+        - name: Update chart values fact
+          ansible.builtin.set_fact:
+            chart_values: "{{ chart_values | combine(lookup('ansible.builtin.template', 'values.j2') | trim | from_yaml, recursive=true) }}"
+
         - name: Add repository
           kubernetes.core.helm_repository:
             name: '{{ victorialogs_vars.kubernetes.helm.repository.org }}'
@@ -55,7 +63,7 @@
                 --namespace {{ victorialogs_vars.kubernetes.namespace }}
                 --version {{ victorialogs_vars.kubernetes.helm.chart.version }}
                 --context 3 --values -
-            stdin: "{{ lookup('ansible.builtin.template', 'values.j2') }}"
+            stdin: '{{ chart_values | to_yaml }}'
           register: result
           delay: 1
           retries: 3