fix(platform): update cilium according to the latest doc change (tkes…

…tack#1324)
rocpyang · May 27, 2021 · 5b86893 · 5b86893
1 parent 2e15aff
commit 5b86893
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/pkg/platform/provider/baremetal/manifests/cilium/cilium.yaml b/pkg/platform/provider/baremetal/manifests/cilium/cilium.yaml
@@ -110,29 +110,27 @@ data:
  # wait-bpf-mount makes init container wait until bpf filesystem is mounted
  wait-bpf-mount: "false"
 
- masquerade: "false"
- enable-bpf-masquerade: "false"
- {{ if eq .NetworkMode "underlay" }}
- enable-endpoint-routes: "true"
- auto-create-cilium-node-resource: "true"
- {{ end }}
-
  {{ if eq .NetworkMode "overlay" }}
+ masquerade: "true"
+ install-iptables-rules: "true"
  enable-local-node-route: "true"
  ipam: "kubernetes"
  tunnel: vxlan
  {{ else }}
+ masquerade: "false"
+ install-iptables-rules: "false"
  enable-local-node-route: "false"
  ipam: "crd"
  tunnel: disabled
+ enable-endpoint-routes: "true"
+ auto-create-cilium-node-resource: "true"
  {{ end }}
+ kube-proxy-replacement: "partial"
+ enable-bpf-masquerade: "false"
  enable-xt-socket-fallback: "true"
- install-iptables-rules: "false"
-
  auto-direct-node-routes: "false"
  enable-bandwidth-manager: "false"
  enable-local-redirect-policy: "false"
- kube-proxy-replacement: "probe"
  kube-proxy-replacement-healthz-bind-address: ""
  enable-health-check-nodeport: "true"
  node-port-bind-protection: "true"

diff --git a/pkg/platform/provider/baremetal/manifests/cilium/masq-agent.yaml b/pkg/platform/provider/baremetal/manifests/cilium/masq-agent.yaml
@@ -1,4 +1,4 @@
-{{ if eq .NetworkMode "overlay" }}
+{{ if eq .NetworkMode "underlay" }}
 ---
 apiVersion: v1
 data: