Skip to content

Commit

Permalink
Merge pull request #2063 from cybozu-go/cilium-pre-native-xdp-enabled
Browse files Browse the repository at this point in the history
enable xdp acceleration
  • Loading branch information
ysksuzuki authored Aug 29, 2022
2 parents 3bdc131 + 31d531a commit 291e199
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions cilium/pre/upstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ data:
enable-auto-protect-node-port-range: "true"
bpf-lb-mode: "dsr"
bpf-lb-algorithm: "maglev"
bpf-lb-acceleration: "disabled"
bpf-lb-acceleration: "native"
bpf-lb-maglev-hash-seed: "3HCx6JennjWtot2U"
enable-session-affinity: "true"
enable-l2-neigh-discovery: "true"
Expand Down Expand Up @@ -627,7 +627,7 @@ spec:
prometheus.io/port: "9090"
prometheus.io/scrape: "true"
# ensure pods roll when configmap updates
cilium.io/cilium-configmap-checksum: "27e2fa4fbcb9b18d162c6531b4bc8160031da83e4e99c6eab77f4cfd89d443de"
cilium.io/cilium-configmap-checksum: "cf4d09170c1d4fc1320468d792cf16975f351ebd24a2be9a450e626c63e319a9"
labels:
k8s-app: cilium
spec:
Expand Down Expand Up @@ -958,7 +958,7 @@ spec:
metadata:
annotations:
# ensure pods roll when configmap updates
cilium.io/cilium-configmap-checksum: "27e2fa4fbcb9b18d162c6531b4bc8160031da83e4e99c6eab77f4cfd89d443de"
cilium.io/cilium-configmap-checksum: "cf4d09170c1d4fc1320468d792cf16975f351ebd24a2be9a450e626c63e319a9"
prometheus.io/port: "6942"
prometheus.io/scrape: "true"
labels:
Expand Down
3 changes: 1 addition & 2 deletions cilium/pre/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ k8sServiceHost: 127.0.0.1
k8sServicePort: 16443
kubeProxyReplacement: "partial"
loadBalancer:
# We can't enable XDP Acceleration because of the issue https://github.com/cilium/cilium/issues/19453
acceleration: disabled
acceleration: native
algorithm: maglev
mode: dsr
maglev:
Expand Down
6 changes: 3 additions & 3 deletions etc/cilium-pre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ data:
arping-refresh-period: 30s
auto-direct-node-routes: "false"
bgp-announce-lb-ip: "true"
bpf-lb-acceleration: disabled
bpf-lb-acceleration: native
bpf-lb-algorithm: maglev
bpf-lb-external-clusterip: "false"
bpf-lb-maglev-hash-seed: 3HCx6JennjWtot2U
Expand Down Expand Up @@ -549,7 +549,7 @@ spec:
template:
metadata:
annotations:
cilium.io/cilium-configmap-checksum: 27e2fa4fbcb9b18d162c6531b4bc8160031da83e4e99c6eab77f4cfd89d443de
cilium.io/cilium-configmap-checksum: cf4d09170c1d4fc1320468d792cf16975f351ebd24a2be9a450e626c63e319a9
prometheus.io/port: "6942"
prometheus.io/scrape: "true"
labels:
Expand Down Expand Up @@ -800,7 +800,7 @@ spec:
template:
metadata:
annotations:
cilium.io/cilium-configmap-checksum: 27e2fa4fbcb9b18d162c6531b4bc8160031da83e4e99c6eab77f4cfd89d443de
cilium.io/cilium-configmap-checksum: cf4d09170c1d4fc1320468d792cf16975f351ebd24a2be9a450e626c63e319a9
prometheus.io/port: "9090"
prometheus.io/scrape: "true"
labels:
Expand Down

0 comments on commit 291e199

Please sign in to comment.