From 97d21c81c5a1fbe7df63bddf55f1d18d8b48c92b Mon Sep 17 00:00:00 2001 From: BenVincent Date: Sat, 27 Jun 2026 07:50:31 +1000 Subject: [PATCH] feat: make rke2 registries.yaml conditional on manage_registries (#472) Add/Remove the registries.yaml file based on the manage_registries boolean. We are leaving it on default=false now as the artifactapi server was broken. --------- Co-authored-by: Ben Vincent Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/472 --- modules/rke2/manifests/config.pp | 25 +++++++++++++++++-------- modules/rke2/manifests/init.pp | 1 + modules/rke2/manifests/params.pp | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modules/rke2/manifests/config.pp b/modules/rke2/manifests/config.pp index a19c9a4..427d3d9 100644 --- a/modules/rke2/manifests/config.pp +++ b/modules/rke2/manifests/config.pp @@ -7,6 +7,7 @@ class rke2::config ( Stdlib::Fqdn $bootstrap_node = $rke2::bootstrap_node, String $node_token = $rke2::node_token, Array[String[1]] $extra_config_files = $rke2::extra_config_files, + Boolean $manage_registries = $rke2::manage_registries, ){ # if its not the bootstrap node, add join path to config @@ -28,14 +29,22 @@ class rke2::config ( $config = $config_hash } - file { '/etc/rancher/rke2/registries.yaml': - ensure => file, - owner => 'root', - group => 'root', - mode => '0644', - source => 'puppet:///modules/rke2/registries.yaml', - require => Package["rke2-${node_type}"], - notify => Service["rke2-${node_type}"], + if $manage_registries { + file { '/etc/rancher/rke2/registries.yaml': + ensure => file, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/rke2/registries.yaml', + require => Package["rke2-${node_type}"], + notify => Service["rke2-${node_type}"], + } + }else{ + file { '/etc/rancher/rke2/registries.yaml': + ensure => absent, + require => Package["rke2-${node_type}"], + notify => Service["rke2-${node_type}"], + } } # create the config file diff --git a/modules/rke2/manifests/init.pp b/modules/rke2/manifests/init.pp index 882eee6..434733f 100644 --- a/modules/rke2/manifests/init.pp +++ b/modules/rke2/manifests/init.pp @@ -12,6 +12,7 @@ class rke2 ( Hash $helm_repos = $rke2::params::helm_repos, Array[String[1]] $extra_config_files = $rke2::params::extra_config_files, Stdlib::HTTPUrl $container_archive_source = $rke2::params::container_archive_source, + Boolean $manage_registries = $rke2::params::manage_registries, ) inherits rke2::params { include rke2::install diff --git a/modules/rke2/manifests/params.pp b/modules/rke2/manifests/params.pp index 0689852..a8e08b6 100644 --- a/modules/rke2/manifests/params.pp +++ b/modules/rke2/manifests/params.pp @@ -12,4 +12,5 @@ class rke2::params ( Hash $helm_repos = {}, Array[String[1]] $extra_config_files = [], Stdlib::HTTPUrl $container_archive_source = 'https://github.com/rancher/rke2/releases/download', + Boolean $manage_registries = false, ) {}