From 2e2cdb1cd35a4bf3cdf0d65e7c097111cf0b8d86 Mon Sep 17 00:00:00 2001 From: Peter Svensson Date: Tue, 5 Dec 2023 08:11:44 +0100 Subject: [PATCH 1/2] feat: support setting service type To support ingress controllers (like AWS ALB) that requires service.type to be NodePort. --- charts/helm-chart/README.md | 1 + charts/helm-chart/templates/web-server/service.yml | 3 ++- charts/helm-chart/values.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/helm-chart/README.md b/charts/helm-chart/README.md index 799a445..a49420d 100755 --- a/charts/helm-chart/README.md +++ b/charts/helm-chart/README.md @@ -55,6 +55,7 @@ A Helm chart to create the k8s cluster dependencies for BSEE | services.webServer.httpsPort | string | `"8443"` | | | services.webServer.installationEnvironment | string | `"KUBERNETES"` | | | services.webServer.label | string | `"app.portswigger.net/ingress: web-server"` | | +| services.webServer.type | string | `"ClusterIP"` | | | services.webServer.useDeprecatedHttpConfigFromDatabase | bool | `false` | | | services.webServer.useHttps | bool | `false` | | | support.oracle | bool | `false` | | diff --git a/charts/helm-chart/templates/web-server/service.yml b/charts/helm-chart/templates/web-server/service.yml index 59c5333..c335c57 100755 --- a/charts/helm-chart/templates/web-server/service.yml +++ b/charts/helm-chart/templates/web-server/service.yml @@ -10,10 +10,11 @@ metadata: spec: selector: app.portswigger.net/name: {{ include "kebabcase-release-name" . }}-web-server + type: {{ .Values.services.webServer.type }} ports: - name: http protocol: TCP port: 8080 - name: https protocol: TCP - port: 8443 \ No newline at end of file + port: 8443 diff --git a/charts/helm-chart/values.yaml b/charts/helm-chart/values.yaml index bbbbbbe..1538875 100755 --- a/charts/helm-chart/values.yaml +++ b/charts/helm-chart/values.yaml @@ -30,6 +30,7 @@ scanContainerMemory: 8Gi services: webServer: + type: 'ClusterIP' installationEnvironment: KUBERNETES label: "app.portswigger.net/ingress: web-server" # If set to true, then none of the configuration below will be used, and we will attempt to read the HTTP(S) From b4ee066d309ddf5b66c35f463121dd25b8a40442 Mon Sep 17 00:00:00 2001 From: Peter Svensson Date: Tue, 5 Dec 2023 09:07:25 +0100 Subject: [PATCH 2/2] chore: testing --- charts/helm-chart/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/helm-chart/Chart.yaml b/charts/helm-chart/Chart.yaml index 937e6a4..d3ec3a1 100755 --- a/charts/helm-chart/Chart.yaml +++ b/charts/helm-chart/Chart.yaml @@ -11,8 +11,8 @@ keywords: - web home: https://portswigger.net/ sources: - - https://github.com/portswigger/enterprise-helm-charts/ + - https://github.com/peter-svensson/enterprise-helm-charts/ maintainers: - name: Portswigger email: hello@portswigger.net -icon: https://github.com/PortSwigger/enterprise-helm-charts/blob/33292500f49f9d9ddef2d22d3a53b13f3210674e/enterprise-logo.svg \ No newline at end of file +icon: https://github.com/PortSwigger/enterprise-helm-charts/blob/33292500f49f9d9ddef2d22d3a53b13f3210674e/enterprise-logo.svg