use harbor for docker and helm

inventory/ghp/sample/group_vars/all/all.yaml

@@ -1,6 +1,6 @@
 # Common #
 namespace: ghp
-docker_registry: registry.ghp.0xace.cc
+docker_registry: registry.geekhome.org/ghp
 domain: example.com
 mail_domain: "{{ domain }}"
 local_domain: lan
@@ -42,19 +42,13 @@ openldap_simple_users:
   - { name: testuser1, sn: 6001, uid: 6001, gid: 6001 }
   - { name: testuser2, sn: 6002, uid: 6002, gid: 6002 }
 
-## Docker-registry ##
-registry_enabled: true
-#registry_size: "100Gi"
-#registry_storage: "nfs-hdd"
-registry_publish: false
-
-## ChartMuseum ##
-chartmuseum_enabled: true
-#chartmuseum_size: "10Gi"
-#chartmuseum_storage: "nfs-hdd"
-#chartmuseum_publish: false
-#chartmuseum_login: admin
-#chartmuseum_pass:
+## Harbor ##
+harbor_enabled: true
+harbor_publish: false
+#harbor_registry_size: "100Gi"
+#harbor_registry_storage: "nfs-hdd"
+#harbor_chartmuseum_size: "50Gi"
+#harbor_chartmuseum_storage: "nfs-ssd"
 
 # End User Applications #
 ## Email ##

inventory/ghp/sample/group_vars/ddclient.yaml

@@ -33,7 +33,9 @@ ddclient_hosts:
   - "{% if chartmuseum_publish | default(false) %}{{ chartsmuseum_short_name | default('charts') }}.{{ domain }}{% else %}omitme{% endif %}"
   - "{% if registry_publish | default(false) %}{{ registry_short_name | default('registry') }}.{{ domain }}{% else %}omitme{% endif %}"
   - "{% if peertube_publish | default(false) %}{{ peertube_short_name | default('peertube') }}.{{ domain }}{% else %}omitme{% endif %}"
+  - "{% if harbor_publish | default(false) %}{{ harbor_short_name | default('harbor') }}.{{ domain }}{% else %}omitme{% endif %}"
   - "{% if roundcube_publish | default(false) %}{{ roundcube_short_name | default('webmail') }}.{{ domain }}{% else %}omitme{% endif %}"
+  - "{{ harbor_readonly_ingress | default('omitme') }}"
   - "{{ registry_readonly_ingress | default('omitme') }}"
   - "{{ chartmuseum_readonly_ingress | default('omitme') }}"
   - "{{ wikijs_readonly_ingress | default('omitme') }}"

inventory/ghp/sample/group_vars/k8s/harbor.yaml

@@ -0,0 +1 @@
+harbor_values: {}

inventory/ghp/sample/group_vars/web_proxy.yaml

@@ -65,26 +65,32 @@ nginx:
         {% if nextcloud_publish %}
         {{ nextcloud_short_name | default('nextcloud') }}.{{ domain }} https_{{ namespace }};
         {% endif %}
+        {% if harbor_publish %}
+        {{ harbor_short_name | default('harbor') }}.{{ domain }} https_{{ namespace }};
+        {% endif %}
         {% if registry_publish %}
         {{ registry_short_name | default('registry') }}.{{ domain }} https_{{ namespace }};
         {% endif %}
-        {% if registry_readonly_ingress %}
-        {{ registry_readonly_ingress }} https_{{ namespace }};
+        {% if peertube_publish %}
+        {{ peertube_short_name | default('peertube') }}.{{ domain }} https_{{ namespace }};
+        {% endif %}
+        {% if roundcube_publish %}
+        {{ roundcube_short_name | default('webmail') }}.{{ domain }} https_{{ namespace }};
         {% endif %}
         {% if chartmuseum_publish %}
         {{ chartsmuseum_short_name | default('charts') }}.{{ domain }} https_{{ namespace }};
         {% endif %}
+        {% if registry_readonly_ingress %}
+        {{ registry_readonly_ingress }} https_{{ namespace }};
+        {% endif %}
         {% if chartmuseum_readonly_ingress %}
         {{ chartmuseum_readonly_ingress }} https_{{ namespace }};
         {% endif %}
         {% if wikijs_readonly_ingress %}
         {{ wikijs_readonly_ingress }} https_{{ namespace }};
         {% endif %}
-        {% if peertube_publish %}
-        {{ peertube_short_name | default('peertube') }}.{{ domain }} https_{{ namespace }};
-        {% endif %}
-        {% if roundcube_publish %}
-        {{ roundcube_short_name | default('webmail') }}.{{ domain }} https_{{ namespace }};
+        {% if harbor_readonly_ingress %}
+        {{ harbor_readonly_ingress }} https_{{ namespace }};
         {% endif %}
     - name: "k8s-ghp-{{ namespace }}.conf"
       data: |-