Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry pick of #17319: Remove cilium-config-path mount in cilium-agent container #17338

Merged
merged 2 commits into from
Apr 5, 2025
Merged

Automated cherry pick of #17319: Remove cilium-config-path mount in cilium-agent container #17338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7ad45c
remove cilium-config-path mount in cilium-agent container
admun Mar 21, 2025
a429b60
hack/update-expected.sh results
admun Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 701616c03e4ad157a9db6cf3caa3a82fc8c200b7d0b838d50668603abe69e43a
manifestHash: ef83322197fa3f645effca0229c7e508d2b6c758c388c62c0a126715bed529b7
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
6 changes: 0 additions & 6 deletions .../data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -904,9 +901,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion ...minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 1d069b812e49ee373c8c35c4a7c653e7c7690c8292f34025abd2c33db0064277
manifestHash: 64fd2b1964ff070f391c6125e4a230dfbf34940c8941dfe982bb3b9acd56ac3c
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
6 changes: 0 additions & 6 deletions ...a/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -905,9 +902,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion ...luster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: cceac64c304516725d40231c9b73cff5e8299856760fb6cea3222f1c21d080f7
manifestHash: d2cd13682c1764c0bfef35c97a19b1d2b335ccf03822d2912121a3adbeef5830
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
6 changes: 0 additions & 6 deletions ...way/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -905,9 +902,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion ...r/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 210aad01f06c3cc7f91e69931cd81881496c91740622f8a2f1867e1df64e7410
manifestHash: f4190bd1eace9a9ddbb866537debcc2f8fcb4327a8d80cb51e9860f23a34b529
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
6 changes: 0 additions & 6 deletions ...data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,9 +698,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -932,9 +929,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion ...uster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: d7856bfc2bc1190c333411aa196efab57fd217253de2cd00ba6e9e58318f8894
manifestHash: dd8217efb975e6a7d3a82ccb95aa006c2372731dc8dbfd136c62c5d4c95e2750
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
6 changes: 0 additions & 6 deletions ...data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,9 +674,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -908,9 +905,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion ...ster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 79db9d85ae81dccb36c7ea45d54ce5a11b8c554fc583976c8edbe2c76ef0b45e
manifestHash: 9f9002db17eb2010a50ac3da0628b27b5005b00c465e47f722c932a277584d01
name: networking.cilium.io
needsPKI: true
needsRollingUpdate: all
Expand Down
6 changes: 0 additions & 6 deletions ...data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,9 +933,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -1170,9 +1167,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion ...iumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 4156a83ceda6287eaa790ad43d7f0acf1dc7d0a12afd30078ad9841e93d6e53c
manifestHash: 5030328bbc065c993306fc2e37163a15788044f0aad13b0dfeebb5f4b8aa4abc
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
6 changes: 0 additions & 6 deletions ..._s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,9 +714,6 @@ spec:
- mountPath: /var/lib/cilium/clustermesh
name: clustermesh-secrets
readOnly: true
- mountPath: /tmp/cilium/config-map
name: cilium-config-path
readOnly: true
- mountPath: /lib/modules
name: lib-modules
readOnly: true
Expand Down Expand Up @@ -959,9 +956,6 @@ spec:
path: common-etcd-client-ca.crt
name: clustermesh-apiserver-remote-cert
optional: true
- configMap:
name: cilium-config
name: cilium-config-path
- hostPath:
path: /proc/sys/net
type: Directory
Expand Down
6 changes: 0 additions & 6 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,9 +1195,6 @@ spec:
- name: clustermesh-secrets
mountPath: /var/lib/cilium/clustermesh
readOnly: true
- name: cilium-config-path
mountPath: /tmp/cilium/config-map
readOnly: true
# Needed to be able to load kernel modules
- name: lib-modules
mountPath: /lib/modules
Expand Down Expand Up @@ -1511,9 +1508,6 @@ spec:
path: common-etcd-client.crt
- key: ca.crt
path: common-etcd-client-ca.crt
- configMap:
name: cilium-config
name: cilium-config-path
{{ if CiliumSecret }}
- name: cilium-ipsec-secrets
secret:
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 4a07a56473cdad035456abc6f2dd3515f3437ef4492f8d6f0e397f7951b2f9ad
manifestHash: 3e326a45535c1c5efecc1723ec7bdc9a79cd16fea06b28bf014ad46a1bab6bf6
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 4a07a56473cdad035456abc6f2dd3515f3437ef4492f8d6f0e397f7951b2f9ad
manifestHash: 3e326a45535c1c5efecc1723ec7bdc9a79cd16fea06b28bf014ad46a1bab6bf6
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 4a07a56473cdad035456abc6f2dd3515f3437ef4492f8d6f0e397f7951b2f9ad
manifestHash: 3e326a45535c1c5efecc1723ec7bdc9a79cd16fea06b28bf014ad46a1bab6bf6
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
Loading