Skip to content
This repository was archived by the owner on Aug 7, 2025. It is now read-only.

Commit 6b56a90

Browse files
Ganesh Maharaj Mahalingamdklyle
authored andcommitted
Update CNIs
Canal: v3.18 Cilium: v1.9 Flannel: 0.14.0-rc1 Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
1 parent f9b2600 commit 6b56a90

4 files changed

Lines changed: 17 additions & 4 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
resources:
2+
- canal/canal.yaml
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ipam:
2+
mode: "cluster-pool"
3+
operator:
4+
clusterPoolIPv4PodCIDR: "10.244.0.0/16"
5+
clusterPoolIPv4MaskSize: 24
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
resources:
2+
- flannel/Documentation/kube-flannel.yml

clr-k8s-examples/create_stack.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ LOAD_BALANCER_IP=${LOAD_BALANCER_IP:-""}
1818
LOAD_BALANCER_PORT="${LOAD_BALANCER_PORT:-6444}"
1919

2020
# versions
21-
CANAL_VER="${CLRK8S_CANAL_VER:-v3.10}"
22-
CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.6.4}"
23-
FLANNEL_VER="${CLRK8S_FLANNEL_VER:-960b3243b9a7faccdfe7b3c09097105e68030ea7}"
21+
CANAL_VER="${CLRK8S_CANAL_VER:-v3.18}"
22+
CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.9}"
23+
FLANNEL_VER="${CLRK8S_FLANNEL_VER:-v0.14.0-rc1}"
24+
CILIUM_VAL_OVERRIDE=""
2425
K8S_VER="${CLRK8S_K8S_VER:-}"
2526
KATA_VER="${CLRK8S_KATA_VER:-1.9.1-kernel-config}"
2627
ROOK_VER="${CLRK8S_ROOK_VER:-v1.2.6}"
@@ -167,7 +168,10 @@ function cni() {
167168

168169
get_repo "${CILIUM_URL}" "${CILIUM_DIR}/overlays/${CILIUM_VER}"
169170
set_repo_version "${CILIUM_VER}" "${CILIUM_DIR}/overlays/${CILIUM_VER}/cilium/"
170-
helm template "${CILIUM_DIR}/overlays/${CILIUM_VER}/cilium/install/kubernetes/cilium" --namespace kube-system --set global.containerRuntime.integration="$RUNNER" | kubectl apply -f -
171+
if [ -f "${CILIUM_DIR}/overlays/${CILIUM_VER}/values.yaml" ]; then
172+
CILIUM_VAL_OVERRIDE="--values ${CILIUM_DIR}/overlays/${CILIUM_VER}/values.yaml"
173+
fi
174+
helm template "${CILIUM_DIR}/overlays/${CILIUM_VER}/cilium/install/kubernetes/cilium" ${CILIUM_VAL_OVERRIDE} --namespace kube-system --set global.containerRuntime.integration="$RUNNER" | kubectl apply -f -
171175
;;
172176
*)
173177
echo"Unknown cni $CNI"

0 commit comments

Comments
 (0)