From 8a7b1391c2c8a03d25aea9de685c0da6e55fd165 Mon Sep 17 00:00:00 2001 From: AJ Date: Wed, 22 May 2024 14:32:18 +0100 Subject: [PATCH] update cilium value to replace CIDR value from config.yaml (#1489) * update cilium value to replace CIDR value from config.yaml * removed unused var --- .../apps/kube-system/cilium/app/helm-values.yaml.j2 | 4 ++-- .../templates/kubernetes/flux/vars/cluster-settings.yaml.j2 | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helm-values.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helm-values.yaml.j2 index a8c7912f..843f367a 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helm-values.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helm-values.yaml.j2 @@ -23,9 +23,9 @@ hubble: enabled: false ipam: mode: kubernetes -ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}" +ipv4NativeRoutingCIDR: #{ bootstrap_pod_network.split(',')[0] }# #% if bootstrap_feature_gates.dual_stack_ipv4_first %# -ipv6NativeRoutingCIDR: "${CLUSTER_CIDR_V6}" +ipv6NativeRoutingCIDR: "#{ bootstrap_pod_network.split(',')[1] }#" ipv6: enabled: true #% endif %# diff --git a/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 index 597f9878..f99c0e2b 100644 --- a/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 +++ b/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 @@ -5,11 +5,7 @@ metadata: name: cluster-settings namespace: flux-system data: - CLUSTER_CIDR: "#{ bootstrap_pod_network.split(',')[0] }#" NODE_CIDR: "#{ bootstrap_node_network }#" - #% if bootstrap_feature_gates.dual_stack_ipv4_first %# - CLUSTER_CIDR_V6: "#{ bootstrap_pod_network.split(',')[1] }#" - #% endif %# #% if bootstrap_bgp.enabled %# BGP_ADVERTISED_CIDR: "#{ bootstrap_bgp.advertised_network }#" #% endif %#