Skip to content

Commit f2407c8

Browse files
authored
Merge pull request #21 from Ferlab-Ste-Justine/feat/k8s-upgrade
feat: INFRA-703 prepare k8s upgrade
2 parents 939763c + bcac597 commit f2407c8

File tree

4 files changed

+35
-21
lines changed

4 files changed

+35
-21
lines changed

kubespray/configurations/all/etcd.yml

+32-7
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,46 @@ etcd_data_dir: /var/lib/etcd
1616
etcd_deployment_type: host
1717

1818
etcd_supported_versions:
19-
v1.25: "v3.5.14"
20-
v1.24: "v3.5.14"
21-
v1.23: "v3.5.14"
19+
v1.29: "v3.5.14"
20+
v1.28: "v3.5.14"
21+
v1.27: "v3.5.14"
2222

2323
etcd_binary_checksums:
2424
# Etcd does not have arm32 builds at the moment, having some dummy value is
2525
# required to avoid "no attribute" error
2626
arm:
27+
v3.5.14: 0
28+
v3.5.12: 0
29+
v3.5.11: 0
30+
v3.5.10: 0
31+
v3.5.9: 0
32+
v3.5.8: 0
33+
v3.5.7: 0
2734
v3.5.6: 0
2835
arm64:
29-
v3.5.6: 888e25c9c94702ac1254c7655709b44bb3711ebaabd3cb05439f3dd1f2b51a87
3036
v3.5.14: 90510c79c4aae3c3313691f5770fc53b3ac883338fc0254bf8d22460acd3c19d
37+
v3.5.12: 31f30c01918771ece28d6e553e0f33be9483ced989896ecf6bbe1edb07786141
38+
v3.5.11: 6edf0cddc8fa2d7674129abe2e44d5a37cc3a6e3b500c13c6cbc2ed2ecf08bf4
39+
v3.5.10: ff74a6018d9b2a1320bff30e5a11b4f2f5c2a3d147df8a8bad53c01b9f800ee1
40+
v3.5.9: bb201c106a61bbab59e2d9f37f4bdff99d50201f513c66b4578741eab581fb28
41+
v3.5.8: 3f4441b293a2d0d4d2f8b2cd9504376e15818f7b865ef4b436e8e6f865f895ff
42+
v3.5.7: 1a35314900da7db006b198dd917e923459b462128101736c63a3cda57ecdbf51
43+
v3.5.6: 888e25c9c94702ac1254c7655709b44bb3711ebaabd3cb05439f3dd1f2b51a87
3144
amd64:
32-
v3.5.6: 4db32e3bc06dd0999e2171f76a87c1cffed8369475ec7aa7abee9023635670fb
3345
v3.5.14: b0b34298f53f6830f08e7ddc57fc74dc45563216a66e94d9e6b0b9e0b0281b34
46+
v3.5.12: f2ff0cb43ce119f55a85012255609b61c64263baea83aa7c8e6846c0938adca5
47+
v3.5.11: e256885e753dc99001335e099d3c2eb8cf21a865a087ee4d7e3665752ae5929a
48+
v3.5.10: 26e90d024fa2310bc52bb40e7f2132e81640b55f8fc446c00ae07e30af2a44fd
49+
v3.5.9: d59017044eb776597eca480432081c5bb26f318ad292967029af1f62b588b042
50+
v3.5.8: d4c1b8d90ad53658f12ffc293afc5694b7bc6cb093af609188649a799e1cc8dc
51+
v3.5.7: a43119af79c592a874e8f59c4f23832297849d0c479338f9df36e196b86bc396
52+
v3.5.6: 4db32e3bc06dd0999e2171f76a87c1cffed8369475ec7aa7abee9023635670fb
3453
ppc64le:
35-
v3.5.6: e235cb885996b8aac133975e0077eaf0a2f8dc7062ad052fa7395668a365906b
36-
v3.5.14: 01681d4d33bba5130c9cffca42c35b0f68e0d991b0b4ee65dab6fd36568d4fee
54+
v3.5.14: 01681d4d33bba5130c9cffca42c35b0f68e0d991b0b4ee65dab6fd36568d4fee
55+
v3.5.12: ebd8060508d572678d8d1e4f90f87863e3a6cfcba856ceca32379b03251c0597
56+
v3.5.11: a2e70b291811fa8ccc34cc7d297bf7d31e3af790bc31e54cad034a49e9db2eb7
57+
v3.5.10: 10cd8e4ecf6718b9712bf2edfac2e4924d7f21dbe58d368e6e10578c85bd8c01
58+
v3.5.9: 551539ebb344ebdc77f170ea51512a6cda35877ffdcbd8b3316b2495a8b2bd87
59+
v3.5.8: 20e28302c1424b1a3daf7d817f2662e4c64e395a82765d1696cb53cb6bc37a4e
60+
v3.5.7: e861aa6acd4d326ec01bfa06fffb80d33f3f8c26e0eb8b73e4424578d149bd04
61+
v3.5.6: e235cb885996b8aac133975e0077eaf0a2f8dc7062ad052fa7395668a365906b

kubespray/configurations/k8s_cluster/addons.yml

-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ ingress_publish_status_address: ""
114114
ingress_nginx_namespace: "ingress-nginx"
115115
ingress_nginx_insecure_port: ${ingress_http_port}
116116
ingress_nginx_secure_port: ${ingress_https_port}
117-
ingress_nginx_configmap:
118-
ssl-redirect: "false"
119117
# map-hash-bucket-size: "128"
120118
# ssl-protocols: "TLSv1.2 TLSv1.3"
121119
# ingress_nginx_configmap_tcp_services:

kubespray/configurations/k8s_cluster/k8s-cluster.yml

-9
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,6 @@ kubernetes_audit: false
243243
# kubelet_config_dir:
244244
default_kubelet_config_dir: "{{ kube_config_dir }}/dynamic_kubelet_dir"
245245

246-
# pod security policy (RBAC must be enabled either by having 'RBAC' in authorization_modes or kubeadm enabled)
247-
podsecuritypolicy_enabled: false
248-
249-
# Custom PodSecurityPolicySpec for restricted policy
250-
# podsecuritypolicy_restricted_spec: {}
251-
252-
# Custom PodSecurityPolicySpec for privileged policy
253-
# podsecuritypolicy_privileged_spec: {}
254-
255246
# Make a copy of kubeconfig on the host that runs Ansible in {{ inventory_dir }}/artifacts
256247
kubeconfig_localhost: true
257248
artifacts_dir: ${artifacts_dir}

variables.tf

+3-3
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.25.6"
102+
default = "v1.29.5"
103103
}
104104

105105
variable "custom_container_repos" {
@@ -173,13 +173,13 @@ variable "kubespray_repo" {
173173
variable "kubespray_repo_ref" {
174174
description = "Tag or branch to checkout once the repository is cloned"
175175
type = string
176-
default = "v2.21.0"
176+
default = "v2.25.0"
177177
}
178178

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

185185
variable "ingress_arguments" {

0 commit comments

Comments
 (0)