chore: bump rke2 version

- stop checking ceph gpgkey (fixme)
- use artifactapi for retrieving large rke image bundle

Reviewed-on: #438

hieradata/os/AlmaLinux/all_releases.yaml

@@ -127,27 +127,16 @@ profiles::yum::global::repos:
     name: ceph
     descr: ceph repository
     target: /etc/yum.repos.d/ceph.repo
-    baseurl: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/x86_64/
+    baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/ceph-reef/el%{facts.os.release.major}/%{facts.os.architecture}
-    gpgkey: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/x86_64/repodata/repomd.xml.key
+    gpgcheck: false
-    gpgcheck: 1
     mirrorlist: absent
   ceph-noarch:
     ensure: absent
     name: ceph-noarch
     descr: ceph noarch repository
     target: /etc/yum.repos.d/ceph.repo
-    baseurl: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/noarch/
+    baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/ceph-reef/el%{facts.os.release.major}/noarch
-    gpgkey: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/x86_64/repodata/repomd.xml.key
+    gpgcheck: false
-    gpgcheck: 1
-    mirrorlist: absent
-  ceph-reef:
-    ensure: absent
-    name: ceph-reef
-    descr: ceph reef repository
-    target: /etc/yum.repos.d/ceph.repo
-    baseurl: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/%{facts.os.architecture}/
-    gpgkey: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/%{facts.os.architecture}/repodata/repomd.xml.key
-    gpgcheck: 0
     mirrorlist: absent
 
   # Rancher RKE2 repositories

hieradata/roles/apps/media.yaml

@@ -3,7 +3,7 @@ hiera_include:
   - profiles::nginx::simpleproxy
 
 profiles::yum::global::repos:
-  ceph-reef:
+  ceph:
     ensure: present
 
 profiles::ceph::client::keyrings:

hieradata/roles/infra/k8s/control.yaml

@@ -58,6 +58,12 @@ consul::services:
         tcp: "%{hiera('networking_loopback0_ip')}:9345"
         interval: '10s'
         timeout: '1s'
+      - id: 'rke2_server_ping_check'
+        name: 'rke2 Server Ping Check'
+        http: "https://%{hiera('networking_loopback0_ip')}:9345/ping"
+        interval: '10s'
+        timeout: '3s'
+        tls_skip_verify: true
 profiles::consul::client::node_rules:
   - resource: service
     segment: api-k8s

hieradata/roles/infra/nomad/agent.yaml

@@ -24,7 +24,7 @@ frrouting::ospfd_interfaces:
     area: 0.0.0.1
 
 profiles::yum::global::repos:
-  ceph-reef:
+  ceph:
     ensure: present
 
 profiles::ceph::client::keyrings:

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'],

modules/rke2/manifests/params.pp

@@ -1,7 +1,7 @@
 # rke2 params
 class rke2::params (
   Enum['server', 'agent'] $node_type = 'agent',
-  String                  $rke2_version = '1.33.4',
+  String                  $rke2_version = '1.33.7',
   String                  $rke2_release = 'rke2r1',
   Stdlib::Absolutepath    $config_file = '/etc/rancher/rke2/config.yaml',
   Hash                    $config_hash = {},

site/profiles/manifests/puppet/client.pp

@@ -13,6 +13,8 @@ class profiles::puppet::client (
   Boolean $show_diff          = true,
   Boolean $usecacheonfailure  = false,
   Integer $facts_soft_limit   = 4096,
+  Boolean $splay              = true,
+  Integer $splaylimit         = 600,
 ) {
 
   # dont manage puppet.conf if this is a puppetmaster

site/profiles/templates/puppet/client/puppet.conf.erb

@@ -12,3 +12,5 @@ runtimeout = <%= @runtimeout %>
 show_diff = <%= @show_diff %>
 usecacheonfailure = <%= @usecacheonfailure %>
 number_of_facts_soft_limit = <%= @facts_soft_limit %>
+splay = <%= @splay %>
+splaylimit = <%= @splaylimit %>