Supply hostname to uptermd

codebytere · Dec 13, 2020 · 2236989 · 2236989
1 parent 89ef8b5
commit 2236989
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/charts/uptermd/templates/deployment.yaml b/charts/uptermd/templates/deployment.yaml
@@ -42,6 +42,8 @@ spec:
             {{- end }}
             - --node-addr
             - $(POD_IP):22
+            - --hostname
+            - {{ .Values.hostname }}
             {{- range $key, $val := .Values.host_keys }}
             {{ if hasSuffix ".pub" $key }}
             {{ else }}

diff --git a/charts/uptermd/templates/ingress.yaml b/charts/uptermd/templates/ingress.yaml
@@ -13,10 +13,10 @@ metadata:
 spec:
     tls:
       - hosts:
-        - {{ .Values.websocket.host }}
-        secretName: {{ .Values.websocket.host | replace "." "-" }}-tls
+        - {{ .Values.hostname }}
+        secretName: {{ .Values.hostname | replace "." "-" }}-tls
     rules:
-      - host: {{ .Values.websocket.host }}
+      - host: {{ .Values.hostname }}
         http:
           paths:
           - backend:

diff --git a/charts/uptermd/values.yaml b/charts/uptermd/values.yaml
@@ -63,9 +63,10 @@ affinity: {}
 
 host_keys: {}
 
+hostname: my-upterm-host
+
 # Require ingress-nginx & cert-manager
 websocket:
   enabled: false
-  host: my-upterm-host
   cert_manager_acme_email: your_email
   ingress_nginx_ingress_class: nginx
diff --git a/terraform/digitalocean/k8s.tf b/terraform/digitalocean/k8s.tf
@@ -52,10 +52,10 @@ locals {
       minReplicas = 2
       maxReplicas = 5
     }
+    hostname = var.uptermd_host
     websocket = {
       enabled                     = true
       ingress_nginx_ingress_class = "upterm-nginx"
-      host                        = var.uptermd_host
       cert_manager_acme_email     = var.uptermd_acme_email
     }
     host_keys = {