Sitelet https://github.com/kubernetes/kops/commit/916a507c5596c2e804a87cb3e34d585a0ee14430
Skip to content

Commit 916a507

Browse files
authored
Merge pull request #18465 from hakman/gossip-cilium-upgrade
cilium: mount the host's /etc/hosts on gossip clusters
2 parents 7d81a2f + a14d1f8 commit 916a507

3 files changed

Lines changed: 45 additions & 1 deletion

File tree

‎tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ spec:
5454
version: 9.99.0
5555
- id: k8s-1.16
5656
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
57-
manifestHash: dd73a7e0bb9dde0f92a8647eb368050717457d6c8edf34112bbfc656db91772f
57+
manifestHash: f290feb45f211058acfff0aeca12edd45be556cdf0e1230c9d088a8e4d1f4352
5858
name: networking.cilium.io
5959
needsRollingUpdate: all
6060
selector:

‎tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,9 @@ spec:
791791
name: xtables-lock
792792
- mountPath: /tmp
793793
name: tmp
794+
- mountPath: /etc/hosts
795+
name: etc-hosts
796+
readOnly: true
794797
hostNetwork: true
795798
initContainers:
796799
- command:
@@ -1049,6 +1052,10 @@ spec:
10491052
path: /proc/sys/kernel
10501053
type: Directory
10511054
name: host-proc-sys-kernel
1055+
- hostPath:
1056+
path: /etc/hosts
1057+
type: File
1058+
name: etc-hosts
10521059
updateStrategy:
10531060
type: OnDelete
10541061

@@ -1168,6 +1175,9 @@ spec:
11681175
- mountPath: /tmp/cilium/config-map
11691176
name: cilium-config-path
11701177
readOnly: true
1178+
- mountPath: /etc/hosts
1179+
name: etc-hosts
1180+
readOnly: true
11711181
hostNetwork: true
11721182
nodeSelector:
11731183
kubernetes.io/os: linux
@@ -1192,3 +1202,7 @@ spec:
11921202
- configMap:
11931203
name: cilium-config
11941204
name: cilium-config-path
1205+
- hostPath:
1206+
path: /etc/hosts
1207+
type: File
1208+
name: etc-hosts

‎upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,14 @@ spec:
15841584
{{ end }}
15851585
- name: tmp
15861586
mountPath: /tmp
1587+
{{- if GossipEnabled }}
1588+
# Gossip clusters update the host's /etc/hosts as control-plane nodes
1589+
# are replaced; mount it so the agent sees those updates instead of
1590+
# the static copy kubelet makes at container start.
1591+
- name: etc-hosts
1592+
mountPath: /etc/hosts
1593+
readOnly: true
1594+
{{- end }}
15871595

15881596
{{ if .Debug }}
15891597
- name: cilium-monitor
@@ -1925,6 +1933,13 @@ spec:
19251933
hostPath:
19261934
path: /proc/sys/kernel
19271935
type: Directory
1936+
{{- if GossipEnabled }}
1937+
# To see protokube's updates to the host's /etc/hosts (gossip clusters)
1938+
- name: etc-hosts
1939+
hostPath:
1940+
path: /etc/hosts
1941+
type: File
1942+
{{- end }}
19281943
{{ if WithDefaultBool .Hubble.Enabled false }}
19291944
- name: hubble-tls
19301945
projected:
@@ -2058,6 +2073,14 @@ spec:
20582073
- name: etcd-secrets
20592074
mountPath: /var/lib/etcd-secrets
20602075
readOnly: true
2076+
{{- end }}
2077+
{{- if GossipEnabled }}
2078+
# Gossip clusters update the host's /etc/hosts as control-plane nodes
2079+
# are replaced; mount it so the operator sees those updates instead of
2080+
# the static copy kubelet makes at container start.
2081+
- name: etc-hosts
2082+
mountPath: /etc/hosts
2083+
readOnly: true
20612084
{{- end }}
20622085
securityContext:
20632086
allowPrivilegeEscalation: false
@@ -2123,6 +2146,13 @@ spec:
21232146
path: /etc/kubernetes/pki/cilium
21242147
type: Directory
21252148
{{- end }}
2149+
{{- if GossipEnabled }}
2150+
# To see protokube's updates to the host's /etc/hosts (gossip clusters)
2151+
- name: etc-hosts
2152+
hostPath:
2153+
path: /etc/hosts
2154+
type: File
2155+
{{- end }}
21262156
{{ if WithDefaultBool .Hubble.Enabled false }}
21272157
---
21282158
# Source: cilium/templates/hubble-relay/deployment.yaml

0 commit comments

Comments
 (0)