Skip to content

Commit 89af977

Browse files
ameukamameukam
committed
Bump cilium to 1.17 for kOps 1.33
Release notes: cilium/cilium#37434
1 parent 99ba10e commit 89af977

File tree

30 files changed

+93
-93
lines changed

30 files changed

+93
-93
lines changed

‎docs/releases/1.33-NOTES.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@ This is a document to gather the release notes prior to the release.
66

77
# Significant changes
88

9-
* TODO
9+
- TODO
1010

1111
## Some Feature
1212

13-
* TODO
13+
- TODO
1414

1515
## AWS
1616

17-
* TODO
17+
- TODO
1818

1919
## GCP
2020

21-
* TODO
21+
- TODO
2222

2323
## Openstack
2424

25-
* TODO
25+
- TODO
2626

2727
# Other changes of note
2828

29-
* TODO
29+
- Cilium has been upgraded to v1.17
3030

3131
# Breaking changes
3232

3333
## Other breaking changes
3434

35-
* TODO
35+
- TODO
3636

3737
# Known Issues
3838

39-
* TODO
39+
- TODO
4040

4141
# Deprecations
4242

43-
* Support for Kubernetes version 1.27 is deprecated and is removed in kOps 1.33.
43+
- Support for Kubernetes version 1.27 is deprecated and is removed in kOps 1.33.
4444

45-
* Support for Kubernetes version 1.28 is deprecated and will be removed in kOps 1.34.
45+
- Support for Kubernetes version 1.28 is deprecated and will be removed in kOps 1.34.

‎pkg/apis/kops/validation/validation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,8 +1248,8 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
12481248
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version"))
12491249
}
12501250

