Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Cilium 1.14.1 and 1.14.2 #179

Closed
wants to merge 2 commits into from
Closed

Add support for Cilium 1.14.1 and 1.14.2 #179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4a871
Add support for Cilium 1.14.1 and 1.14.2
XAwaludin Sep 26, 2023
3df9cb8
Merge branch 'canonical:main' into main
XAwaludin Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion addons/cilium/enable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@ else
run_with_sudo cp "$SNAP_DATA/tmp/cilium/$CILIUM_DIR/$CILIUM_CNI_CONF" "$SNAP_DATA/args/cni-network/05-cilium-cni.conf"

IPv4_CLUSTER_CIDR="10.1.0.0/16"
IPv4_CLUSTER_CIDR_ARGS="ipam.operator.clusterPoolIPv4PodCIDR"

# Cilium v1.14.x Value ipam.operator.clusterPoolIPv4PodCIDR removed
# use ipam.operator.clusterPoolIPv4PodCIDRList instead
if [[ $CILIUM_ERSION > "1.4" ]]; then
IPv4_CLUSTER_CIDR_ARGS="ipam.operator.clusterPoolIPv4PodCIDRList"
fi

if [ -e "${SNAP_DATA}/args/cni-env" ]; then
source "${SNAP_DATA}/args/cni-env"
fi
Expand All @@ -108,7 +116,7 @@ else
--set daemon.runPath="/var/snap/microk8s/current/var/run/cilium" \
--set operator.replicas=1 \
--set keepDeprecatedLabels=true \
--set ipam.operator.clusterPoolIPv4PodCIDR="${IPv4_CLUSTER_CIDR}" \
--set ${IPv4_CLUSTER_CIDR_ARGS}="${IPv4_CLUSTER_CIDR}" \
--set nodePort.enabled=true
)

Expand Down