[kube-prometheus-stack] Add support for specifying webhook port for G…

…KE workaround (prometheus-community#400) * [kube-prometheus-stack] Add support for specifying webhook port for GKE workaround Signed-off-by: gw0 <[email protected]> * [kube-prometheus-stack] Set default TLS webhook port to 10250 Signed-off-by: gw0 <[email protected]> * [kube-prometheus-stack] Bump chart version Signed-off-by: gw0 <[email protected]> Co-authored-by: André Bauer <[email protected]>
cablespaghetti · Jan 29, 2021 · 164e84e · 164e84e
1 parent 18689d9
commit 164e84e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -18,7 +18,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 13.3.0
+version: 13.4.0
 appVersion: 0.45.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml
@@ -91,7 +91,7 @@ spec:
             - --web.listen-address=:8443
             - --web.tls-min-version={{ .Values.prometheusOperator.tls.tlsMinVersion }}
           ports:
-            - containerPort: 8443
+            - containerPort: {{ .Values.prometheusOperator.tls.internalPort }}
               name: https
           {{- else }}
           ports:

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -1232,11 +1232,14 @@ prometheus-node-exporter:
 prometheusOperator:
   enabled: true
 
-  # Prometheus-Operator v0.39.0 and later support TLS natively.
+  ## Prometheus-Operator v0.39.0 and later support TLS natively.
+  ##
   tls:
     enabled: true
     # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants
     tlsMinVersion: VersionTLS13
+    # The default webhook port is 10250 in order to work out-of-the-box in GKE private clusters and avoid adding firewall rules.
+    internalPort: 10250
 
   ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted
   ## rules from making their way into prometheus and potentially preventing the container from starting