Merge pull request #123 from shaardie/appProtocol

Add appProtocol to Service Ports

Author: pierluigilenoci

helm/oauth2-proxy/Chart.yaml

@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.6.1
+version: 6.6.2
 apiVersion: v2
 appVersion: 7.4.0
 home: https://oauth2-proxy.github.io/oauth2-proxy/

helm/oauth2-proxy/README.md

@@ -155,6 +155,7 @@ Parameter | Description | Default
 `replicaCount` | desired number of pods | `1`
 `resources` | pod resource requests & limits | `{}`
 `service.portNumber` | port number for the service | `80`
+`service.appProtocol` | application protocol on the port of the service | `http`
 `service.type` | type of service | `ClusterIP`
 `service.clusterIP` | cluster ip address | `nil`
 `service.loadBalancerIP` | ip of load balancer | `nil`
@@ -185,6 +186,7 @@ Parameter | Description | Default
 `metrics.enabled` | Enable Prometheus metrics endpoint | `true`
 `metrics.port` | Serve Prometheus metrics on this port | `44180`
 `metrics.nodePort` | External port for the metrics when service.type is `NodePort` | `nil`
+`metrics.service.appProtocol` | application protocol of the metrics port in the service | `http`
 `metrics.servicemonitor.enabled` | Enable Prometheus Operator ServiceMonitor | `false`
 `metrics.servicemonitor.namespace` | Define the namespace where to deploy the ServiceMonitor resource | `""`
 `metrics.servicemonitor.prometheusInstance` | Prometheus Instance definition  | `default`

helm/oauth2-proxy/templates/service.yaml

@@ -34,10 +34,16 @@ spec:
       nodePort: {{ .Values.service.nodePort }}
       {{- end }}
       protocol: TCP
+      {{- with .Values.service.appProtocol }}
+      appProtocol: {{ . }}
+      {{- end }}
       name: {{ .Values.httpScheme }}
     {{- if and .Values.metrics.enabled .Values.metrics.port }}
     - port: {{ .Values.metrics.port }}
       protocol: TCP
+      {{- with .Values.metrics.service.appProtocol }}
+      appProtocol: {{ . }}
+      {{- end }}
       targetPort: metrics
       {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.metrics.nodePort))) }}
       nodePort: {{ .Values.metrics.nodePort }}

helm/oauth2-proxy/values.yaml

@@ -108,6 +108,8 @@ service:
   # when service.type is NodePort ...
   # nodePort: 80
   portNumber: 80
+  # Protocol set on the service
+  appProtocol: http
   annotations: {}
   # foo.io/bar: "true"
 
@@ -297,6 +299,9 @@ metrics:
   port: 44180
   # when service.type is NodePort ...
   # nodePort: 44180
+  # Protocol set on the service for the metrics port
+  service:
+    appProtocol: http
   servicemonitor:
     # Enable Prometheus Operator ServiceMonitor
     enabled: false