From 7c8a8f86d930fb897a649a0d62dc1bc99b3c7a7e Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 28 Jul 2021 17:41:59 -0500 Subject: [PATCH 1/9] Add nodeport to coder service --- templates/coderd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/coderd.yaml b/templates/coderd.yaml index 76b94dd0..f27d8e91 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -254,10 +254,12 @@ spec: port: 80 targetPort: 8080 protocol: TCP + nodePort: 30080 - name: tcp-{{ include "coder.serviceName" . }}-https port: 443 targetPort: 8443 protocol: TCP + nodePort: 30443 {{- else }} --- apiVersion: v1 From deb2c0d86d98d61711273b29d6c5bb469b8fddd8 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 Jul 2021 09:43:35 -0500 Subject: [PATCH 2/9] Make nodePort configurable --- templates/coderd.yaml | 8 ++++++-- values.yaml | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/templates/coderd.yaml b/templates/coderd.yaml index f27d8e91..53515b01 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -254,12 +254,16 @@ spec: port: 80 targetPort: 8080 protocol: TCP - nodePort: 30080 + {{ if .Values.coderd.serviceNodePorts }} + nodePort: {{ .Values.coderd.serviceNodePorts.coderd }} + {{ end }} - name: tcp-{{ include "coder.serviceName" . }}-https port: 443 targetPort: 8443 protocol: TCP - nodePort: 30443 + {{ if .Values.coderd.serviceNodePorts }} + nodePort: {{ .Values.coderd.serviceNodePorts.coderdTLS }} + {{ end }} {{- else }} --- apiVersion: v1 diff --git a/values.yaml b/values.yaml index c8165e0f..de45866c 100644 --- a/values.yaml +++ b/values.yaml @@ -21,6 +21,15 @@ coderd: # will be restricted to the specified client IPs. This field will be ignored if # the cloud provider does not support this feature. loadBalancerSourceRanges: [] + + # coderd.serviceNodePorts -- Allows manually setting node ports for the coderd service. + # This is only helpful if static ports are required, and usually should be left alone. + serviceNodePorts: + # coderd.serviceNodePorts.coderd -- 'coderd' service non-TLS nodePort + coderd: 30081 + # coderd.serviceNodePorts.coderd -- 'coderd' service TLS nodePort + coderdTLS: 30444 + # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service. serviceAnnotations: {} From 9f7c37e17c87cce51f2063b7629b27d3ba863cf5 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 Jul 2021 14:48:50 +0000 Subject: [PATCH 3/9] Make fmt --- README.md | 7 +++++-- values.yaml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b58732fa..b516743d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +-e # Coder Helm Chart @@ -25,7 +25,7 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | certs | object | Certificate that will be mounted inside Coder services. | `{"secret":{"key":"","name":""}}` | | certs.secret.key | string | Key pointing to a certificate in the secret. | `""` | | certs.secret.name | string | Name of the secret. | `""` | -| coderd | object | Primary service responsible for all things Coder! | `{"builtinProviderServiceAccount":{"annotations":{},"labels":{}},"devurlsHost":"","image":"","oidc":{"enableRefresh":false,"redirectOptions":{}},"podSecurityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"replicas":1,"resources":{"limits":{"cpu":"250m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"512Mi"}},"satellite":{"accessURL":"","enable":false,"primaryURL":""},"securityContext":{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAnnotations":{},"serviceSpec":{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"},"superAdmin":{"passwordSecret":{"key":"password","name":""}},"tls":{"devurlsHostSecretName":"","hostSecretName":""},"trustProxyIP":false}` | +| coderd | object | Primary service responsible for all things Coder! | `{"builtinProviderServiceAccount":{"annotations":{},"labels":{}},"devurlsHost":"","image":"","oidc":{"enableRefresh":false,"redirectOptions":{}},"podSecurityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"replicas":1,"resources":{"limits":{"cpu":"250m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"512Mi"}},"satellite":{"accessURL":"","enable":false,"primaryURL":""},"securityContext":{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAnnotations":{},"serviceNodePorts":{"coderd":30081,"coderdTLS":30444},"serviceSpec":{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"},"superAdmin":{"passwordSecret":{"key":"password","name":""}},"tls":{"devurlsHostSecretName":"","hostSecretName":""},"trustProxyIP":false}` | | coderd.builtinProviderServiceAccount | object | Customize the built-in Kubernetes provider service account. | `{"annotations":{},"labels":{}}` | | coderd.builtinProviderServiceAccount.annotations | object | A KV mapping of annotations. See: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ | `{}` | | coderd.builtinProviderServiceAccount.labels | object | Add labels to the service account used for the built-in provider. | `{}` | @@ -46,6 +46,9 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | coderd.securityContext.readOnlyRootFilesystem | bool | Mounts the container's root filesystem as read-only. It is recommended to leave this setting enabled in production. This will override the same setting in the pod | `true` | | coderd.securityContext.seccompProfile | object | Sets the seccomp profile for the migration and runtime containers. | `{"type":"RuntimeDefault"}` | | coderd.serviceAnnotations | object | Extra annotations to apply to the coderd service. | `{}` | +| coderd.serviceNodePorts | object | Allows manually setting node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. | `{"coderd":30081,"coderdTLS":30444}` | +| coderd.serviceNodePorts.coderd | int | 'coderd' service non-TLS nodePort | `30081` | +| coderd.serviceNodePorts.coderdTLS | int | 'coderd' service TLS nodePort | `30444` | | coderd.serviceSpec | object | Specification to inject for the coderd service. See: https://kubernetes.io/docs/concepts/services-networking/service/ | `{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"}` | | coderd.serviceSpec.externalTrafficPolicy | string | Set the traffic policy for the service. See: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip | `"Local"` | | coderd.serviceSpec.loadBalancerIP | string | Set the external IP address of the Ingress service. | `""` | diff --git a/values.yaml b/values.yaml index de45866c..1738a95d 100644 --- a/values.yaml +++ b/values.yaml @@ -27,7 +27,7 @@ coderd: serviceNodePorts: # coderd.serviceNodePorts.coderd -- 'coderd' service non-TLS nodePort coderd: 30081 - # coderd.serviceNodePorts.coderd -- 'coderd' service TLS nodePort + # coderd.serviceNodePorts.coderdTLS -- 'coderd' service TLS nodePort coderdTLS: 30444 # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service. From 8798ebe8c76f92d60584dfff34be513bc5cb1fc4 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 Jul 2021 14:50:01 +0000 Subject: [PATCH 4/9] Change wording --- README.md | 6 +++--- values.yaml | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b516743d..66d41676 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | coderd.securityContext.readOnlyRootFilesystem | bool | Mounts the container's root filesystem as read-only. It is recommended to leave this setting enabled in production. This will override the same setting in the pod | `true` | | coderd.securityContext.seccompProfile | object | Sets the seccomp profile for the migration and runtime containers. | `{"type":"RuntimeDefault"}` | | coderd.serviceAnnotations | object | Extra annotations to apply to the coderd service. | `{}` | -| coderd.serviceNodePorts | object | Allows manually setting node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. | `{"coderd":30081,"coderdTLS":30444}` | -| coderd.serviceNodePorts.coderd | int | 'coderd' service non-TLS nodePort | `30081` | -| coderd.serviceNodePorts.coderdTLS | int | 'coderd' service TLS nodePort | `30444` | +| coderd.serviceNodePorts | object | Allows manually setting static node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. By default these are dynamically chosen. | `{"coderd":30081,"coderdTLS":30444}` | +| coderd.serviceNodePorts.coderd | int | Sets a static 'coderd' service non-TLS nodePort | `30081` | +| coderd.serviceNodePorts.coderdTLS | int | Sets a static 'coderd' service TLS nodePort | `30444` | | coderd.serviceSpec | object | Specification to inject for the coderd service. See: https://kubernetes.io/docs/concepts/services-networking/service/ | `{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"}` | | coderd.serviceSpec.externalTrafficPolicy | string | Set the traffic policy for the service. See: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip | `"Local"` | | coderd.serviceSpec.loadBalancerIP | string | Set the external IP address of the Ingress service. | `""` | diff --git a/values.yaml b/values.yaml index 1738a95d..df511497 100644 --- a/values.yaml +++ b/values.yaml @@ -22,12 +22,13 @@ coderd: # the cloud provider does not support this feature. loadBalancerSourceRanges: [] - # coderd.serviceNodePorts -- Allows manually setting node ports for the coderd service. + # coderd.serviceNodePorts -- Allows manually setting static node ports for the coderd service. # This is only helpful if static ports are required, and usually should be left alone. + # By default these are dynamically chosen. serviceNodePorts: - # coderd.serviceNodePorts.coderd -- 'coderd' service non-TLS nodePort + # coderd.serviceNodePorts.coderd -- Sets a static 'coderd' service non-TLS nodePort coderd: 30081 - # coderd.serviceNodePorts.coderdTLS -- 'coderd' service TLS nodePort + # coderd.serviceNodePorts.coderdTLS -- Sets a static 'coderd' service TLS nodePort coderdTLS: 30444 # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service. From 785861c13ab61e31ed6a4eaa4ea2f617a01ed89c Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 Jul 2021 14:51:18 +0000 Subject: [PATCH 5/9] Change values.yaml examples --- README.md | 8 ++++---- values.yaml | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 66d41676..6c7964de 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | certs | object | Certificate that will be mounted inside Coder services. | `{"secret":{"key":"","name":""}}` | | certs.secret.key | string | Key pointing to a certificate in the secret. | `""` | | certs.secret.name | string | Name of the secret. | `""` | -| coderd | object | Primary service responsible for all things Coder! | `{"builtinProviderServiceAccount":{"annotations":{},"labels":{}},"devurlsHost":"","image":"","oidc":{"enableRefresh":false,"redirectOptions":{}},"podSecurityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"replicas":1,"resources":{"limits":{"cpu":"250m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"512Mi"}},"satellite":{"accessURL":"","enable":false,"primaryURL":""},"securityContext":{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAnnotations":{},"serviceNodePorts":{"coderd":30081,"coderdTLS":30444},"serviceSpec":{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"},"superAdmin":{"passwordSecret":{"key":"password","name":""}},"tls":{"devurlsHostSecretName":"","hostSecretName":""},"trustProxyIP":false}` | +| coderd | object | Primary service responsible for all things Coder! | `{"builtinProviderServiceAccount":{"annotations":{},"labels":{}},"devurlsHost":"","image":"","oidc":{"enableRefresh":false,"redirectOptions":{}},"podSecurityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"replicas":1,"resources":{"limits":{"cpu":"250m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"512Mi"}},"satellite":{"accessURL":"","enable":false,"primaryURL":""},"securityContext":{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAnnotations":{},"serviceNodePorts":{"coderd":30080,"coderdTLS":30443},"serviceSpec":{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"},"superAdmin":{"passwordSecret":{"key":"password","name":""}},"tls":{"devurlsHostSecretName":"","hostSecretName":""},"trustProxyIP":false}` | | coderd.builtinProviderServiceAccount | object | Customize the built-in Kubernetes provider service account. | `{"annotations":{},"labels":{}}` | | coderd.builtinProviderServiceAccount.annotations | object | A KV mapping of annotations. See: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ | `{}` | | coderd.builtinProviderServiceAccount.labels | object | Add labels to the service account used for the built-in provider. | `{}` | @@ -46,9 +46,9 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | coderd.securityContext.readOnlyRootFilesystem | bool | Mounts the container's root filesystem as read-only. It is recommended to leave this setting enabled in production. This will override the same setting in the pod | `true` | | coderd.securityContext.seccompProfile | object | Sets the seccomp profile for the migration and runtime containers. | `{"type":"RuntimeDefault"}` | | coderd.serviceAnnotations | object | Extra annotations to apply to the coderd service. | `{}` | -| coderd.serviceNodePorts | object | Allows manually setting static node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. By default these are dynamically chosen. | `{"coderd":30081,"coderdTLS":30444}` | -| coderd.serviceNodePorts.coderd | int | Sets a static 'coderd' service non-TLS nodePort | `30081` | -| coderd.serviceNodePorts.coderdTLS | int | Sets a static 'coderd' service TLS nodePort | `30444` | +| coderd.serviceNodePorts | object | Allows manually setting static node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. By default these are dynamically chosen. | `{"coderd":30080,"coderdTLS":30443}` | +| coderd.serviceNodePorts.coderd | int | Sets a static 'coderd' service non-TLS nodePort. This should usually be omitted. | `30080` | +| coderd.serviceNodePorts.coderdTLS | int | Sets a static 'coderd' service TLS nodePort This should usually be omitted. | `30443` | | coderd.serviceSpec | object | Specification to inject for the coderd service. See: https://kubernetes.io/docs/concepts/services-networking/service/ | `{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"}` | | coderd.serviceSpec.externalTrafficPolicy | string | Set the traffic policy for the service. See: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip | `"Local"` | | coderd.serviceSpec.loadBalancerIP | string | Set the external IP address of the Ingress service. | `""` | diff --git a/values.yaml b/values.yaml index df511497..efd8a039 100644 --- a/values.yaml +++ b/values.yaml @@ -26,10 +26,12 @@ coderd: # This is only helpful if static ports are required, and usually should be left alone. # By default these are dynamically chosen. serviceNodePorts: - # coderd.serviceNodePorts.coderd -- Sets a static 'coderd' service non-TLS nodePort - coderd: 30081 + # coderd.serviceNodePorts.coderd -- Sets a static 'coderd' service non-TLS nodePort. + # This should usually be omitted. + coderd: 30080 # coderd.serviceNodePorts.coderdTLS -- Sets a static 'coderd' service TLS nodePort - coderdTLS: 30444 + # This should usually be omitted. + coderdTLS: 30443 # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service. serviceAnnotations: {} From e11bd25d4a28d098a9e7b12008e5e52e25500f08 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Mon, 2 Aug 2021 14:12:50 -0500 Subject: [PATCH 6/9] remove typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c7964de..f1e23f15 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ --e + # Coder Helm Chart From 4d8eaa87de15372d8a52c8004e3438b616c67fed Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Mon, 2 Aug 2021 19:26:32 +0000 Subject: [PATCH 7/9] Convert to http/https fieldsg --- README.md | 10 +++++----- templates/coderd.yaml | 8 ++++---- values.yaml | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f1e23f15..01727237 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +-e # Coder Helm Chart @@ -25,7 +25,7 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | certs | object | Certificate that will be mounted inside Coder services. | `{"secret":{"key":"","name":""}}` | | certs.secret.key | string | Key pointing to a certificate in the secret. | `""` | | certs.secret.name | string | Name of the secret. | `""` | -| coderd | object | Primary service responsible for all things Coder! | `{"builtinProviderServiceAccount":{"annotations":{},"labels":{}},"devurlsHost":"","image":"","oidc":{"enableRefresh":false,"redirectOptions":{}},"podSecurityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"replicas":1,"resources":{"limits":{"cpu":"250m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"512Mi"}},"satellite":{"accessURL":"","enable":false,"primaryURL":""},"securityContext":{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAnnotations":{},"serviceNodePorts":{"coderd":30080,"coderdTLS":30443},"serviceSpec":{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"},"superAdmin":{"passwordSecret":{"key":"password","name":""}},"tls":{"devurlsHostSecretName":"","hostSecretName":""},"trustProxyIP":false}` | +| coderd | object | Primary service responsible for all things Coder! | `{"builtinProviderServiceAccount":{"annotations":{},"labels":{}},"devurlsHost":"","image":"","oidc":{"enableRefresh":false,"redirectOptions":{}},"podSecurityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"replicas":1,"resources":{"limits":{"cpu":"250m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"512Mi"}},"satellite":{"accessURL":"","enable":false,"primaryURL":""},"securityContext":{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAnnotations":{},"serviceNodePorts":{"http":30080,"https":30443},"serviceSpec":{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"},"superAdmin":{"passwordSecret":{"key":"password","name":""}},"tls":{"devurlsHostSecretName":"","hostSecretName":""},"trustProxyIP":false}` | | coderd.builtinProviderServiceAccount | object | Customize the built-in Kubernetes provider service account. | `{"annotations":{},"labels":{}}` | | coderd.builtinProviderServiceAccount.annotations | object | A KV mapping of annotations. See: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ | `{}` | | coderd.builtinProviderServiceAccount.labels | object | Add labels to the service account used for the built-in provider. | `{}` | @@ -46,9 +46,9 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | coderd.securityContext.readOnlyRootFilesystem | bool | Mounts the container's root filesystem as read-only. It is recommended to leave this setting enabled in production. This will override the same setting in the pod | `true` | | coderd.securityContext.seccompProfile | object | Sets the seccomp profile for the migration and runtime containers. | `{"type":"RuntimeDefault"}` | | coderd.serviceAnnotations | object | Extra annotations to apply to the coderd service. | `{}` | -| coderd.serviceNodePorts | object | Allows manually setting static node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. By default these are dynamically chosen. | `{"coderd":30080,"coderdTLS":30443}` | -| coderd.serviceNodePorts.coderd | int | Sets a static 'coderd' service non-TLS nodePort. This should usually be omitted. | `30080` | -| coderd.serviceNodePorts.coderdTLS | int | Sets a static 'coderd' service TLS nodePort This should usually be omitted. | `30443` | +| coderd.serviceNodePorts | object | Allows manually setting static node ports for the coderd service. This is only helpful if static ports are required, and usually should be left alone. By default these are dynamically chosen. | `{"http":30080,"https":30443}` | +| coderd.serviceNodePorts.http | int | Sets a static 'coderd' service non-TLS nodePort. This should usually be omitted. | `30080` | +| coderd.serviceNodePorts.https | int | Sets a static 'coderd' service TLS nodePort This should usually be omitted. | `30443` | | coderd.serviceSpec | object | Specification to inject for the coderd service. See: https://kubernetes.io/docs/concepts/services-networking/service/ | `{"externalTrafficPolicy":"Local","loadBalancerIP":"","loadBalancerSourceRanges":[],"type":"LoadBalancer"}` | | coderd.serviceSpec.externalTrafficPolicy | string | Set the traffic policy for the service. See: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip | `"Local"` | | coderd.serviceSpec.loadBalancerIP | string | Set the external IP address of the Ingress service. | `""` | diff --git a/templates/coderd.yaml b/templates/coderd.yaml index 53515b01..35103565 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -254,15 +254,15 @@ spec: port: 80 targetPort: 8080 protocol: TCP - {{ if .Values.coderd.serviceNodePorts }} - nodePort: {{ .Values.coderd.serviceNodePorts.coderd }} + {{ if .Values.coderd.serviceNodePorts.http }} + nodePort: {{ .Values.coderd.serviceNodePorts.http }} {{ end }} - name: tcp-{{ include "coder.serviceName" . }}-https port: 443 targetPort: 8443 protocol: TCP - {{ if .Values.coderd.serviceNodePorts }} - nodePort: {{ .Values.coderd.serviceNodePorts.coderdTLS }} + {{ if .Values.coderd.serviceNodePorts.https }} + nodePort: {{ .Values.coderd.serviceNodePorts.https }} {{ end }} {{- else }} --- diff --git a/values.yaml b/values.yaml index efd8a039..644ad1fd 100644 --- a/values.yaml +++ b/values.yaml @@ -26,12 +26,12 @@ coderd: # This is only helpful if static ports are required, and usually should be left alone. # By default these are dynamically chosen. serviceNodePorts: - # coderd.serviceNodePorts.coderd -- Sets a static 'coderd' service non-TLS nodePort. + # coderd.serviceNodePorts.http -- Sets a static 'coderd' service non-TLS nodePort. # This should usually be omitted. - coderd: 30080 - # coderd.serviceNodePorts.coderdTLS -- Sets a static 'coderd' service TLS nodePort + http: 30080 + # coderd.serviceNodePorts.https -- Sets a static 'coderd' service TLS nodePort # This should usually be omitted. - coderdTLS: 30443 + https: 30443 # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service. serviceAnnotations: {} From feca4f2c70fed216e5ffad04bedd1460fcbbedd0 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Mon, 2 Aug 2021 19:36:11 +0000 Subject: [PATCH 8/9] Get rid of '-e' --- Makefile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index af1224fe..403052ce 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ fmt: README.md README.md: README.md.gotmpl values.yaml @echo "--- Generating documentation" helm-docs --template-files=$< - @echo -e "\n\n$$(cat README.md)" > README.md + @echo "\n\n$$(cat README.md)" > README.md .PHONY: README.md clean: diff --git a/README.md b/README.md index 01727237..9c7936ce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ --e + # Coder Helm Chart From 641858394012333ffebfcf716d761edda87d49ec Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 3 Aug 2021 13:57:55 +0000 Subject: [PATCH 9/9] Use null to keep existing default behavior --- values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values.yaml b/values.yaml index 644ad1fd..36d5e31e 100644 --- a/values.yaml +++ b/values.yaml @@ -28,10 +28,10 @@ coderd: serviceNodePorts: # coderd.serviceNodePorts.http -- Sets a static 'coderd' service non-TLS nodePort. # This should usually be omitted. - http: 30080 + http: null # coderd.serviceNodePorts.https -- Sets a static 'coderd' service TLS nodePort # This should usually be omitted. - https: 30443 + https: null # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service. serviceAnnotations: {}