Skip to content

Commit a965b9b

Browse files
committed
feat: INFRA-999 Upgrade k8s to 1.31.4
1 parent 5d15276 commit a965b9b

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

kubespray/configurations/all/etcd.yml

+15-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ etcd_data_dir: /var/lib/etcd
1616
etcd_deployment_type: host
1717

1818
etcd_supported_versions:
19-
v1.29: "v3.5.14"
20-
v1.28: "v3.5.14"
21-
v1.27: "v3.5.14"
19+
v1.32: "v3.5.16"
20+
v1.31: "v3.5.16"
21+
v1.30: "v3.5.16"
2222

2323
etcd_binary_checksums:
24-
# Etcd does not have arm32 builds at the moment, having some dummy value is
25-
# required to avoid "no attribute" error
2624
arm:
25+
v3.5.16: 0
26+
v3.5.15: 0
2727
v3.5.14: 0
28+
v3.5.13: 0
2829
v3.5.12: 0
2930
v3.5.11: 0
3031
v3.5.10: 0
@@ -33,7 +34,10 @@ etcd_binary_checksums:
3334
v3.5.7: 0
3435
v3.5.6: 0
3536
arm64:
37+
v3.5.16: 8e68c55e6d72b791a9e98591c755af36f6f55aa9eca63767822cd8a3817fdb23
38+
v3.5.15: 5aa28b435edb1f22bf6455f754e16a13e3e4eb1ad8fc7c22ad47aa8e722febf2
3639
v3.5.14: 90510c79c4aae3c3313691f5770fc53b3ac883338fc0254bf8d22460acd3c19d
40+
v3.5.13: 2854993bf622764ccdeb7a146fae2965cb0fcba93c5c8f391e0d5f153c8a7a02
3741
v3.5.12: 31f30c01918771ece28d6e553e0f33be9483ced989896ecf6bbe1edb07786141
3842
v3.5.11: 6edf0cddc8fa2d7674129abe2e44d5a37cc3a6e3b500c13c6cbc2ed2ecf08bf4
3943
v3.5.10: ff74a6018d9b2a1320bff30e5a11b4f2f5c2a3d147df8a8bad53c01b9f800ee1
@@ -42,7 +46,10 @@ etcd_binary_checksums:
4246
v3.5.7: 1a35314900da7db006b198dd917e923459b462128101736c63a3cda57ecdbf51
4347
v3.5.6: 888e25c9c94702ac1254c7655709b44bb3711ebaabd3cb05439f3dd1f2b51a87
4448
amd64:
49+
v3.5.16: b414b27a5ad05f7cb01395c447c85d3227e3fb1c176e51757a283b817f645ccc
50+
v3.5.15: 3f6b48d8c2844699f2b19c1880508ecf63e1489769ed37ebb97495d5cd848a89
4551
v3.5.14: b0b34298f53f6830f08e7ddc57fc74dc45563216a66e94d9e6b0b9e0b0281b34
52+
v3.5.13: 31e6fcbee0e8c3df27cf1ba69b522e338377f5ed6447f5d05700aee367f3b7e7
4653
v3.5.12: f2ff0cb43ce119f55a85012255609b61c64263baea83aa7c8e6846c0938adca5
4754
v3.5.11: e256885e753dc99001335e099d3c2eb8cf21a865a087ee4d7e3665752ae5929a
4855
v3.5.10: 26e90d024fa2310bc52bb40e7f2132e81640b55f8fc446c00ae07e30af2a44fd
@@ -51,7 +58,10 @@ etcd_binary_checksums:
5158
v3.5.7: a43119af79c592a874e8f59c4f23832297849d0c479338f9df36e196b86bc396
5259
v3.5.6: 4db32e3bc06dd0999e2171f76a87c1cffed8369475ec7aa7abee9023635670fb
5360
ppc64le:
61+
v3.5.16: 33322806f4a2aa3d4947a4d42ec6a120296535e7f00e2f9d74e515e9386333e0
62+
v3.5.15: 6512f7308a0d0af7c9bb46bca1c4f4e816304304d838d1045ae21d9772c5490e
5463
v3.5.14: 01681d4d33bba5130c9cffca42c35b0f68e0d991b0b4ee65dab6fd36568d4fee
64+
v3.5.13: f372b524e2c118dbb0dbe1097474a072fc93bc30da65efa92999137303bcd9a7
5565
v3.5.12: ebd8060508d572678d8d1e4f90f87863e3a6cfcba856ceca32379b03251c0597
5666
v3.5.11: a2e70b291811fa8ccc34cc7d297bf7d31e3af790bc31e54cad034a49e9db2eb7
5767
v3.5.10: 10cd8e4ecf6718b9712bf2edfac2e4924d7f21dbe58d368e6e10578c85bd8c01

kubespray/configurations/k8s_cluster/k8s-cluster.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,4 @@ auto_renew_certificates: false
351351
# auto_renew_certificates_systemd_calendar: "Mon *-*-1,2,3,4,5,6,7 03:{{ groups['kube_control_plane'].index(inventory_hostname) }}0:00"
352352

353353
# kubeadm patches path
354-
kubeadm_patches:
355-
enabled: false
356-
source_dir: "{{ inventory_dir }}/patches"
357-
dest_dir: "{{ kube_config_dir }}/patches"
354+
kubeadm_patches: []

variables.tf

+8-7
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ variable "k8_cluster_name" {
9999
variable "k8_version" {
100100
description = "Kubernetes version to install"
101101
type = string
102-
default = "v1.29.5"
102+
default = "v1.31.4"
103103
}
104104

105105
variable "custom_container_repos" {
@@ -166,22 +166,23 @@ variable "front_proxy_ca_private_key" {
166166

167167
variable "kubespray_repo" {
168168
description = "Repository to clone kubespray from"
169-
type = string
170-
default = "https://github.com/kubernetes-sigs/kubespray.git"
169+
type = string
170+
default = "https://github.com/kubernetes-sigs/kubespray.git"
171171
}
172172

173173
variable "kubespray_repo_ref" {
174174
description = "Tag or branch to checkout once the repository is cloned"
175-
type = string
176-
default = "v2.25.0"
175+
type = string
176+
default = "v2.27.0"
177177
}
178178

179179
variable "kubespray_image" {
180180
description = "Docker image of kubespray"
181-
type = string
182-
default = "quay.io/kubespray/kubespray:v2.25.0"
181+
type = string
182+
default = "quay.io/kubespray/kubespray:v2.27.0"
183183
}
184184

185+
185186
variable "ingress_arguments" {
186187
description = "List of arguments to pass to the nginx ingress. Hyphens should be included in the values."
187188
type = list(string)

0 commit comments

Comments
 (0)