diff --git a/kubespray/configurations/all/etcd.yml b/kubespray/configurations/all/etcd.yml index 90291f9..dc1783f 100644 --- a/kubespray/configurations/all/etcd.yml +++ b/kubespray/configurations/all/etcd.yml @@ -16,15 +16,16 @@ etcd_data_dir: /var/lib/etcd etcd_deployment_type: host etcd_supported_versions: - v1.29: "v3.5.14" - v1.28: "v3.5.14" - v1.27: "v3.5.14" + v1.32: "v3.5.16" + v1.31: "v3.5.16" + v1.30: "v3.5.16" etcd_binary_checksums: - # Etcd does not have arm32 builds at the moment, having some dummy value is - # required to avoid "no attribute" error arm: + v3.5.16: 0 + v3.5.15: 0 v3.5.14: 0 + v3.5.13: 0 v3.5.12: 0 v3.5.11: 0 v3.5.10: 0 @@ -33,7 +34,10 @@ etcd_binary_checksums: v3.5.7: 0 v3.5.6: 0 arm64: + v3.5.16: 8e68c55e6d72b791a9e98591c755af36f6f55aa9eca63767822cd8a3817fdb23 + v3.5.15: 5aa28b435edb1f22bf6455f754e16a13e3e4eb1ad8fc7c22ad47aa8e722febf2 v3.5.14: 90510c79c4aae3c3313691f5770fc53b3ac883338fc0254bf8d22460acd3c19d + v3.5.13: 2854993bf622764ccdeb7a146fae2965cb0fcba93c5c8f391e0d5f153c8a7a02 v3.5.12: 31f30c01918771ece28d6e553e0f33be9483ced989896ecf6bbe1edb07786141 v3.5.11: 6edf0cddc8fa2d7674129abe2e44d5a37cc3a6e3b500c13c6cbc2ed2ecf08bf4 v3.5.10: ff74a6018d9b2a1320bff30e5a11b4f2f5c2a3d147df8a8bad53c01b9f800ee1 @@ -42,7 +46,10 @@ etcd_binary_checksums: v3.5.7: 1a35314900da7db006b198dd917e923459b462128101736c63a3cda57ecdbf51 v3.5.6: 888e25c9c94702ac1254c7655709b44bb3711ebaabd3cb05439f3dd1f2b51a87 amd64: + v3.5.16: b414b27a5ad05f7cb01395c447c85d3227e3fb1c176e51757a283b817f645ccc + v3.5.15: 3f6b48d8c2844699f2b19c1880508ecf63e1489769ed37ebb97495d5cd848a89 v3.5.14: b0b34298f53f6830f08e7ddc57fc74dc45563216a66e94d9e6b0b9e0b0281b34 + v3.5.13: 31e6fcbee0e8c3df27cf1ba69b522e338377f5ed6447f5d05700aee367f3b7e7 v3.5.12: f2ff0cb43ce119f55a85012255609b61c64263baea83aa7c8e6846c0938adca5 v3.5.11: e256885e753dc99001335e099d3c2eb8cf21a865a087ee4d7e3665752ae5929a v3.5.10: 26e90d024fa2310bc52bb40e7f2132e81640b55f8fc446c00ae07e30af2a44fd @@ -51,7 +58,10 @@ etcd_binary_checksums: v3.5.7: a43119af79c592a874e8f59c4f23832297849d0c479338f9df36e196b86bc396 v3.5.6: 4db32e3bc06dd0999e2171f76a87c1cffed8369475ec7aa7abee9023635670fb ppc64le: + v3.5.16: 33322806f4a2aa3d4947a4d42ec6a120296535e7f00e2f9d74e515e9386333e0 + v3.5.15: 6512f7308a0d0af7c9bb46bca1c4f4e816304304d838d1045ae21d9772c5490e v3.5.14: 01681d4d33bba5130c9cffca42c35b0f68e0d991b0b4ee65dab6fd36568d4fee + v3.5.13: f372b524e2c118dbb0dbe1097474a072fc93bc30da65efa92999137303bcd9a7 v3.5.12: ebd8060508d572678d8d1e4f90f87863e3a6cfcba856ceca32379b03251c0597 v3.5.11: a2e70b291811fa8ccc34cc7d297bf7d31e3af790bc31e54cad034a49e9db2eb7 v3.5.10: 10cd8e4ecf6718b9712bf2edfac2e4924d7f21dbe58d368e6e10578c85bd8c01 diff --git a/kubespray/configurations/k8s_cluster/k8s-cluster.yml b/kubespray/configurations/k8s_cluster/k8s-cluster.yml index 1e0df9b..609d8b1 100644 --- a/kubespray/configurations/k8s_cluster/k8s-cluster.yml +++ b/kubespray/configurations/k8s_cluster/k8s-cluster.yml @@ -351,7 +351,4 @@ auto_renew_certificates: false # auto_renew_certificates_systemd_calendar: "Mon *-*-1,2,3,4,5,6,7 03:{{ groups['kube_control_plane'].index(inventory_hostname) }}0:00" # kubeadm patches path -kubeadm_patches: - enabled: false - source_dir: "{{ inventory_dir }}/patches" - dest_dir: "{{ kube_config_dir }}/patches" \ No newline at end of file +kubeadm_patches: [] \ No newline at end of file diff --git a/variables.tf b/variables.tf index 9980bae..fe27a6d 100644 --- a/variables.tf +++ b/variables.tf @@ -99,7 +99,7 @@ variable "k8_cluster_name" { variable "k8_version" { description = "Kubernetes version to install" type = string - default = "v1.29.5" + default = "v1.31.4" } variable "custom_container_repos" { @@ -166,22 +166,23 @@ variable "front_proxy_ca_private_key" { variable "kubespray_repo" { description = "Repository to clone kubespray from" - type = string - default = "https://github.com/kubernetes-sigs/kubespray.git" + type = string + default = "https://github.com/kubernetes-sigs/kubespray.git" } variable "kubespray_repo_ref" { description = "Tag or branch to checkout once the repository is cloned" - type = string - default = "v2.25.0" + type = string + default = "v2.27.0" } variable "kubespray_image" { description = "Docker image of kubespray" - type = string - default = "quay.io/kubespray/kubespray:v2.25.0" + type = string + default = "quay.io/kubespray/kubespray:v2.27.0" } + variable "ingress_arguments" { description = "List of arguments to pass to the nginx ingress. Hyphens should be included in the values." type = list(string)