Skip to content

Commit

Permalink
feat: add compatibility to 1.31 on ansible roles
Browse files Browse the repository at this point in the history
  • Loading branch information
nutellinoit committed Nov 29, 2024
1 parent 70ac62f commit ab25334
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
6 changes: 5 additions & 1 deletion roles/containerd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runc_download_url: "https://github.com/opencontainers/runc/releases/download/{{
runc_checksum: "sha256:https://github.com/opencontainers/runc/releases/download/{{ versions[kubernetes_version].runc_version }}/runc.sha256sum"

# Customize versions based on Kubernetes version to maintain compatibility
kubernetes_version: "1.30.6"
kubernetes_version: "1.31.3"
# Resgistry where to pull the pause (sandbox) image. We use the same name used in other roles for simplicity.
# Upstream registry is "k8s.gcr.io"
kubernetes_image_registry: "registry.sighup.io/fury/on-premises"
Expand Down Expand Up @@ -45,6 +45,10 @@ versions:
containerd_version: "1.7.23"
runc_version: "v1.1.14" # use this link (with the correct tag) to know which version of runc is needed https://github.com/containerd/containerd/blob/v1.7.23/script/setup/runc-version
sandbox_image: "{{ kubernetes_image_registry }}/pause:3.9"
1.31.3:
containerd_version: "1.7.23"
runc_version: "v1.1.14" # use this link (with the correct tag) to know which version of runc is needed https://github.com/containerd/containerd/blob/v1.7.23/script/setup/runc-version
sandbox_image: "{{ kubernetes_image_registry }}/pause:3.9"

# Service options.
containerd_service_state: started
Expand Down
4 changes: 3 additions & 1 deletion roles/kube-control-plane/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kubernetes_cloud_config: ""
# Accepts a list of strings, in which each string can be either an IP Address or a domain
kubernetes_apiserver_certSANs: []
kubernetes_control_plane_address: "{{ ansible_hostname }}"
kubernetes_version: "1.30.6"
kubernetes_version: "1.31.3"
kubernetes_image_registry: "{{ dependencies[kubernetes_version].kubernetes_image_registry }}"
coredns_image_prefix: "{{ dependencies[kubernetes_version].coredns_image_prefix | default('/coredns') }}"
kubernetes_hostname: "{{ ansible_fqdn }}"
Expand Down Expand Up @@ -56,4 +56,6 @@ dependencies:
"1.29.10":
kubernetes_image_registry: "registry.sighup.io/fury/on-premises"
"1.30.6":
kubernetes_image_registry: "registry.sighup.io/fury/on-premises"
"1.31.3":
kubernetes_image_registry: "registry.sighup.io/fury/on-premises"
15 changes: 14 additions & 1 deletion roles/kube-node-common/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
kubernetes_version: "1.30.6"
kubernetes_version: "1.31.3"
kubelet_version: "{{ kubernetes_version }}"
kubectl_version: "{{ kubernetes_version }}"
kubeadm_version: "{{ kubernetes_version }}"
Expand Down Expand Up @@ -79,6 +79,19 @@ dependencies:
gpg_key: https://pkgs.k8s.io/core:/stable:/v1.30/rpm/repodata/repomd.xml.key
gpg_key_check: yes
repo_gpg_check: yes
"1.31.3":
critools_version: "1.31.0"
apt:
name: k8s-1.31
repo: "deb https://pkgs.k8s.io/core:/stable:/v1.31/deb/ /"
gpg_key: "https://pkgs.k8s.io/core:/stable:/v1.31/deb/Release.key"
gpg_key_id: "DE15B14486CD377B9E876E1A234654DA9A296436"
yum:
name: k8s-1.31
repo: https://pkgs.k8s.io/core:/stable:/v1.31/rpm/
gpg_key: https://pkgs.k8s.io/core:/stable:/v1.31/rpm/repodata/repomd.xml.key
gpg_key_check: yes
repo_gpg_check: yes

dependencies_override: {}

Expand Down

0 comments on commit ab25334

Please sign in to comment.