diff --git a/logging/loggie/templates/loggie-service.yaml b/logging/loggie/templates/loggie-service.yaml index d1fa0fd..bf81dc8 100644 --- a/logging/loggie/templates/loggie-service.yaml +++ b/logging/loggie/templates/loggie-service.yaml @@ -7,9 +7,14 @@ metadata: name: {{ template "loggie.name" . }} namespace: {{ .Release.Namespace }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} ports: - {{- if .Values.servicePorts }} - {{ toYaml .Values.servicePorts | nindent 4}} + {{- if .Values.service.servicePorts }} + {{ toYaml .Values.service.servicePorts | nindent 4}} {{- end }} selector: app: loggie diff --git a/logging/loggie/values.yaml b/logging/loggie/values.yaml index 1685d5e..1bbe804 100644 --- a/logging/loggie/values.yaml +++ b/logging/loggie/values.yaml @@ -151,14 +151,17 @@ aggregator: enabled: true port: 9196 - -servicePorts: - - name: monitor - port: 9196 - targetPort: 9196 -# - name: gprc -# port: 6066 -# targetPort: 6066 +service: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack + servicePorts: + - name: monitor + port: 9196 + targetPort: 9196 +# - name: gprc +# port: 6066 +# targetPort: 6066 serviceMonitor: diff --git a/logging/loki/templates/service-headless.yaml b/logging/loki/templates/service-headless.yaml index cd40a2f..de4b727 100644 --- a/logging/loki/templates/service-headless.yaml +++ b/logging/loki/templates/service-headless.yaml @@ -10,6 +10,11 @@ metadata: {{- end }} variant: headless spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} clusterIP: None ports: - port: {{ .Values.service.port }} diff --git a/logging/loki/templates/service.yaml b/logging/loki/templates/service.yaml index 1a88779..7a2a1bb 100644 --- a/logging/loki/templates/service.yaml +++ b/logging/loki/templates/service.yaml @@ -11,6 +11,11 @@ metadata: annotations: {{- toYaml .Values.service.annotations | nindent 4 }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} {{- if .Values.service.loadBalancerSourceRanges }} externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }} {{- end }} diff --git a/logging/loki/values.yaml b/logging/loki/values.yaml index f5e2077..8c7219a 100644 --- a/logging/loki/values.yaml +++ b/logging/loki/values.yaml @@ -308,6 +308,9 @@ service: annotations: {} labels: {} targetPort: http-metrics + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack serviceAccount: create: true diff --git a/metrics/charts/grafana/templates/headless-service.yaml b/metrics/charts/grafana/templates/headless-service.yaml index b5faddc..6f203e4 100644 --- a/metrics/charts/grafana/templates/headless-service.yaml +++ b/metrics/charts/grafana/templates/headless-service.yaml @@ -11,6 +11,11 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} clusterIP: None selector: {{- include "grafana.selectorLabels" . | nindent 4 }} diff --git a/metrics/charts/grafana/templates/service.yaml b/metrics/charts/grafana/templates/service.yaml index d0a1756..156257a 100644 --- a/metrics/charts/grafana/templates/service.yaml +++ b/metrics/charts/grafana/templates/service.yaml @@ -15,6 +15,11 @@ metadata: {{ tpl (toYaml . | indent 4) $root }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} {{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }} type: ClusterIP {{- if .Values.service.clusterIP }} diff --git a/metrics/charts/kube-state-metrics/templates/service.yaml b/metrics/charts/kube-state-metrics/templates/service.yaml index 6c486a6..004abfc 100644 --- a/metrics/charts/kube-state-metrics/templates/service.yaml +++ b/metrics/charts/kube-state-metrics/templates/service.yaml @@ -13,6 +13,11 @@ metadata: {{- toYaml .Values.service.annotations | nindent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} type: "{{ .Values.service.type }}" ports: - name: "http" diff --git a/metrics/charts/kube-state-metrics/values.yaml b/metrics/charts/kube-state-metrics/values.yaml index a2c4ba3..0fe5429 100644 --- a/metrics/charts/kube-state-metrics/values.yaml +++ b/metrics/charts/kube-state-metrics/values.yaml @@ -50,6 +50,9 @@ service: loadBalancerSourceRanges: [] clusterIP: "" annotations: {} + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack ## Additional labels to add to all resources customLabels: {} diff --git a/metrics/charts/kubeservice-ebpf-exporter/templates/service.yaml b/metrics/charts/kubeservice-ebpf-exporter/templates/service.yaml index 1647bad..dfbf8ca 100644 --- a/metrics/charts/kubeservice-ebpf-exporter/templates/service.yaml +++ b/metrics/charts/kubeservice-ebpf-exporter/templates/service.yaml @@ -12,6 +12,11 @@ metadata: {{- end }} namespace: {{ .Release.Namespace }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }} diff --git a/metrics/charts/kubeservice-ebpf-exporter/values.yaml b/metrics/charts/kubeservice-ebpf-exporter/values.yaml index f89bc2a..dc59b0d 100644 --- a/metrics/charts/kubeservice-ebpf-exporter/values.yaml +++ b/metrics/charts/kubeservice-ebpf-exporter/values.yaml @@ -60,6 +60,10 @@ service: port: 80 # Add service annotations. annotations: {} + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack + # Specify taint tolerations. tolerations: - effect: NoSchedule diff --git a/metrics/charts/prometheus-node-exporter/templates/service.yaml b/metrics/charts/prometheus-node-exporter/templates/service.yaml index fbed05c..bfd6e7c 100644 --- a/metrics/charts/prometheus-node-exporter/templates/service.yaml +++ b/metrics/charts/prometheus-node-exporter/templates/service.yaml @@ -9,6 +9,11 @@ metadata: {{ toYaml .Values.service.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }} diff --git a/metrics/charts/prometheus-node-exporter/values.yaml b/metrics/charts/prometheus-node-exporter/values.yaml index 7152704..37a0feb 100644 --- a/metrics/charts/prometheus-node-exporter/values.yaml +++ b/metrics/charts/prometheus-node-exporter/values.yaml @@ -20,6 +20,9 @@ service: listenOnAllInterfaces: true annotations: prometheus.io/scrape: "true" + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack # Additional environment variables that will be passed to the daemonset env: {} diff --git a/metrics/charts/prometheus-pingmesh-exporter/templates/service.yaml b/metrics/charts/prometheus-pingmesh-exporter/templates/service.yaml index 745e905..7823639 100644 --- a/metrics/charts/prometheus-pingmesh-exporter/templates/service.yaml +++ b/metrics/charts/prometheus-pingmesh-exporter/templates/service.yaml @@ -13,6 +13,11 @@ metadata: {{ toYaml .Values.service.labels | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }} diff --git a/metrics/charts/prometheus-pingmesh-exporter/values.yaml b/metrics/charts/prometheus-pingmesh-exporter/values.yaml index 613ce47..5eca9d8 100644 --- a/metrics/charts/prometheus-pingmesh-exporter/values.yaml +++ b/metrics/charts/prometheus-pingmesh-exporter/values.yaml @@ -260,6 +260,9 @@ service: labels: {} type: ClusterIP port: 9115 + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack # Only changes container port. Application port can be changed with extraArgs (--web.listen-address=:9115) # https://github.com/prometheus/pingmesh_exporter/blob/998037b5b40c1de5fee348ffdea8820509d85171/main.go#L55 diff --git a/metrics/charts/prometheus-snmp-exporter/templates/service.yaml b/metrics/charts/prometheus-snmp-exporter/templates/service.yaml index 9216275..161d8b3 100644 --- a/metrics/charts/prometheus-snmp-exporter/templates/service.yaml +++ b/metrics/charts/prometheus-snmp-exporter/templates/service.yaml @@ -13,6 +13,11 @@ metadata: {{ toYaml .Values.service.labels | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} type: {{ .Values.service.type }} ports: - name: http diff --git a/metrics/charts/prometheus-snmp-exporter/values.yaml b/metrics/charts/prometheus-snmp-exporter/values.yaml index 06bd6b3..c0a03e4 100644 --- a/metrics/charts/prometheus-snmp-exporter/values.yaml +++ b/metrics/charts/prometheus-snmp-exporter/values.yaml @@ -79,6 +79,9 @@ service: annotations: {} type: ClusterIP port: 9116 + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack ## An Ingress resource can provide name-based virtual hosting and TLS ## termination among other things for CouchDB deployments which are accessed diff --git a/metrics/templates/alertmanager/service.yaml b/metrics/templates/alertmanager/service.yaml index 44100ec..92b6098 100644 --- a/metrics/templates/alertmanager/service.yaml +++ b/metrics/templates/alertmanager/service.yaml @@ -16,6 +16,11 @@ metadata: {{ toYaml .Values.alertmanager.service.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} {{- if .Values.alertmanager.service.clusterIP }} clusterIP: {{ .Values.alertmanager.service.clusterIP }} {{- end }} diff --git a/metrics/templates/alertmanager/serviceperreplica.yaml b/metrics/templates/alertmanager/serviceperreplica.yaml index 75a13bd..1772ed1 100644 --- a/metrics/templates/alertmanager/serviceperreplica.yaml +++ b/metrics/templates/alertmanager/serviceperreplica.yaml @@ -21,6 +21,11 @@ items: {{ toYaml $serviceValues.annotations | indent 8 }} {{- end }} spec: + {{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + {{- if .Values.global.dualStack }} + {{ toYaml .Values.global.dualStack | indent 6 }} + {{- end }} + {{- end }} {{- if $serviceValues.clusterIP }} clusterIP: {{ $serviceValues.clusterIP }} {{- end }} diff --git a/metrics/templates/exporters/calico/service.yaml b/metrics/templates/exporters/calico/service.yaml index be370ed..9069b09 100644 --- a/metrics/templates/exporters/calico/service.yaml +++ b/metrics/templates/exporters/calico/service.yaml @@ -10,6 +10,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics @@ -33,6 +38,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/core-dns/service.yaml b/metrics/templates/exporters/core-dns/service.yaml index f77db41..d8f448b 100644 --- a/metrics/templates/exporters/core-dns/service.yaml +++ b/metrics/templates/exporters/core-dns/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/kube-controller-manager/service.yaml b/metrics/templates/exporters/kube-controller-manager/service.yaml index 197f0f4..9c6c79a 100644 --- a/metrics/templates/exporters/kube-controller-manager/service.yaml +++ b/metrics/templates/exporters/kube-controller-manager/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/kube-dns/service.yaml b/metrics/templates/exporters/kube-dns/service.yaml index c7bf142..74e6465 100644 --- a/metrics/templates/exporters/kube-dns/service.yaml +++ b/metrics/templates/exporters/kube-dns/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics-dnsmasq diff --git a/metrics/templates/exporters/kube-etcd/service.yaml b/metrics/templates/exporters/kube-etcd/service.yaml index b2677e2..b6fb121 100644 --- a/metrics/templates/exporters/kube-etcd/service.yaml +++ b/metrics/templates/exporters/kube-etcd/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/kube-proxy/service.yaml b/metrics/templates/exporters/kube-proxy/service.yaml index 6a93319..a872aa1 100644 --- a/metrics/templates/exporters/kube-proxy/service.yaml +++ b/metrics/templates/exporters/kube-proxy/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/kube-scheduler/service.yaml b/metrics/templates/exporters/kube-scheduler/service.yaml index eef9df0..55bc85c 100644 --- a/metrics/templates/exporters/kube-scheduler/service.yaml +++ b/metrics/templates/exporters/kube-scheduler/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/metrics-server/service.yaml b/metrics/templates/exporters/metrics-server/service.yaml index 675ff66..e54f398 100644 --- a/metrics/templates/exporters/metrics-server/service.yaml +++ b/metrics/templates/exporters/metrics-server/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/exporters/node-local-dns/service.yaml b/metrics/templates/exporters/node-local-dns/service.yaml index 381cb6b..f5aae77 100644 --- a/metrics/templates/exporters/node-local-dns/service.yaml +++ b/metrics/templates/exporters/node-local-dns/service.yaml @@ -9,6 +9,11 @@ metadata: {{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} clusterIP: None ports: - name: http-metrics diff --git a/metrics/templates/prometheus-operator/service.yaml b/metrics/templates/prometheus-operator/service.yaml index b5ef5b9..edf3926 100644 --- a/metrics/templates/prometheus-operator/service.yaml +++ b/metrics/templates/prometheus-operator/service.yaml @@ -15,6 +15,11 @@ metadata: {{ toYaml .Values.prometheusOperator.service.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} {{- if .Values.prometheusOperator.service.clusterIP }} clusterIP: {{ .Values.prometheusOperator.service.clusterIP }} {{- end }} diff --git a/metrics/templates/prometheus/service.yaml b/metrics/templates/prometheus/service.yaml index 1e1f9c7..71d5bdd 100644 --- a/metrics/templates/prometheus/service.yaml +++ b/metrics/templates/prometheus/service.yaml @@ -16,6 +16,11 @@ metadata: {{ toYaml .Values.prometheus.service.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} {{- if .Values.prometheus.service.clusterIP }} clusterIP: {{ .Values.prometheus.service.clusterIP }} {{- end }} diff --git a/metrics/templates/prometheus/serviceThanosSidecar.yaml b/metrics/templates/prometheus/serviceThanosSidecar.yaml index 2b80e77..de9f3bb 100644 --- a/metrics/templates/prometheus/serviceThanosSidecar.yaml +++ b/metrics/templates/prometheus/serviceThanosSidecar.yaml @@ -15,6 +15,11 @@ metadata: {{ toYaml .Values.prometheus.thanosService.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} type: {{ .Values.prometheus.thanosService.type }} clusterIP: {{ .Values.prometheus.thanosService.clusterIP }} {{- if ne .Values.prometheus.thanosService.type "ClusterIP" }} diff --git a/metrics/templates/prometheus/serviceThanosSidecarExternal.yaml b/metrics/templates/prometheus/serviceThanosSidecarExternal.yaml index fa45934..879aff1 100644 --- a/metrics/templates/prometheus/serviceThanosSidecarExternal.yaml +++ b/metrics/templates/prometheus/serviceThanosSidecarExternal.yaml @@ -14,6 +14,11 @@ metadata: {{ toYaml .Values.prometheus.thanosServiceExternal.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} type: {{ .Values.prometheus.thanosServiceExternal.type }} {{- if .Values.prometheus.thanosServiceExternal.loadBalancerIP }} loadBalancerIP: {{ .Values.prometheus.thanosServiceExternal.loadBalancerIP }} diff --git a/metrics/templates/prometheus/serviceperreplica.yaml b/metrics/templates/prometheus/serviceperreplica.yaml index 8d2fdc3..67a0328 100644 --- a/metrics/templates/prometheus/serviceperreplica.yaml +++ b/metrics/templates/prometheus/serviceperreplica.yaml @@ -21,6 +21,11 @@ items: {{ toYaml $serviceValues.annotations | indent 8 }} {{- end }} spec: + {{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + {{- if .Values.global.dualStack }} + {{ toYaml .Values.global.dualStack | indent 6 }} + {{- end }} + {{- end }} {{- if $serviceValues.clusterIP }} clusterIP: {{ $serviceValues.clusterIP }} {{- end }} diff --git a/metrics/templates/thanos-ruler/service.yaml b/metrics/templates/thanos-ruler/service.yaml index 093dbf7..91aa738 100644 --- a/metrics/templates/thanos-ruler/service.yaml +++ b/metrics/templates/thanos-ruler/service.yaml @@ -16,6 +16,11 @@ metadata: {{ toYaml .Values.thanosRuler.service.annotations | indent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} +{{- if .Values.global.dualStack }} +{{ toYaml .Values.global.dualStack | indent 2 }} +{{- end }} +{{- end }} {{- if .Values.thanosRuler.service.clusterIP }} clusterIP: {{ .Values.thanosRuler.service.clusterIP }} {{- end }} diff --git a/metrics/values.yaml b/metrics/values.yaml index e3206d3..37f30c2 100644 --- a/metrics/values.yaml +++ b/metrics/values.yaml @@ -131,6 +131,10 @@ global: # - name: "image-pull-secret" # or # - "image-pull-secret" + dualStack: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack ## Configuration for alertmanager ## ref: https://prometheus.io/docs/alerting/alertmanager/ @@ -856,6 +860,9 @@ grafana: ## service: portName: http-web + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack serviceMonitor: # If true, a ServiceMonitor CRD is created for a prometheus operator @@ -1610,6 +1617,10 @@ kube-state-metrics: # targetLabel: nodename # replacement: $1 # action: replace + service: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack selfMonitor: enabled: false @@ -1680,12 +1691,32 @@ eBPFExporter: kubeservice-ebpf-exporter: namespaceOverride: "monitoring" + service: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack ## Deploy node exporter as a daemonset to all nodes ## nodeExporter: enabled: true +## Configuration for prometheus-pingmesh-exporter subchart +## +prometheus-pingmesh-exporter: + service: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack + +## Configuration for prometheus-snmp-exporter subchart +## +prometheus-snmp-exporter: + service: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack + ## Configuration for prometheus-node-exporter subchart ## prometheus-node-exporter: @@ -1700,6 +1731,9 @@ prometheus-node-exporter: - --collector.filesystem.fs-types-exclude=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ service: portName: http-metrics + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack prometheus: monitor: enabled: true diff --git a/tracing/tempo/templates/service.yaml b/tracing/tempo/templates/service.yaml index fc4fd03..7262619 100644 --- a/tracing/tempo/templates/service.yaml +++ b/tracing/tempo/templates/service.yaml @@ -10,6 +10,11 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: +{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }} + ipFamilies: +{{ toYaml .Values.service.ipFamilies | indent 2 }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} +{{- end }} {{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }} type: ClusterIP {{- if .Values.service.clusterIP }} diff --git a/tracing/tempo/values.yaml b/tracing/tempo/values.yaml index 1ad7bb8..c6dcd41 100644 --- a/tracing/tempo/values.yaml +++ b/tracing/tempo/values.yaml @@ -224,6 +224,9 @@ service: type: ClusterIP annotations: {} labels: {} + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack serviceMonitor: enabled: true