Skip to content

fix(cilium): add CNI override ConfigMap for Cilium #79593

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

Open
mgencur wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cilium): add CNI override ConfigMap for Cilium #79593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 32 additions & 2 deletions ...try/cucushift/hypershift-extended/cilium/cucushift-hypershift-extended-cilium-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,32 @@ oc adm policy add-scc-to-user privileged -z cilium -n cilium
oc adm policy add-scc-to-user privileged -z cilium-operator -n cilium
oc adm policy add-scc-to-user privileged -z cilium-envoy -n cilium

# Overriding the default 0.3.1 cniVersion to workaround https://redhat.atlassian.net/browse/OCPBUGS-86033
oc apply -f - <<'EOF'
apiVersion: v1
kind: ConfigMap
metadata:
name: cilium-cni-override
namespace: cilium
data:
cilium-override.conf: |
{
"cniVersion": "0.4.0",
"name": "portmap",
"plugins": [
{
"type": "cilium-cni",
"enable-debug": true,
"log-file": "/var/run/cilium/cilium-cni.log"
},
{
"type": "portmap",
"capabilities": {"portMappings": true}
}
]
}
EOF

# Note: In order to test with a development version, use:
# --repository oci://quay.io/cilium-charts-dev/cilium --version <version>
# where <version> is a tag from https://quay.io/repository/cilium-charts-dev/cilium
Expand All @@ -64,9 +90,13 @@ cilium install \
--set cni.confPath=/var/run/multus/cni/net.d \
--set sessionAffinity=true \
--set endpointRoutes.enabled="true" \
--set cni.chainingMode=portmap \
--set tunnelPort=4789 \
--set clusterHealthPort=9940 \
--set socketLB.enabled=true
--set socketLB.enabled=true \
--set cni.readCniConf=/etc/cilium-cni/cilium-override.conf \
--set extraVolumes[0].name=cni-override \
--set extraVolumes[0].configMap.name=cilium-cni-override \
--set extraVolumeMounts[0].name=cni-override \
--set extraVolumeMounts[0].mountPath=/etc/cilium-cni

cilium status --namespace cilium --wait
4 changes: 2 additions & 2 deletions ...cilium/network-policies/cucushift-hypershift-extended-cilium-network-policies-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ if [[ -f "${SHARED_DIR}/nested_kubeconfig" ]]; then
fi

OCP_VERSION=$(oc get clusterversion version -o jsonpath='{.status.desired.version}' | cut -d. -f1-2)
if [ "$OCP_VERSION" != "4.22" ]; then
echo "OCP version ${OCP_VERSION} is not 4.22, skipping NetworkPolicy workarounds"
if [[ "$OCP_VERSION" != "4.22" && "$OCP_VERSION" != "5.0" ]]; then
echo "OCP version ${OCP_VERSION}, skipping NetworkPolicy workarounds"
exit 0
fi

Expand Down