Merge pull request #686 from Alja9/main

Author: jenting

charts/velero/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.16.0
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart for velero
 name: velero
-version: 10.0.1
+version: 10.0.2
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:

charts/velero/templates/service.yaml

@@ -17,10 +17,19 @@ metadata:
       {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: ClusterIP
+  {{- if .Values.metrics.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy }}
+  {{- end }}
+  {{- if .Values.metrics.service.internalTrafficPolicy }}
+  internalTrafficPolicy: {{ .Values.metrics.service.internalTrafficPolicy }}
+  {{- end }}
+  type: {{ .Values.metrics.service.type }}
   ports:
     - name: http-monitoring
       port: 8085
+      {{- if ( and (eq .Values.metrics.service.type "NodePort" ) (not (empty .Values.metrics.service.nodePort)) ) }}
+      nodePort: {{ .Values.metrics.service.nodePort }}
+      {{- end }}
       targetPort: http-monitoring
   selector:
     name: velero

charts/velero/values.yaml

@@ -238,7 +238,14 @@ metrics:
   # service metdata if metrics are enabled
   service:
     annotations: {}
+    type: ClusterIP
     labels: {}
+    nodePort: null
+
+    # External/Internal traffic policy setting (Cluster, Local)
+    # https://kubernetes.io/docs/reference/networking/virtual-ips/#traffic-policies
+    externalTrafficPolicy: ""
+    internalTrafficPolicy: ""
 
   # Pod annotations for Prometheus
   podAnnotations: