Skip to content

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

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

Merged
merged 2 commits into from
Apr 5, 2025
Merged

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

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
d9ab61e
remove cilium-config-path mount in cilium-agent container
admun Mar 21, 2025
21d3d64
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 @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: ec67d5e19b40dc4ec1c07fe956904c93630ef98a1f93cfd9c6eb9004c8e050ea
manifestHash: 2702f424fb933a512ea62e7a54d6bc50d21a7e05a300124e78d5bfd813428530
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: 79c3afa98cfb90c97da58bbc799657538111c520785c9191ceabcacd65890cd3
manifestHash: 40c2177df8f27c68c9e166950d9160459d4f6c1313c84227e413e719ee9496c4
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: b8ff520e1fab86258a9119be0ce2e56d2975f8658db16d6fb74ebd5a62daa24d
manifestHash: 93dc737d1780256255be19280d27b2c5a9a76bd4f01140d3f85a0ddb8113e9cb
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: adccc130fb74a2aaf5784d76e54f1798aff3fd51e4e1aea1ed3a567d37d79a5f
manifestHash: dcd7b9cc492c0835bf83d5b64d6a6723dec9fb67c13e5fa4b5c64000687f7926
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: bb8ab0eb9b524b3d24f1c4d6ce49f16897cf7160d4e8551b2100833d592a5fca
manifestHash: a33f6e8142b7518c0849b6948ef56ec1a8f86f4555361b7623402850ab14ab24
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: d517037904591938b5a8f391024ed9c561e54f7adc5bf4bfaf243d2a10a4967a
manifestHash: d89aa3fa15c7325e0aacfb9a1a27768bf0dc230036448aed52425f3eca9249bc
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: bc3bc87fdbfa9e1721539e67523eb0803e59acc35f5a98189e915bcfc0e4a12f
manifestHash: 72476f006c4ba3bb31bc28e3fec1c5bab6523647893bccc747fe887069556319
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: 75f56f20d00fdfff26d59fcf430cba0679639a4625ce0907de47509f1a8de67a
manifestHash: 663d0be87fe9b2bc2c0405873587d640047479393c32decb12536fc5e0de6e70
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 @@ -113,7 +113,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 75f56f20d00fdfff26d59fcf430cba0679639a4625ce0907de47509f1a8de67a
manifestHash: 663d0be87fe9b2bc2c0405873587d640047479393c32decb12536fc5e0de6e70
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 @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 75f56f20d00fdfff26d59fcf430cba0679639a4625ce0907de47509f1a8de67a
manifestHash: 663d0be87fe9b2bc2c0405873587d640047479393c32decb12536fc5e0de6e70
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
Loading