Skip to content

Bump cilium to 1.17 for kOps 1.33 #17266

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

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
ec9287c
Bump Cilium to 1.17
ameukam Mar 10, 2025
e1a36e5
Mount /var/run/netns
ameukam Mar 10, 2025
4d77d77
Generate helm template
ameukam Mar 16, 2025
ba56aaa
./hack/update-expected.sh executed
ameukam Sep 2, 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 @@ -41,7 +41,7 @@ kOps 1.33.0 introduces significant improvements to cloud provider support, netwo
## Container Runtime and Component Updates

### Major Version Updates
* Update Cilium to v1.16.7
* Update Cilium to v1.17.7
* Update Calico to v3.29.4
* Update CoreDNS to v1.11.4
* Update containerd to v1.7.28
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 @@ -1245,8 +1245,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
8 changes: 4 additions & 4 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",
GatewayAPI: &kops.CiliumGatewayAPISpec{
Enabled: fi.PtrTo(true),
EnableSecretsSync: fi.PtrTo(true),
Expand All @@ -1232,7 +1232,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.7"
}

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 @@ -217,7 +217,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: disabled
version: v1.16.7
version: v1.17.7
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: ef83322197fa3f645effca0229c7e508d2b6c758c388c62c0a126715bed529b7
manifestHash: 5d45b38438614bdb4b9549540a7aeb02a1a38c5bd83170ddb1daabdc30bbbd55
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
953 changes: 824 additions & 129 deletions .../data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -149,7 +149,7 @@ ConfigServer:
- https://kops-controller.internal.minimal-warmpool.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: b2zV5MSx4wad58ywLyeV0/LObHqwQ0SjBopYkbZCJi8=
NodeupConfigHash: 5Ja2a9+Pax0+bsoFt1+S+88CNUdeLS+Duf59tsR3mfM=

__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 @@ -211,7 +211,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.7
version: v1.17.7
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: d9cf37239f73ec224904209dfcfdbd79330c202bab99fe823d7bf3bf91988212
manifestHash: ad14c72e6cdf2d5a2ef7c1918bb7f5a22fb34bc9846d0b43b9856d49ae628335
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
964 changes: 829 additions & 135 deletions ...a/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 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 @@ -57,8 +57,9 @@ containerdConfig:
usesLegacyGossip: false
usesNoneDNS: false
warmPoolImages:
- kops.k8s.io/remapped-image/cilium/cilium:v1.16.7
- kops.k8s.io/remapped-image/cilium/operator:v1.16.7
- kops.k8s.io/remapped-image/cilium/cilium:v1.17.7@sha256:b22440f49c61195171aca585c7a57c6a8867271e43a5abc38f2a2f561436ff86
- kops.k8s.io/remapped-image/cilium/hubble-relay:v1.17.7@sha256:9394312ce65c3c253a8c26a6c292f58736e75c78d1446ecfcd244f1418bebe77
- kops.k8s.io/remapped-image/cilium/operator-generic:v1.17.7@sha256:a610be2562d0f5a8945a27df7d5681711263ce92e09947e867fc37fc9ab08788
- kops.k8s.io/remapped-image/kube-proxy:v1.32.0
- kops.k8s.io/remapped-image/provider-aws/aws-ebs-csi-driver:v1.47.0
- kops.k8s.io/remapped-image/provider-aws/cloud-controller-manager:v1.31.0
Expand Down
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 @@ -205,7 +205,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.7
version: v1.17.7
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: d2cd13682c1764c0bfef35c97a19b1d2b335ccf03822d2912121a3adbeef5830
manifestHash: 5d45b38438614bdb4b9549540a7aeb02a1a38c5bd83170ddb1daabdc30bbbd55
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
Loading
Loading