Skip to content

Commit

Permalink
bump to 1.32 and update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
kubealex committed Dec 31, 2024
1 parent fd1f2de commit 32c5bdb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
4 changes: 4 additions & 0 deletions 12_setup_kubeadm_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
vars_files:
- vars/k8s_cluster.yml
tasks:
- name: Set fact for k8s version
ansible.builtin.set_fact:
kubernetes_version: v{{ k8s.cluster_version }}.{{ '12' if k8s.cluster_version is version('1.29', '==') else '8' if k8s.cluster_version is version('1.30', '==') else '4' if k8s.cluster_version is version('1.31', '==') else '0' if k8s.cluster_version is version('1.32', '==') }}

- name: Process installation if cluster is not set
when: k8s_installed is not defined
block:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ It is a hobby project, so it's not supported for production usage, but feel free

Kubernetes version that is installed can be choosen between:

- **1.31** - Latest 1.31 release (1.31.0)
- **1.30** - Latest 1.30 release (1.30.4)
- **1.29** - Latest 1.29 release (1.29.8)
- **1.28** - Latest 1.28 release (1.28.13)
- **1.32** - Latest 1.32 release (1.32.0)
- **1.31** - Latest 1.31 release (1.31.4)
- **1.30** - Latest 1.30 release (1.30.8)
- **1.29** - Latest 1.29 release (1.29.12)

Terraform will take care of the provisioning via terraform of:

Expand Down Expand Up @@ -181,7 +181,7 @@ Recommended sizings are:
Size for **disk** and **mem** is in GB.
**disk** allows to provision space in the cloud image for pod's ephemeral storage.
**cluster_version** can be 1.28, 1.29, 1.30, 1.31 to install the corresponding latest version for the release
**cluster_version** can be 1.29, 1.39, 1.31, 1.32 to install the corresponding latest version for the release
VMS are created with these names by default (customizing them is work in progress):
Expand Down
10 changes: 5 additions & 5 deletions group_vars/vm_host/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
workspace_directory:
base_path: "{{ home_dir }}/k8s-setup"

terraform_url: https://releases.hashicorp.com/terraform/1.9.5/terraform_1.9.5_linux_amd64.zip
terraform_url: https://releases.hashicorp.com/terraform/1.10.3/terraform_1.10.3_linux_amd64.zip
image_name: OS-GenericCloud
centos:
cloud_image: https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2
Expand Down Expand Up @@ -81,8 +81,8 @@ os_packages:

cni_plugins:
calico:
calico_operator: https://raw.githubusercontent.com/projectcalico/calico/v3.27.3/manifests/tigera-operator.yaml
calico_crd: https://raw.githubusercontent.com/projectcalico/calico/v3.27.3/manifests/custom-resources.yaml
calico_operator: https://raw.githubusercontent.com/projectcalico/calico/v3.29.1/manifests/tigera-operator.yaml
calico_crd: https://raw.githubusercontent.com/projectcalico/calico/v3.29.1/manifests/custom-resources.yaml
flannel:
flannel_repo: https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml
cilium:
Expand All @@ -109,7 +109,7 @@ ingress:
ref: haproxytech/kubernetes-ingress

helm:
helm_installer: https://get.helm.sh/helm-v3.14.0-linux-amd64.tar.gz
helm_installer: https://get.helm.sh/helm-v3.16.2-linux-amd64.tar.gz

rook:
operator:
Expand All @@ -124,4 +124,4 @@ rook:
ref: rook-release/rook-ceph-cluster

metallb_setup:
manifest_url: https://raw.githubusercontent.com/metallb/metallb/v0.14.4/config/manifests
manifest_url: https://raw.githubusercontent.com/metallb/metallb/v0.14.9/config/manifests
2 changes: 1 addition & 1 deletion templates/kubeadm-config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ etcd:
dataDir: /var/lib/etcd
imageRepository: registry.k8s.io
kind: ClusterConfiguration
kubernetesVersion: v{{ k8s.cluster_version }}.{{ '13' if k8s.cluster_version is version('1.28', '==') else '8' if k8s.cluster_version is version('1.29', '==') else '4' if k8s.cluster_version is version('1.30', '==') else '0' if k8s.cluster_version is version('1.31', '==') }}
kubernetesVersion: "{{ kubernetes_version }}"
networking:
dnsDomain: cluster.local
podSubnet: "{{ ('10.244.0.0/16' if (k8s.network.cni_plugin == 'flannel') else k8s.network.pod_cidr) }}"
Expand Down
2 changes: 1 addition & 1 deletion vars/k8s_cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
k8s:
cluster_name: k8s-test
cluster_os: Ubuntu
cluster_version: "1.30"
cluster_version: "1.32"
container_runtime: crio
master_schedulable: false

Expand Down

0 comments on commit 32c5bdb

Please sign in to comment.