fix: reuse code from node-exporter chart

Signed-off-by: Ludovic Ortega <[email protected]>
prometheus-community · Apr 6, 2024 · 96f4577 · 96f4577
1 parent 59ff19f
commit 96f4577
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/charts/prometheus-pushgateway/templates/service.yaml b/charts/prometheus-pushgateway/templates/service.yaml
@@ -19,13 +19,11 @@ spec:
   {{ else if and .Values.runAsStatefulSet (not (has .Values.service.type $stsNoHeadlessSvcTypes)) }}
   clusterIP: None # Headless service
   {{- end }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
-  {{- end }}
-  {{- if .Values.service.ipFamilies }}
-  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- if .Values.service.ipDualStack.enabled }}
+    ipFamilies: {{ toYaml .Values.service.ipDualStack.ipFamilies | nindent 4 }}
+    ipFamilyPolicy: {{ .Values.service.ipDualStack.ipFamilyPolicy }}
   {{- end }}
+  type: {{ .Values.service.type }}
   {{- with .Values.service.loadBalancerIP }}
   loadBalancerIP: {{ . }}
   {{- end }}

diff --git a/charts/prometheus-pushgateway/values.yaml b/charts/prometheus-pushgateway/values.yaml
@@ -29,10 +29,10 @@ service:
   # Optional - Can be used for headless if value is "None"
   clusterIP: ""
 
-  # Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)
-  ipFamilyPolicy: ""
-  # Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.
-  ipFamilies: []
+  ipDualStack:
+    enabled: false
+    ipFamilies: ["IPv6", "IPv4"]
+    ipFamilyPolicy: "PreferDualStack"
 
   loadBalancerIP: ""
   loadBalancerSourceRanges: []