From 8b70c85270b4aad7bb2e201897842c1f2702a638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kub=C3=ADn?= Date: Tue, 14 Nov 2023 14:12:01 +0100 Subject: [PATCH] Set correct yaml type of helm values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Kubín --- .../k8s_cluster/k8s-net-custom-cni.yml | 16 ++++++++-------- .../network_plugin/custom_cni/defaults/main.yml | 2 +- tests/files/packet_debian12-custom-cni-helm.yml | 8 +++++--- 3 files changed, 14 insertions(+), 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 index 67e21028d86..67b04810369 100644 --- 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 index b65b1cca524..0eab14374e3 100644 --- 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 index 1d2137dc6ef..10dada0dc76 100644 --- 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