From 09ed7faf15127d2b25e610cddeeb2c623cf0e13e Mon Sep 17 00:00:00 2001 From: Julien Girardin Date: Mon, 4 Dec 2023 17:37:41 +0100 Subject: [PATCH] Allow to override kubernetes repository --- roles/packages/defaults/main.yml | 1 + roles/packages/vars/os_Debian.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/packages/defaults/main.yml b/roles/packages/defaults/main.yml index 3ae59e3..28cd24e 100644 --- a/roles/packages/defaults/main.yml +++ b/roles/packages/defaults/main.yml @@ -1,6 +1,7 @@ --- _control_plane: false +kubernetes_repository: '{{ kubernetes_upstream_repository }}' kubeadm_pkgs: true node_pkgs: true diff --git a/roles/packages/vars/os_Debian.yml b/roles/packages/vars/os_Debian.yml index bea83a0..25774e6 100644 --- a/roles/packages/vars/os_Debian.yml +++ b/roles/packages/vars/os_Debian.yml @@ -1,6 +1,6 @@ --- _repo_version: '{{ (_target_kubeadm_version|regex_findall("(?:\d+)"))[0:2]|join(".") }}' -kubernetes_repository: >- +kubernetes_upstream_repository: >- {%- if _repo_version is version("1.24", ">=") -%} {{ kubernetes_new_repository }} {%- else -%}