Merge branch '16-configure-ingress' into 'gesis'

Change service type for ingress-nginx Closes jupyterhub#16 See merge request methods-hub/interactive-environment!18
gesiscss · Sep 24, 2024 · 71b0c5d · 71b0c5d
2 parents be733a1 + 21b64f5
commit 71b0c5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ansible/inventories/gesis-stage b/ansible/inventories/gesis-stage
@@ -9,6 +9,9 @@ svko-k8s-test03 ansible_host=194.95.75.23 ansible_ssh_user=ansible ansible_becom
 INVENTORY_NAME=stage
 K8S_CONTROL_PLANE_ENDPOINT=194.95.75.21
 K8S_CONTROL_PLANE_ALIAS=svko-k8s-test01
+; Replace this variable with a filter
+; This must match the group ingress
+K8S_INGRESS=194.95.75.22
 
 [notebooks_gesis_org]
 ; svko-css-backup-node

diff --git a/ansible/roles/k8s-control-panel/tasks/metallb.yml b/ansible/roles/k8s-control-panel/tasks/metallb.yml
@@ -34,7 +34,8 @@
         namespace: metallb
       spec:
         addresses:
-          - '{{ k8s_control_panel_cidr }}'
+          # TODO Use Jinja filter to automate this.
+          - '{{ K8S_INGRESS }}-{{ K8S_INGRESS }}'
 - name: Configure L2 Advertisement for MetalLB
   kubernetes.core.k8s:
     state: present

diff --git a/config/gesis-stage.yaml b/config/gesis-stage.yaml
@@ -142,7 +142,7 @@ ingress-nginx:
       enabled: true
     service:
       externalTrafficPolicy: null
-      type: ClusterIP
+      type: LoadBalancer
 prometheus:
   enabled: true
   server: