From 9dec31f3a6611f8fbeaf13ac77f2dbfd6288ba8a Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 5 Mar 2024 22:09:31 -0600 Subject: [PATCH] Docs updates for previous commit. --- README.md | 7 ++----- defaults/main.yml | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6fb94f4..b8f9620 100644 --- a/README.md +++ b/README.md @@ -148,11 +148,8 @@ kubernetes_apt_ignore_key_error: false Apt repository options for Kubernetes installation. ```yaml -kubernetes_yum_arch: x86_64 -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/defaults/main.yml b/defaults/main.yml index d2ed8a7..e850ed0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -55,10 +55,8 @@ kubernetes_apt_release_channel: "stable" 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://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