From 1077bdcbc1f8fa2d1722c2bd7a1c9ae3027a70b2 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Fri, 16 Jan 2026 23:51:11 +1100 Subject: [PATCH] chore: update ceph gpgkey (#438) - stop checking ceph gpgkey (fixme) - use artifactapi for retrieving large rke image bundle Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/438 --- hieradata/os/AlmaLinux/all_releases.yaml | 6 ++---- modules/rke2/manifests/install.pp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml index cae81f4..5bf4cc7 100644 --- a/hieradata/os/AlmaLinux/all_releases.yaml +++ b/hieradata/os/AlmaLinux/all_releases.yaml @@ -128,8 +128,7 @@ profiles::yum::global::repos: descr: ceph repository target: /etc/yum.repos.d/ceph.repo baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/ceph-reef/el%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/ceph-reef/el%{facts.os.release.major}/%{facts.os.architecture}/repodata/repomd.xml.asc - gpgcheck: 1 + gpgcheck: false mirrorlist: absent ceph-noarch: ensure: absent @@ -137,8 +136,7 @@ profiles::yum::global::repos: descr: ceph noarch repository target: /etc/yum.repos.d/ceph.repo baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/ceph-reef/el%{facts.os.release.major}/noarch - gpgkey: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/ceph-reef/el%{facts.os.release.major}/noarch/repodata/repomd.xml.asc - gpgcheck: 1 + gpgcheck: false mirrorlist: absent # Rancher RKE2 repositories diff --git a/modules/rke2/manifests/install.pp b/modules/rke2/manifests/install.pp index 9a1b8c6..f15764d 100644 --- a/modules/rke2/manifests/install.pp +++ b/modules/rke2/manifests/install.pp @@ -30,7 +30,7 @@ class rke2::install ( # download required archive of containers archive { '/var/lib/rancher/rke2/agent/images/rke2-images.linux-amd64.tar.zst': ensure => present, - source => "https://github.com/rancher/rke2/releases/download/v${rke2_version}%2B${rke2_release}/rke2-images.linux-amd64.tar.zst", + source => "https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/rancher/rke2/releases/download/v${rke2_version}%2B${rke2_release}/rke2-images.linux-amd64.tar.zst", require => [ Package["rke2-${node_type}"], File['/var/lib/rancher/rke2/agent/images'],