From 368f84769beee2b2789169583b7ec24953d7490a Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Wed, 29 Jun 2022 13:07:34 +0200
Subject: [PATCH] Reenable image handling;Configure Longhorn/Harbor

---
 .../roles/metacluster/tasks/main.yml          | 45 +++++++++++--------
 .../roles/metacluster/tasks/components.yml    | 22 ++++-----
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
index c6d5acb..131ecdf 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
@@ -7,7 +7,7 @@
     INSTALL_K3S_EXEC: 'server --cluster-init --disable local-storage'
 
 - name: Install kubectl tab-completion
-  ansible.builtin.command:
+  ansible.builtin.shell:
     cmd: kubectl completion bash | tee /etc/bash_completion.d/kubectl
 
 - name: Ensure API availability
@@ -40,25 +40,25 @@
         mode: 0600
       no_log: true
 
-#- block:
+- block:
 
-#    - name: Extract container images
-#      ansible.builtin.unarchive:
-#        src: /opt/metacluster/container-images/image-tarballs.tgz
-#        dest: /opt/metacluster/container-images
-#        list_files: yes
-#      register: imagetarballs
+    - name: Extract container images
+      ansible.builtin.unarchive:
+        src: /opt/metacluster/container-images/image-tarballs.tgz
+        dest: /opt/metacluster/container-images
+        list_files: yes
+      register: imagetarballs
 
-#    - name: Import container images
-#      ansible.builtin.command:
-#        cmd: k3s ctr image import {{ item }}
-#        chdir: /opt/metacluster/container-images
-#      loop: "{{ imagetarballs.files }}"
+    - name: Import container images
+      ansible.builtin.command:
+        cmd: k3s ctr image import {{ item }}
+        chdir: /opt/metacluster/container-images
+      loop: "{{ imagetarballs.files }}"
 
-#    - name: Delete redundant files
-#      ansible.builtin.file:
-#        path: /opt/metacluster/container-images
-#        state: absent
+    - name: Delete redundant files
+      ansible.builtin.file:
+        path: /opt/metacluster/container-images
+        state: absent
 
 - name: Install longhorn chart
   kubernetes.core.helm:
@@ -66,6 +66,7 @@
     chart_ref: /opt/metacluster/helm-charts/longhorn
     release_namespace: longhorn-system
     create_namespace: yes
+    wait: yes
     kubeconfig: "{{ kubeconfig.path }}"
     values:
       defaultSettings:
@@ -74,6 +75,8 @@
       ingress:
         enabled: true
         host: storage.{{ vapp['guestinfo.fqdn'] }}
+      persistence:
+        defaultClassReplicaCount: 3
 
 - name: Install harbor chart
   kubernetes.core.helm:
@@ -81,9 +84,15 @@
     chart_ref: /opt/metacluster/helm-charts/harbor
     release_namespace: harbor
     create_namespace: yes
+    wait: yes
     kubeconfig: "{{ kubeconfig.path }}"
     values:
-#      foo: bar
+      expose:
+        ingress:
+          hosts:
+            core: registry.{{ vapp['guestinfo.fqdn'] }}
+      notary:
+        enabled: false
 
 - name: Cleanup tempfile
   ansible.builtin.file:
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index cfb1573..6bd0cf6 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -30,15 +30,15 @@
   loop_control:
     label: "{{ item.key }}"
 
-#- name: Pull and store containerimages
-#  ansible.builtin.command:
-#    cmd: skopeo copy docker://{{ item }} docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar:{{ item }}
-#    chdir: /opt/metacluster/container-images
-#  loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten }}"
+- name: Pull and store containerimages
+  ansible.builtin.command:
+    cmd: skopeo copy docker://{{ item }} docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar:{{ item }}
+    chdir: /opt/metacluster/container-images
+  loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten }}"
 
-#- name: Compress tarballs
-#  community.general.archive:
-#    dest: /opt/metacluster/container-images/image-tarballs.tgz
-#    path: /opt/metacluster/container-images/*
-#    format: gz
-#    remove: yes
+- name: Compress tarballs
+  community.general.archive:
+    dest: /opt/metacluster/container-images/image-tarballs.tgz
+    path: /opt/metacluster/container-images/*
+    format: gz
+    remove: yes