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

Bump cilium to 1.17 for kOps 1.33 #17266

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump cilium to 1.17 for kOps 1.33 #17266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30e00e8
Bump Cilium to 1.17
ameukam Mar 10, 2025
1d1dfed
./hack/update-expected.sh executed
ameukam Mar 10, 2025
5bff7f4
Mount /var/run/netns
ameukam Mar 10, 2025
c22d96e
./hack/update-expected.sh executed
ameukam Mar 10, 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 docs/releases/1.33-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This is a document to gather the release notes prior to the release.

# Other changes of note

* TODO
* Cilium has been upgraded to 1.17

# Breaking changes

Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/kops/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version"))
}

if version.Minor != 16 {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.16 is supported"))
if version.Minor != 17 {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.17 is supported"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to hard-deprecate 1.16 for any reason? I guess this is what we were doing before, but it seems quite aggressive...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will guess that we want to support only 1 version per major kOps release ?
@rifelpet or @hakman may know better about this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cilium requires an updated template with every release, so we either have N large templates or we update for all releases.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the header of [k8s-1.16-v1.15.yaml.template]:(https://github.com/kubernetes/kops/blob/master/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template)

helm template --release-name cilium cilium/cilium \
--version 1.16.2 \
--namespace kube-system \
--values helm-values.yaml

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ameukam did you update the template ^^^?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a partial update fix the CI but I'm not sure about a full update. the diff is pretty big.

}

if v.Hubble != nil && fi.ValueOf(v.Hubble.Enabled) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/kops/validation/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Version: "v1.16.0",
Version: "v1.17.0",
Ingress: &kops.CiliumIngressSpec{
Enabled: fi.PtrTo(true),
DefaultLoadBalancerMode: "bad-value",
Expand All @@ -1214,7 +1214,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Version: "v1.16.0",
Version: "v1.17.0",
Ingress: &kops.CiliumIngressSpec{
Enabled: fi.PtrTo(true),
DefaultLoadBalancerMode: "dedicated",
Expand All @@ -1223,7 +1223,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Version: "v1.16.0",
Version: "v1.17.0",
Hubble: &kops.HubbleSpec{
Enabled: fi.PtrTo(true),
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/cilium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o *kops.Cluster) error {
}

if c.Version == "" {
c.Version = "v1.16.7"
c.Version = "v1.17.1"
}

if c.EnableEndpointHealthChecking == nil {
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: disabled
version: v1.16.7
version: v1.17.1
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
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: 67d42bccab4bb55ae509a3a4138b1f81aada1f04b703b9a013dc3052f67a983c
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
23 changes: 15 additions & 8 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 @@ -582,7 +582,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -665,6 +665,9 @@ spec:
name: cilium-cgroup
- mountPath: /var/run/cilium
name: cilium-run
- mountPath: /var/run/cilium/netns
mountPropagation: HostToContainer
name: cilium-netns
- mountPath: /host/etc/cni/net.d
name: etc-cni-netd
- mountPath: /var/lib/cilium/clustermesh
Expand Down Expand Up @@ -700,7 +703,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: config
terminationMessagePolicy: FallbackToLogsOnError
Expand All @@ -719,7 +722,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: mount-cgroup
securityContext:
Expand All @@ -746,7 +749,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
securityContext:
Expand All @@ -770,7 +773,7 @@ spec:
- /bin/bash
- -c
- --
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
securityContext:
Expand Down Expand Up @@ -805,7 +808,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand All @@ -830,7 +833,7 @@ spec:
name: cilium-run
- command:
- /install-plugin.sh
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: install-cni-binaries
resources:
Expand Down Expand Up @@ -860,6 +863,10 @@ spec:
path: /var/run/cilium
type: DirectoryOrCreate
name: cilium-run
- hostPath:
path: /var/run/netns
type: DirectoryOrCreate
name: cilium-netns
- hostPath:
path: /sys/fs/bpf
type: DirectoryOrCreate
Expand Down Expand Up @@ -993,7 +1000,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/operator:v1.16.7
image: quay.io/cilium/operator:v1.17.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...er/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.minimal-warmpool.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: 5uju3TyrpJia7EVXjpE80ZhpgiJ8lkHOSz6oHXR8ekE=
NodeupConfigHash: OlbIZ+owUMoXRoRKpoP1iIbn6nG2V2M+fqkmvQnyNzs=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...gration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.7
version: v1.17.1
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
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: 77954aa17548c1404ee5ff147cd441f3ef0be5ad736123784dde238ace7b3f36
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
23 changes: 15 additions & 8 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 @@ -583,7 +583,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -666,6 +666,9 @@ spec:
name: cilium-cgroup
- mountPath: /var/run/cilium
name: cilium-run
- mountPath: /var/run/cilium/netns
mountPropagation: HostToContainer
name: cilium-netns
- mountPath: /host/etc/cni/net.d
name: etc-cni-netd
- mountPath: /var/lib/cilium/clustermesh
Expand Down Expand Up @@ -701,7 +704,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: config
terminationMessagePolicy: FallbackToLogsOnError
Expand All @@ -720,7 +723,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: mount-cgroup
securityContext:
Expand All @@ -747,7 +750,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
securityContext:
Expand All @@ -771,7 +774,7 @@ spec:
- /bin/bash
- -c
- --
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
securityContext:
Expand Down Expand Up @@ -806,7 +809,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand All @@ -831,7 +834,7 @@ spec:
name: cilium-run
- command:
- /install-plugin.sh
image: quay.io/cilium/cilium:v1.16.7
image: quay.io/cilium/cilium:v1.17.1
imagePullPolicy: IfNotPresent
name: install-cni-binaries
resources:
Expand Down Expand Up @@ -861,6 +864,10 @@ spec:
path: /var/run/cilium
type: DirectoryOrCreate
name: cilium-run
- hostPath:
path: /var/run/netns
type: DirectoryOrCreate
name: cilium-netns
- hostPath:
path: /sys/fs/bpf
type: DirectoryOrCreate
Expand Down Expand Up @@ -994,7 +1001,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/operator:v1.16.7
image: quay.io/cilium/operator:v1.17.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions ...integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ containerdConfig:
usesLegacyGossip: false
usesNoneDNS: false
warmPoolImages:
- quay.io/cilium/cilium:v1.16.7
- quay.io/cilium/operator:v1.16.7
- quay.io/cilium/cilium:v1.17.1
- quay.io/cilium/operator:v1.17.1
- registry.k8s.io/kube-proxy:v1.32.0
- registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
2 changes: 1 addition & 1 deletion ...gration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.7
version: v1.17.1
nonMasqueradeCIDR: 100.64.0.0/10
podCIDR: 100.96.0.0/11
secretStore: memfs://tests/scw-minimal.k8s.local/secrets
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: 304e50b6609a42e86ccc4985b37b035bd5a363b6c84023700f258b9f5f3caad8
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
Loading
Loading