feat: add support for NodePort service type in Helm chart (#8993)

ffais · ericpaulsen · web-flow · commit 6fd5344d0add · 2023-08-10T20:57:59.000-04:00
* add support for NodePort service type in Helm chart

* fix nodeport values

* formatting &amp; make update-golden-files

* update-golden-files

---------

Co-authored-by: Eric &lt;ericpaulsen@coder.com&gt;
diff --git a/helm/coder/templates/service.yaml b/helm/coder/templates/service.yaml
@@ -16,11 +16,17 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      {{ if eq .Values.coder.service.type "NodePort" }}
+      nodePort: {{ .Values.coder.service.httpNodePort }}
+      {{ end }}
     {{- if eq (include "coder.tlsEnabled" .) "true" }}
     - name: "https"
       port: 443
       targetPort: "https"
       protocol: TCP
+      {{ if eq .Values.coder.service.type "NodePort" }}
+      nodePort: {{ .Values.coder.service.httpsNodePort }}
+      {{ end }}
     {{- end }}
   {{- if eq "LoadBalancer" .Values.coder.service.type }}
   {{- with .Values.coder.service.loadBalancerIP }}
diff --git a/helm/coder/tests/testdata/command.golden b/helm/coder/tests/testdata/command.golden
@@ -90,6 +90,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/command_args.golden b/helm/coder/tests/testdata/command_args.golden
@@ -90,6 +90,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/default_values.golden b/helm/coder/tests/testdata/default_values.golden
@@ -90,6 +90,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/labels_annotations.golden b/helm/coder/tests/testdata/labels_annotations.golden
@@ -90,6 +90,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/provisionerd_psk.golden b/helm/coder/tests/testdata/provisionerd_psk.golden
@@ -90,6 +90,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/sa.golden b/helm/coder/tests/testdata/sa.golden
@@ -91,6 +91,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/tls.golden b/helm/coder/tests/testdata/tls.golden
@@ -90,10 +90,12 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
     - name: "https"
       port: 443
       targetPort: "https"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/tests/testdata/workspace_proxy.golden b/helm/coder/tests/testdata/workspace_proxy.golden
@@ -90,6 +90,7 @@ spec:
       port: 80
       targetPort: "http"
       protocol: TCP
+      
   externalTrafficPolicy: "Cluster"
   selector:
     app.kubernetes.io/name: coder
diff --git a/helm/coder/values.yaml b/helm/coder/values.yaml
@@ -241,6 +241,12 @@ coder:
     # coder.service.annotations -- The service annotations. See:
     # https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
     annotations: {}
+    # coder.service.httpNodePort -- Enabled if coder.service.type is set to NodePort.
+    # If not set, Kubernetes will allocate a port from the default range, 30000-32767.
+    httpNodePort: ""
+    # coder.service.httpsNodePort -- Enabled if coder.service.type is set to NodePort.
+    # If not set, Kubernetes will allocate a port from the default range, 30000-32767.
+    httpsNodePort: ""
 
   # coder.ingress -- The Ingress object to expose for Coder.
   ingress:
