(go/v4,helm/v1-alpha): Fix prometheus integration with TLS check

kubernetes-sigs · Feb 11, 2025 · d3eab39 · d3eab39
1 parent 1c98e2c
commit d3eab39
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 0 deletions.
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/prometheus/monitor_tls_patch.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/prometheus/monitor_tls_patch.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: project-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret:

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/prometheus/monitor.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/prometheus/monitor.yaml
@@ -15,6 +15,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{- if .Values.certmanager.enable }}
+        serverName: project-controller-manager-metrics-service.{{ .Release.Namespace }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca:

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml
@@ -4289,6 +4289,7 @@ spec:
       keySecret:
         key: tls.key
         name: metrics-server-cert
+      serverName: project-controller-manager-metrics-service.system.svc
   selector:
     matchLabels:
       app.kubernetes.io/name: project

diff --git a/docs/book/src/getting-started/testdata/project/config/prometheus/monitor_tls_patch.yaml b/docs/book/src/getting-started/testdata/project/config/prometheus/monitor_tls_patch.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: project-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret:

diff --git a/docs/book/src/getting-started/testdata/project/dist/chart/templates/prometheus/monitor.yaml b/docs/book/src/getting-started/testdata/project/dist/chart/templates/prometheus/monitor.yaml
@@ -15,6 +15,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{- if .Values.certmanager.enable }}
+        serverName: project-controller-manager-metrics-service.{{ .Release.Namespace }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca:

diff --git a/.../book/src/multiversion-tutorial/testdata/project/config/prometheus/monitor_tls_patch.yaml b/.../book/src/multiversion-tutorial/testdata/project/config/prometheus/monitor_tls_patch.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: project-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret:

diff --git a/...k/src/multiversion-tutorial/testdata/project/dist/chart/templates/prometheus/monitor.yaml b/...k/src/multiversion-tutorial/testdata/project/dist/chart/templates/prometheus/monitor.yaml
@@ -15,6 +15,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{- if .Values.certmanager.enable }}
+        serverName: project-controller-manager-metrics-service.{{ .Release.Namespace }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca:

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml b/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml
@@ -8135,6 +8135,7 @@ spec:
       keySecret:
         key: tls.key
         name: metrics-server-cert
+      serverName: project-controller-manager-metrics-service.system.svc
   selector:
     matchLabels:
       app.kubernetes.io/name: project

diff --git a/...s/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor_tls_patch.go b/...s/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor_tls_patch.go
@@ -52,6 +52,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: {{ .ProjectName }}-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret:

diff --git a/.../optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/prometheus/monitor.go b/.../optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/prometheus/monitor.go
@@ -59,6 +59,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{ "{{- if .Values.certmanager.enable }}" }}
+        serverName: {{ .ProjectName }}-controller-manager-metrics-service.{{ "{{ .Release.Namespace }}" }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca:

diff --git a/testdata/project-v4-multigroup/config/prometheus/monitor_tls_patch.yaml b/testdata/project-v4-multigroup/config/prometheus/monitor_tls_patch.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: project-v4-multigroup-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret:

diff --git a/testdata/project-v4-with-plugins/config/prometheus/monitor_tls_patch.yaml b/testdata/project-v4-with-plugins/config/prometheus/monitor_tls_patch.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: project-v4-with-plugins-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret:

diff --git a/testdata/project-v4-with-plugins/dist/chart/templates/prometheus/monitor.yaml b/testdata/project-v4-with-plugins/dist/chart/templates/prometheus/monitor.yaml
@@ -15,6 +15,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{- if .Values.certmanager.enable }}
+        serverName: project-v4-with-plugins-controller-manager-metrics-service.{{ .Release.Namespace }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca:

diff --git a/testdata/project-v4/config/prometheus/monitor_tls_patch.yaml b/testdata/project-v4/config/prometheus/monitor_tls_patch.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   endpoints:
     - tlsConfig:
+        serverName: project-v4-controller-manager-metrics-service.system.svc
         insecureSkipVerify: false
         ca:
           secret: