Merge pull request #151 from MichaelTrip/change-registry-deployment

change registry deployment so it works more intuitive and out of the box
lablabs · Jun 16, 2023 · b3af10f · b3af10f
2 parents 9e302fc + 5628134
commit b3af10f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -120,13 +120,13 @@ rke2_custom_manifests:
 rke2_static_pods:
 
 # Configure custom Containerd Registry
-rke2_custom_registry_mirrors:
-  - name:
-    endpoint: {}
+rke2_custom_registry_mirrors: []
+  # - name:
+  #   endpoint: {}
 #   rewrite: '"^rancher/(.*)": "mirrorproject/rancher-images/$1"'
 
 # Configure custom Containerd Registry additional configuration
-# rke2_custom_registry_configs:
+rke2_custom_registry_configs: []
 #   - endpoint:
 #     config:
 

diff --git a/tasks/first_server.yml b/tasks/first_server.yml
@@ -29,7 +29,7 @@
     owner: root
     group: root
     mode: 0644
-  when: rke2_custom_registry_mirrors.0.endpoint | length > 0
+  when: (rke2_custom_registry_mirrors | length > 0 or rke2_custom_registry_configs | length > 0)
   register: config_file_is_changed
 
 - name: Register if we need to do a etcd restore from file

diff --git a/tasks/remaining_nodes.yml b/tasks/remaining_nodes.yml
@@ -34,7 +34,7 @@
     owner: root
     group: root
     mode: 0644
-  when: rke2_custom_registry_mirrors.0.endpoint | length > 0
+  when: (rke2_custom_registry_mirrors | length > 0 or rke2_custom_registry_configs | length > 0)
   register: config_file_is_changed
 
 - name: Start RKE2 service on the rest of the nodes

diff --git a/templates/registries.yaml.j2 b/templates/registries.yaml.j2
@@ -1,3 +1,4 @@
+{% if rke2_custom_registry_mirrors | length > 0 %}
 mirrors:
 {% for mirror in rke2_custom_registry_mirrors %}
   {{ mirror.name }}:
@@ -10,7 +11,8 @@ mirrors:
       {{ mirror.rewrite }}
 {% endif %}
 {% endfor %}
-{% if rke2_custom_registry_configs is defined %}
+{% endif %}
+{% if rke2_custom_registry_mirrors | length > 0 %}
 configs:
 {% for config in rke2_custom_registry_configs %}
   {{ config.endpoint }}: