From 2bd76783dd5308a40ebc5c3c9a5910f049a9e45f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 5 Mar 2024 22:08:09 -0600
Subject: [PATCH] PR #150 follow-up: Update yum repos to new format as well.

---
 defaults/main.yml      | 6 ++----
 tasks/setup-RedHat.yml | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 32c7648..d2ed8a7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -56,10 +56,8 @@ kubernetes_apt_keyring_file: "/etc/apt/keyrings/kubernetes-apt-keyring.asc"
 kubernetes_apt_repository: "deb [signed-by={{ kubernetes_apt_keyring_file }}] https://pkgs.k8s.io/core:/{{ kubernetes_apt_release_channel }}:/v{{ kubernetes_version }}/deb/ /"
 
 kubernetes_yum_arch: '$basearch'
-kubernetes_yum_base_url: "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ kubernetes_yum_arch }}"
-kubernetes_yum_gpg_key:
-  - https://packages.cloud.google.com/yum/doc/yum-key.gpg
-  - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+kubernetes_yum_base_url: "https://pkgs.k8s.io/core:/stable:/v{{ kubernetes_version }}/rpm/"
+kubernetes_yum_gpg_key: "https://pkgs.k8s.io/core:/stable:/v{{ kubernetes_version }}/rpm/repodata/repomd.xml.key"
 
 kubernetes_yum_gpg_check: true
 kubernetes_yum_repo_gpg_check: true
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index 94d94de..f58bad2 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -11,10 +11,9 @@
 
 - name: Add Kubernetes GPG keys.
   rpm_key:
-    key: "{{ item }}"
+    key: "{{ kubernetes_yum_gpg_key }}"
     state: present
   register: kubernetes_rpm_key
-  with_items: "{{ kubernetes_yum_gpg_key }}"
 
 - name: Make cache if Kubernetes GPG key changed.
   command: "yum -q makecache -y --disablerepo='*' --enablerepo='kubernetes'"