Set correct yaml type of helm values

Signed-off-by: Lukáš Kubín <[email protected]>
kubernetes-sigs · Nov 14, 2023 · 8b70c85 · 8b70c85
1 parent 1a94f6e
commit 8b70c85
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-custom-cni.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-custom-cni.yml
@@ -37,15 +37,15 @@
 # custom_cni_chart_version: ""
 #
 ## Custom Helm values to be used for deployment
-# custom_cni_chart_values: ""
+# custom_cni_chart_values: {}
 
 ## OPTION 2 EXAMPLE - Cilium deployed from official public Helm chart
-# custom_cni_chart_namespace: "kube-system"
-# custom_cni_chart_release_name: "cilium"
-# custom_cni_chart_repository_name: "cilium"
-# custom_cni_chart_repository_url: "https://helm.cilium.io"
-# custom_cni_chart_ref: "cilium/cilium"
-# custom_cni_chart_version: "1.14.2"
-# custom_cni_chart_values: |-
+# custom_cni_chart_namespace: kube-system
+# custom_cni_chart_release_name: cilium
+# custom_cni_chart_repository_name: cilium
+# custom_cni_chart_repository_url: https://helm.cilium.io
+# custom_cni_chart_ref: cilium/cilium
+# custom_cni_chart_version: 1.14.3
+# custom_cni_chart_values:
 #   cluster:
 #     name: "cilium-demo"
diff --git a/roles/network_plugin/custom_cni/defaults/main.yml b/roles/network_plugin/custom_cni/defaults/main.yml
@@ -8,4 +8,4 @@ custom_cni_chart_repository_name: ""
 custom_cni_chart_repository_url: ""
 custom_cni_chart_ref: ""
 custom_cni_chart_version: ""
-custom_cni_chart_values: ""
+custom_cni_chart_values: {}
diff --git a/tests/files/packet_debian12-custom-cni-helm.yml b/tests/files/packet_debian12-custom-cni-helm.yml
@@ -9,6 +9,8 @@ custom_cni_chart_namespace: kube-system
 custom_cni_chart_release_name: cilium
 custom_cni_chart_repository_name: cilium
 custom_cni_chart_repository_url: https://helm.cilium.io
-custom_cni_chart_ref: "cilium/cilium"
-custom_cni_chart_version: "1.14.2"
-custom_cni_chart_values: ""
+custom_cni_chart_ref: cilium/cilium
+custom_cni_chart_version: 1.14.3
+custom_cni_chart_values:
+  cluster:
+    name: kubespray