1251-
if version.Minor != 16 {
1252-
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.16 is supported"))
1251+
if version.Minor != 17 {
1252+
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.17 is supported"))
12531253
}
12541254

12551255
if v.Hubble != nil && fi.ValueOf(v.Hubble.Enabled) {

‎pkg/apis/kops/validation/validation_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ func Test_Validate_Cilium(t *testing.T) {
12041204
},
12051205
{
12061206
Cilium: kops.CiliumNetworkingSpec{
1207-
Version: "v1.16.0",
1207+
Version: "v1.17.0",
12081208
Ingress: &kops.CiliumIngressSpec{
12091209
Enabled: fi.PtrTo(true),
12101210
DefaultLoadBalancerMode: "bad-value",
@@ -1214,7 +1214,7 @@ func Test_Validate_Cilium(t *testing.T) {
12141214
},
12151215
{
12161216
Cilium: kops.CiliumNetworkingSpec{
1217-
Version: "v1.16.0",
1217+
Version: "v1.17.0",
12181218
Ingress: &kops.CiliumIngressSpec{
12191219
Enabled: fi.PtrTo(true),
12201220
DefaultLoadBalancerMode: "dedicated",
@@ -1223,7 +1223,7 @@ func Test_Validate_Cilium(t *testing.T) {
12231223
},
12241224
{
12251225
Cilium: kops.CiliumNetworkingSpec{
1226-
Version: "v1.16.0",
1226+
Version: "v1.17.0",
12271227
Hubble: &kops.HubbleSpec{
12281228
Enabled: fi.PtrTo(true),
12291229
},

‎pkg/model/components/cilium.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4040
}
4141

4242
if c.Version == "" {
43-
c.Version = "v1.16.5"
43+
c.Version = "v1.17.1"
4444
}
4545

4646
if c.EnableEndpointHealthChecking == nil {

‎tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ spec:
212212
sidecarIstioProxyImage: cilium/istio_proxy
213213
toFqdnsDnsRejectResponseCode: refused
214214
tunnel: disabled
215-
version: v1.16.5
215+
version: v1.17.1
216216
nodeTerminationHandler:
217217
cpuRequest: 50m
218218
deleteSQSMsgIfNodeNotFound: false

‎tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
version: 9.99.0
100100
- id: k8s-1.16
101101
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
102-
manifestHash: ec67d5e19b40dc4ec1c07fe956904c93630ef98a1f93cfd9c6eb9004c8e050ea
102+
manifestHash: 66ae0d7134426dfa95d12a20d62faaa4471e3f4efbf057117495c8044494292d
103103
name: networking.cilium.io
104104
needsRollingUpdate: all
105105
selector:

‎tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ spec:
582582
value: api.internal.minimal-ipv6.example.com
583583
- name: KUBERNETES_SERVICE_PORT
584584
value: "443"
585-
image: quay.io/cilium/cilium:v1.16.5
585+
image: quay.io/cilium/cilium:v1.17.1
586586
imagePullPolicy: IfNotPresent
587587
lifecycle:
588588
preStop:
@@ -700,7 +700,7 @@ spec:
700700
value: api.internal.minimal-ipv6.example.com
701701
- name: KUBERNETES_SERVICE_PORT
702702
value: "443"
703-
image: quay.io/cilium/cilium:v1.16.5
703+
image: quay.io/cilium/cilium:v1.17.1
704704
imagePullPolicy: IfNotPresent
705705
name: config
706706
terminationMessagePolicy: FallbackToLogsOnError
@@ -719,7 +719,7 @@ spec:
719719
value: /run/cilium/cgroupv2
720720
- name: BIN_PATH
721721
value: /opt/cni/bin
722-
image: quay.io/cilium/cilium:v1.16.5
722+
image: quay.io/cilium/cilium:v1.17.1
723723
imagePullPolicy: IfNotPresent
724724
name: mount-cgroup
725725
securityContext:
@@ -746,7 +746,7 @@ spec:
746746
env:
747747
- name: BIN_PATH
748748
value: /opt/cni/bin
749-
image: quay.io/cilium/cilium:v1.16.5
749+
image: quay.io/cilium/cilium:v1.17.1
750750
imagePullPolicy: IfNotPresent
751751
name: apply-sysctl-overwrites
752752
securityContext:
@@ -770,7 +770,7 @@ spec:
770770
- /bin/bash
771771
- -c
772772
- --
773-
image: quay.io/cilium/cilium:v1.16.5
773+
image: quay.io/cilium/cilium:v1.17.1
774774
imagePullPolicy: IfNotPresent
775775
name: mount-bpf-fs
776776
securityContext:
@@ -805,7 +805,7 @@ spec:
805805
value: api.internal.minimal-ipv6.example.com
806806
- name: KUBERNETES_SERVICE_PORT
807807
value: "443"
808-
image: quay.io/cilium/cilium:v1.16.5
808+
image: quay.io/cilium/cilium:v1.17.1
809809
imagePullPolicy: IfNotPresent
810810
name: clean-cilium-state
811811
securityContext:
@@ -830,7 +830,7 @@ spec:
830830
name: cilium-run
831831
- command:
832832
- /install-plugin.sh
833-
image: quay.io/cilium/cilium:v1.16.5
833+
image: quay.io/cilium/cilium:v1.17.1
834834
imagePullPolicy: IfNotPresent
835835
name: install-cni-binaries
836836
resources:
@@ -993,7 +993,7 @@ spec:
993993
value: api.internal.minimal-ipv6.example.com
994994
- name: KUBERNETES_SERVICE_PORT
995995
value: "443"
996-
image: quay.io/cilium/operator:v1.16.5
996+
image: quay.io/cilium/operator:v1.17.1
997997
imagePullPolicy: IfNotPresent
998998
livenessProbe:
999999
httpGet:

‎tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ConfigServer:
153153
- https://kops-controller.internal.minimal-warmpool.example.com:3988/
154154
InstanceGroupName: nodes
155155
InstanceGroupRole: Node
156-
NodeupConfigHash: cx4pXSvDOgr+SqcmYZll2ol8Zr1R2mvPBA6r+1p6SBo=
156+
NodeupConfigHash: OlbIZ+owUMoXRoRKpoP1iIbn6nG2V2M+fqkmvQnyNzs=
157157
158158
__EOF_KUBE_ENV
159159

‎tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ spec:
204204
sidecarIstioProxyImage: cilium/istio_proxy
205205
toFqdnsDnsRejectResponseCode: refused
206206
tunnel: vxlan
207-
version: v1.16.5
207+
version: v1.17.1
208208
nodeTerminationHandler:
209209
cpuRequest: 50m
210210
deleteSQSMsgIfNodeNotFound: false

‎tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
version: 9.99.0
100100
- id: k8s-1.16
101101
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
102-
manifestHash: 79c3afa98cfb90c97da58bbc799657538111c520785c9191ceabcacd65890cd3
102+
manifestHash: 82d4bd443decad7b6cfdbae28bf7c95199278a7ff8ad97b46997b30b6a596a01
103103
name: networking.cilium.io
104104
needsRollingUpdate: all
105105
selector:

0 commit comments

Comments
 (0)