From 0c1fe5fd3c5b441c8d0b8e36997f4293ea891a27 Mon Sep 17 00:00:00 2001
From: Ayumu Ueha <ueha.ayumu@fujitsu.com>
Date: Mon, 4 Mar 2024 15:58:11 +0000
Subject: [PATCH] Change k8s package repository

Closes-Bug: #2055979
Change-Id: Ib43164901cbc23038eff7c2b110078555d5e4ba3
---
 .zuul.d/project.yaml      |  1 -
 .zuul.d/tempest-jobs.yaml |  9 ---------
 devstack/lib/kubernetes   | 19 +++++++++++--------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index d0d30649e..3d1baa370 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -17,7 +17,6 @@
     check:
       jobs:
         - kuryr-kubernetes-tempest
-        - kuryr-kubernetes-tempest-docker
         - kuryr-kubernetes-tempest-defaults
         - kuryr-kubernetes-tempest-systemd
         - kuryr-kubernetes-tempest-multinode
diff --git a/.zuul.d/tempest-jobs.yaml b/.zuul.d/tempest-jobs.yaml
index 8a9730a20..8fff68a74 100644
--- a/.zuul.d/tempest-jobs.yaml
+++ b/.zuul.d/tempest-jobs.yaml
@@ -177,15 +177,6 @@
         KURYR_PROJECT_DRIVER: annotation
     voting: true
 
-- job:
-    name: kuryr-kubernetes-tempest-docker
-    parent: kuryr-kubernetes-octavia-base
-    vars:
-      devstack_localrc:
-        CONTAINER_ENGINE: docker
-        KURYR_KUBERNETES_VERSION: 1.23.16
-    voting: true
-
 - job:
     name: kuryr-kubernetes-tempest-amphora
     parent: kuryr-kubernetes-base-ovn
diff --git a/devstack/lib/kubernetes b/devstack/lib/kubernetes
index 1b9c1425a..403479c8f 100644
--- a/devstack/lib/kubernetes
+++ b/devstack/lib/kubernetes
@@ -17,19 +17,22 @@ distribution.")
     fi
 
     if is_ubuntu; then
-        apt_get install apt-transport-https
-        curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
-            sudo apt-key add -
-        sudo add-apt-repository -y \
-            "deb https://apt.kubernetes.io/ kubernetes-xenial main"
+        apt_get install apt-transport-https gpg
+        sudo mkdir -p -m 755 /etc/apt/keyrings
+        curl -fsSL https://pkgs.k8s.io/core:/stable:/v${KURYR_KUBERNETES_VERSION%.*}/deb/Release.key | \
+            sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+        echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v'${KURYR_KUBERNETES_VERSION%.*}'/deb/ /' | \
+            sudo tee /etc/apt/sources.list.d/kubernetes.list
+
         REPOS_UPDATED=False apt_get_update
 
         # NOTE(gryf): kubectl will be installed alongside with the kubeadm as
         # a dependency, although let's pin it to the k8s version as well.
+        kube_pkg_version=$(sudo apt-cache show kubeadm | grep "Version: $KURYR_KUBERNETES_VERSION-" | awk '{ print $2 }')
         apt_get install \
-            kubelet="${KURYR_KUBERNETES_VERSION}-00" \
-            kubeadm="${KURYR_KUBERNETES_VERSION}-00" \
-            kubectl="${KURYR_KUBERNETES_VERSION}-00"
+            kubelet="${kube_pkg_version}" \
+            kubeadm="${kube_pkg_version}" \
+            kubectl="${kube_pkg_version}"
         sudo apt-mark hold kubelet kubeadm kubectl
         # NOTE(hongbin): This work-around an issue that kubelet pick a wrong
         # IP address if the node has multiple network interfaces.