Merge pull request #24 from kubeservice-stack/feat-ipv6

[feat] Add ipv4/ipv6 DualStack
kubeservice-stack · Jun 15, 2023 · 26c9a1c · 26c9a1c
2 parents f1491d0 + b33dcce
commit 26c9a1c
Show file tree

Hide file tree

Showing 37 changed files with 214 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" }}