diff --git a/jhub/03-install-ingress.nu b/jhub/03-install-ingress.nu index ca5452d..769c53b 100644 --- a/jhub/03-install-ingress.nu +++ b/jhub/03-install-ingress.nu @@ -3,21 +3,20 @@ source ./env.nu -let existing_ip = $env.jupyterhub.cluster.existing_ip +print "[ INFO ] Adding traefik repo" -let existing_ip_flag = if $existing_ip != null { - print $"[ INFO ] Using existing IP address for load balancer: ($existing_ip)" - ["--set" $"controller.service.loadBalancerIP=($existing_ip)"] -} else { [] } +helm repo add traefik https://traefik.github.io/charts; +helm repo update -print "[ INFO ] Installing an ingress resource" +print "[ INFO ] Installing traefik" -(helm upgrade --install ingress-nginx ingress-nginx - --repo https://kubernetes.github.io/ingress-nginx - --namespace ingress-nginx --create-namespace - --set 'controller.nodeSelector.capi\.stackhpc\.com/node-group=default-worker' - --wait - ...$existing_ip_flag +( +helm upgrade --install traefik traefik/traefik + --namespace ingress-traefik --create-namespace + --set 'api.dashboard=false' + --set 'providers.kubernetesCRD.enabled=false' + --set 'logs.access.enabled=true' + --set 'nodeSelector.capi\.stackhpc\.com/node-group=default-worker' ) | complete | if $in.exit_code != 0 { @@ -26,7 +25,7 @@ print "[ INFO ] Installing an ingress resource" exit 1 } -let ingress_ip = kubectl get svc -n ingress-nginx +let ingress_ip = kubectl get svc -n ingress-traefik | detect columns | get 0.EXTERNAL-IP diff --git a/jhub/env.nu b/jhub/env.nu index 1fa1792..07a175b 100644 --- a/jhub/env.nu +++ b/jhub/env.nu @@ -8,7 +8,6 @@ $env.jupyterhub.cluster = { worker: {count: 1, flavor: "m3.quad"}, autoscaling: "true", name: null, # SET ME! - existing_ip: null # If set to something other than "null", attempt to use this IP when creating the ingress loadBalancer service } $env.jupyterhub.nodegroup = {