Skip to content

Commit 6790714

Browse files
authored
Merge pull request #4777 from sarthaksarthak9/missing
🐛 (helm/alpha-v1): Add control-plane labels to metrics service and ServiceMonitor templates
2 parents 9932c89 + 0225d83 commit 6790714

File tree

10 files changed

+10
-0
lines changed

10 files changed

+10
-0
lines changed

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/metrics/metrics-service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "chart.labels" . | nindent 4 }}
9+
control-plane: controller-manager
910
spec:
1011
ports:
1112
- port: 8443

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/prometheus/monitor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ kind: ServiceMonitor
55
metadata:
66
labels:
77
{{- include "chart.labels" . | nindent 4 }}
8+
control-plane: controller-manager
89
name: project-controller-manager-metrics-monitor
910
namespace: {{ .Release.Namespace }}
1011
spec:

docs/book/src/getting-started/testdata/project/dist/chart/templates/metrics/metrics-service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "chart.labels" . | nindent 4 }}
9+
control-plane: controller-manager
910
spec:
1011
ports:
1112
- port: 8443

docs/book/src/getting-started/testdata/project/dist/chart/templates/prometheus/monitor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ kind: ServiceMonitor
55
metadata:
66
labels:
77
{{- include "chart.labels" . | nindent 4 }}
8+
control-plane: controller-manager
89
name: project-controller-manager-metrics-monitor
910
namespace: {{ .Release.Namespace }}
1011
spec:

docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/metrics/metrics-service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "chart.labels" . | nindent 4 }}
9+
control-plane: controller-manager
910
spec:
1011
ports:
1112
- port: 8443

docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/prometheus/monitor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ kind: ServiceMonitor
55
metadata:
66
labels:
77
{{- include "chart.labels" . | nindent 4 }}
8+
control-plane: controller-manager
89
name: project-controller-manager-metrics-monitor
910
namespace: {{ .Release.Namespace }}
1011
spec:

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/metrics/metrics_service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ metadata:
5050
namespace: {{ "{{ .Release.Namespace }}" }}
5151
labels:
5252
{{ "{{- include \"chart.labels\" . | nindent 4 }}" }}
53+
control-plane: controller-manager
5354
spec:
5455
ports:
5556
- port: 8443

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/prometheus/monitor.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ kind: ServiceMonitor
4949
metadata:
5050
labels:
5151
{{ "{{- include \"chart.labels\" . | nindent 4 }}" }}
52+
control-plane: controller-manager
5253
name: {{ .ProjectName }}-controller-manager-metrics-monitor
5354
namespace: {{ "{{ .Release.Namespace }}" }}
5455
spec:

testdata/project-v4-with-plugins/dist/chart/templates/metrics/metrics-service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "chart.labels" . | nindent 4 }}
9+
control-plane: controller-manager
910
spec:
1011
ports:
1112
- port: 8443

testdata/project-v4-with-plugins/dist/chart/templates/prometheus/monitor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ kind: ServiceMonitor
55
metadata:
66
labels:
77
{{- include "chart.labels" . | nindent 4 }}
8+
control-plane: controller-manager
89
name: project-v4-with-plugins-controller-manager-metrics-monitor
910
namespace: {{ .Release.Namespace }}
1011
spec:

0 commit comments

Comments
 (0)