Skip to content

Commit

Permalink
https://github.com/cilium/cilium/pull/17048
Browse files Browse the repository at this point in the history
    helm template cilium cilium/cilium \
        --version 1.12.0 \
        --namespace kube-system \
        --set bpf.preallocateMaps=false \
        --set cluster.id=0 \
        --set cluster.name=4e8b0505-4c52-57ab-a7f4-481e7ed3a2e3 \
        --set cni.binPath=/usr/libexec/cni \
        --set cni.chainingMode=portmap \
        --set cni.exclusive=true \
        --set enableIPv4Masquerade=true  \
        --set enableIPv6Masquerade=false \
        --set externalIPs.enabled=true \
        --set hostPort.enabled=true \
        --set hostServices.enabled=true \
        --set hubble.enabled=false \
        --set ipam.mode=cluster-pool \
        --set ipam.operator.clusterPoolIPv4MaskSize=24 \
        --set ipam.operator.clusterPoolIPv4PodCIDRList=10.233.64.0/18 \
        --set ipv4.enabled=true \
        --set ipv6.enabled=false \
        --set kubeProxyReplacement=partial \
        --set nodePort.enabled=true \
        --set nodeinit.enabled=true \
        --set nodeinit.securityContext.privileged=true \
        --set operator.replicas=1 \
        --set operator.securityContext.privileged=true \
        --set securityContext.privileged=true \
        --set sessionAffinity=true \
        --set tunnel=vxlan \
        | yq . > templates/etc/kubernetes/addons/60-cilium.yml.j2

See cncf/k8s-conformance#2093

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
  • Loading branch information
hswong3i committed Aug 13, 2022
1 parent d61e1ea commit d997735
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kube_cilium_cluster_name: "{{ hostvars[groups['kube_master'][0]].ansible_machine
kube_cilium_cni_binpath: "/usr/libexec/cni"

# Configure chaining on top of other CNI plugins.
kube_cilium_cni_chainingmode: "none"
kube_cilium_cni_chainingmode: "portmap"

# Make Cilium take ownership over the /etc/cni/net.d directory on the
# node, renaming all non-Cilium CNI configurations to *.cilium_bak. This
Expand Down
1 change: 1 addition & 0 deletions templates/etc/kubernetes/addons/60-cilium.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ data:
# - none
# - aws-cni
# - flannel
# - generic-veth
# - portmap (Enables HostPort support for Cilium)
cni-chaining-mode: "{{ kube_cilium_cni_chainingmode }}"
enable-ipv4-masquerade: "{{ kube_cilium_enableipv4masquerade | bool | lower }}"
Expand Down

0 comments on commit d997735

Please sign in to comment.