Skip to content

Commit

Permalink
helm: Add pod affinity for cilium-envoy
Browse files Browse the repository at this point in the history
This is the best effort to avoid cilium-envoy running on the node
without cilium agent. Kind note that the extra cilium-envoy pod
(if any) will be just no-ops except a bunch of warn logs related
to non-existence of shared unix domain socket.

The reason for preferred but not required options is to avoid race
condition for new installation between cilium-agent and cilium-envoy
deamon sets.

Relates: cilium#25081, cilium#30034
Fixes: cilium#31149
Signed-off-by: Tam Mach <tam.mach@cilium.io>
  • Loading branch information
sayboras committed Mar 5, 2024
1 parent 7c7ae03 commit faefad3
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Documentation/helm-values.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion install/kubernetes/cilium/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions install/kubernetes/cilium/values.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions install/kubernetes/cilium/values.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1925,6 +1925,15 @@ envoy:
labelSelector:
matchLabels:
k8s-app: cilium-envoy
podAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 1
podAffinityTerm:
topologyKey: kubernetes.io/hostname
labelSelector:
matchLabels:
k8s-app: cilium

# -- Node selector for cilium-envoy.
nodeSelector:
kubernetes.io/os: linux
Expand Down

0 comments on commit faefad3

Please sign in to comment.