From a0ee850b19df8e7c6adf4f8fcc8ad0f6d249cd3e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 12 Jan 2024 23:10:22 +0100 Subject: switch to new kubernetes apt repo --- inventory/host_vars/ch-equinox-t450s.yml | 2 ++ inventory/host_vars/ch-equinox-ws.yml | 2 ++ roles/apt-repo/kubernetes/files/repo.gpg | Bin 2426 -> 1200 bytes roles/apt-repo/kubernetes/tasks/main.yml | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml index 80614562..23c141e1 100644 --- a/inventory/host_vars/ch-equinox-t450s.yml +++ b/inventory/host_vars/ch-equinox-t450s.yml @@ -303,6 +303,8 @@ ws_base_extra_packages: # needs apt-repo/element - element-desktop +kubernetes_version: "1.28" + ws_minet_wired_interface_name: enp0s25 ws_minet_wired_interface_module: e1000e diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index af5dfc1a..1b831752 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -312,6 +312,8 @@ ws_base_extra_packages: # needs apt-repo/element - element-desktop +kubernetes_version: "1.28" + ws_base_xrandr_setup_script: | #!/bin/bash diff --git a/roles/apt-repo/kubernetes/files/repo.gpg b/roles/apt-repo/kubernetes/files/repo.gpg index 7fe476f8..469208ef 100644 Binary files a/roles/apt-repo/kubernetes/files/repo.gpg and b/roles/apt-repo/kubernetes/files/repo.gpg differ diff --git a/roles/apt-repo/kubernetes/tasks/main.yml b/roles/apt-repo/kubernetes/tasks/main.yml index 5fd2f5c6..aaba3466 100644 --- a/roles/apt-repo/kubernetes/tasks/main.yml +++ b/roles/apt-repo/kubernetes/tasks/main.yml @@ -14,7 +14,7 @@ - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] https://apt.kubernetes.io/ kubernetes-xenial main + deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] https://pkgs.k8s.io/core:/stable:/v{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}/deb/ / dest: /etc/apt/sources.list.d/kubernetes.list register: apt_repo_kubernetes_sources -- cgit v1.2.3