Merge branch '18-add-ingress-resource' into 'gesis'

Configure Ingress for Harbor See merge request methods-hub/interactive-environment!25
jupyterhub · Jan 3, 2025 · 26aec89 · 26aec89
2 parents 14e1087 + a201407
commit 26aec89
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/ansible/gesis.yml b/ansible/gesis.yml
@@ -26,7 +26,10 @@
   hosts: kubernetes_control_panel
   gather_facts: false
   roles:
-    - harbor
+    - role: harbor
+      vars:
+        harbor_domain: '{{ HARBOR_DOMAIN }}'
+        harbor_path: '{{ HARBOR_PATH }}'
 - name: Configure JupyterHub workers
   hosts: jupyterhub_single_user
   gather_facts: false

diff --git a/ansible/inventories/gesis-acceptance b/ansible/inventories/gesis-acceptance
@@ -22,6 +22,8 @@ svko-k8s-test01
 GRAFANA_CAPACITY_STORAGE=2Gi
 JUPYTERHUB_CAPACITY_STORAGE=2Gi
 PROMETHEUS_CAPACITY_STORAGE=15Gi
+HARBOR_DOMAIN=notebooks.gesis.org
+HARBOR_PATH='/'
 
 [kubernetes_workers]
 svko-k8s-test02

diff --git a/ansible/roles/harbor/tasks/main.yml b/ansible/roles/harbor/tasks/main.yml
@@ -155,6 +155,7 @@
     release_name: "{{ harbor_name }}"
     release_namespace: "{{ harbor_namespace }}"
     create_namespace: true
+    history_max: 3
     values:
       harborAdminPassword: "{{ HARBOR_ADMIN_PASSWORD }}"
       expose:
@@ -174,3 +175,27 @@
             storageClass: "{{ harbor_storage_class_name }}"
           trivy:
             storageClass: "{{ harbor_storage_class_name }}"
+
+# Based on https://kubernetes.github.io/ingress-nginx/user-guide/basic-usage/
+- name: Create a ingress resources
+  kubernetes.core.k8s:
+    state: present
+    definition:
+      apiVersion: networking.k8s.io/v1
+      kind: Ingress
+      metadata:
+        name: 'ingress-{{ harbor_name }}'
+      spec:
+        rules:
+          - host: '{{ harbor_domain }}'
+            http:
+              paths:
+                - path: '{{ harbor_path }}'
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: '{{ harbor_name }}'
+                      port:
+                        number: 80
+        # Don't change the ingressClassName
+        ingressClassName: nginx
diff --git a/ansible/roles/harbor/vars/main.yml b/ansible/roles/harbor/vars/main.yml
@@ -7,3 +7,5 @@ harbor_registry_storage: 10Gi
 harbor_redis_storage: 10Gi
 harbor_trivy_storage: 10Gi
 harbor_database_storage: 10Gi
+harbor_domain: harbor.localhost
+harbor_path: '/'