Skip to content

Commit c5ac95e

Browse files
camilamacedo86camilamacedo86
committed
Revert "Merge pull request #4536 from abhishekdwivedi3060/master"
This reverts commit 9abbd42, reversing changes made to 5845cb3.
1 parent 1692d19 commit c5ac95e

File tree

18 files changed

+142
-329
lines changed

18 files changed

+142
-329
lines changed

‎docs/book/src/cronjob-tutorial/testdata/project/config/default/kustomization.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,6 @@ replacements:
7575
delimiter: '.'
7676
index: 0
7777
create: true
78-
- select:
79-
kind: ServiceMonitor
80-
group: monitoring.coreos.com
81-
version: v1
82-
name: controller-manager-metrics-monitor
83-
fieldPaths:
84-
- spec.endpoints.0.tlsConfig.serverName
85-
options:
86-
delimiter: '.'
87-
index: 0
88-
create: true
8978

9079
- source:
9180
kind: Service
@@ -105,17 +94,6 @@ replacements:
10594
delimiter: '.'
10695
index: 1
10796
create: true
108-
- select:
109-
kind: ServiceMonitor
110-
group: monitoring.coreos.com
111-
version: v1
112-
name: controller-manager-metrics-monitor
113-
fieldPaths:
114-
- spec.endpoints.0.tlsConfig.serverName
115-
options:
116-
delimiter: '.'
117-
index: 1
118-
create: true
11997

12098
- source: # Uncomment the following block if you have any webhook
12199
kind: Service

‎docs/book/src/cronjob-tutorial/testdata/project/config/prometheus/monitor_tls_patch.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# Patch for Prometheus ServiceMonitor to enable secure TLS configuration
22
# using certificates managed by cert-manager
3-
- op: replace
4-
path: /spec/endpoints/0/tlsConfig
5-
value:
6-
# SERVICE_NAME and SERVICE_NAMESPACE will be substituted by kustomize
7-
serverName: SERVICE_NAME.SERVICE_NAMESPACE.svc
8-
insecureSkipVerify: false
9-
ca:
10-
secret:
11-
name: metrics-server-cert
12-
key: ca.crt
13-
cert:
14-
secret:
15-
name: metrics-server-cert
16-
key: tls.crt
17-
keySecret:
18-
name: metrics-server-cert
19-
key: tls.key
3+
apiVersion: monitoring.coreos.com/v1
4+
kind: ServiceMonitor
5+
metadata:
6+
name: controller-manager-metrics-monitor
7+
namespace: system
8+
spec:
9+
endpoints:
10+
- tlsConfig:
11+
insecureSkipVerify: false
12+
ca:
13+
secret:
14+
name: metrics-server-cert
15+
key: ca.crt
16+
cert:
17+
secret:
18+
name: metrics-server-cert
19+
key: tls.crt
20+
keySecret:
21+
name: metrics-server-cert
22+
key: tls.key

‎docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4276,11 +4276,7 @@ metadata:
42764276
namespace: project-system
42774277
spec:
42784278
endpoints:
4279-
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
4280-
path: /metrics
4281-
port: https
4282-
scheme: https
4283-
tlsConfig:
4279+
- tlsConfig:
42844280
ca:
42854281
secret:
42864282
key: ca.crt
@@ -4293,7 +4289,6 @@ spec:
42934289
keySecret:
42944290
key: tls.key
42954291
name: metrics-server-cert
4296-
serverName: project-controller-manager-metrics-service.project-system.svc
42974292
selector:
42984293
matchLabels:
42994294
app.kubernetes.io/name: project

‎docs/book/src/getting-started/testdata/project/config/default/kustomization.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,6 @@ patches:
7575
# delimiter: '.'
7676
# index: 0
7777
# create: true
78-
# - select:
79-
# kind: ServiceMonitor
80-
# group: monitoring.coreos.com
81-
# version: v1
82-
# name: controller-manager-metrics-monitor
83-
# fieldPaths:
84-
# - spec.endpoints.0.tlsConfig.serverName
85-
# options:
86-
# delimiter: '.'
87-
# index: 0
88-
# create: true
8978
#
9079
# - source:
9180
# kind: Service
@@ -105,17 +94,6 @@ patches:
10594
# delimiter: '.'
10695
# index: 1
10796
# create: true
108-
# - select:
109-
# kind: ServiceMonitor
110-
# group: monitoring.coreos.com
111-
# version: v1
112-
# name: controller-manager-metrics-monitor
113-
# fieldPaths:
114-
# - spec.endpoints.0.tlsConfig.serverName
115-
# options:
116-
# delimiter: '.'
117-
# index: 1
118-
# create: true
11997
#
12098
# - source: # Uncomment the following block if you have any webhook
12199
# kind: Service

‎docs/book/src/getting-started/testdata/project/config/prometheus/monitor_tls_patch.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# Patch for Prometheus ServiceMonitor to enable secure TLS configuration
22
# using certificates managed by cert-manager
3-
- op: replace
4-
path: /spec/endpoints/0/tlsConfig
5-
value:
6-
# SERVICE_NAME and SERVICE_NAMESPACE will be substituted by kustomize
7-
serverName: SERVICE_NAME.SERVICE_NAMESPACE.svc
8-
insecureSkipVerify: false
9-
ca:
10-
secret:
11-
name: metrics-server-cert
12-
key: ca.crt
13-
cert:
14-
secret:
15-
name: metrics-server-cert
16-
key: tls.crt
17-
keySecret:
18-
name: metrics-server-cert
19-
key: tls.key
3+
apiVersion: monitoring.coreos.com/v1
4+
kind: ServiceMonitor
5+
metadata:
6+
name: controller-manager-metrics-monitor
7+
namespace: system
8+
spec:
9+
endpoints:
10+
- tlsConfig:
11+
insecureSkipVerify: false
12+
ca:
13+
secret:
14+
name: metrics-server-cert
15+
key: ca.crt
16+
cert:
17+
secret:
18+
name: metrics-server-cert
19+
key: tls.crt
20+
keySecret:
21+
name: metrics-server-cert
22+
key: tls.key

‎docs/book/src/multiversion-tutorial/testdata/project/config/default/kustomization.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,6 @@ replacements:
7575
delimiter: '.'
7676
index: 0
7777
create: true
78-
- select:
79-
kind: ServiceMonitor
80-
group: monitoring.coreos.com
81-
version: v1
82-
name: controller-manager-metrics-monitor
83-
fieldPaths:
84-
- spec.endpoints.0.tlsConfig.serverName
85-
options:
86-
delimiter: '.'
87-
index: 0
88-
create: true
8978

9079
- source:
9180
kind: Service
@@ -105,17 +94,6 @@ replacements:
10594
delimiter: '.'
10695
index: 1
10796
create: true
108-
- select:
109-
kind: ServiceMonitor
110-
group: monitoring.coreos.com
111-
version: v1
112-
name: controller-manager-metrics-monitor
113-
fieldPaths:
114-
- spec.endpoints.0.tlsConfig.serverName
115-
options:
116-
delimiter: '.'
117-
index: 1
118-
create: true
11997

12098
- source: # Uncomment the following block if you have any webhook
12199
kind: Service

‎docs/book/src/multiversion-tutorial/testdata/project/config/prometheus/monitor_tls_patch.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# Patch for Prometheus ServiceMonitor to enable secure TLS configuration
22
# using certificates managed by cert-manager
3-
- op: replace
4-
path: /spec/endpoints/0/tlsConfig
5-
value:
6-
# SERVICE_NAME and SERVICE_NAMESPACE will be substituted by kustomize
7-
serverName: SERVICE_NAME.SERVICE_NAMESPACE.svc
8-
insecureSkipVerify: false
9-
ca:
10-
secret:
11-
name: metrics-server-cert
12-
key: ca.crt
13-
cert:
14-
secret:
15-
name: metrics-server-cert
16-
key: tls.crt
17-
keySecret:
18-
name: metrics-server-cert
19-
key: tls.key
3+
apiVersion: monitoring.coreos.com/v1
4+
kind: ServiceMonitor
5+
metadata:
6+
name: controller-manager-metrics-monitor
7+
namespace: system
8+
spec:
9+
endpoints:
10+
- tlsConfig:
11+
insecureSkipVerify: false
12+
ca:
13+
secret:
14+
name: metrics-server-cert
15+
key: ca.crt
16+
cert:
17+
secret:
18+
name: metrics-server-cert
19+
key: tls.crt
20+
keySecret:
21+
name: metrics-server-cert
22+
key: tls.key

‎docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8122,11 +8122,7 @@ metadata:
81228122
namespace: project-system
81238123
spec:
81248124
endpoints:
8125-
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
8126-
path: /metrics
8127-
port: https
8128-
scheme: https
8129-
tlsConfig:
8125+
- tlsConfig:
81308126
ca:
81318127
secret:
81328128
key: ca.crt
@@ -8139,7 +8135,6 @@ spec:
81398135
keySecret:
81408136
key: tls.key
81418137
name: metrics-server-cert
8142-
serverName: project-controller-manager-metrics-service.project-system.svc
81438138
selector:
81448139
matchLabels:
81458140
app.kubernetes.io/name: project

‎hack/docs/internal/cronjob-tutorial/sample.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ const certManagerForMetricsAndWebhooks = `#replacements:
5252
# delimiter: '.'
5353
# index: 0
5454
# create: true
55-
# - select:
56-
# kind: ServiceMonitor
57-
# group: monitoring.coreos.com
58-
# version: v1
59-
# name: controller-manager-metrics-monitor
60-
# fieldPaths:
61-
# - spec.endpoints.0.tlsConfig.serverName
62-
# options:
63-
# delimiter: '.'
64-
# index: 0
65-
# create: true
6655
#
6756
# - source:
6857
# kind: Service
@@ -82,17 +71,6 @@ const certManagerForMetricsAndWebhooks = `#replacements:
8271
# delimiter: '.'
8372
# index: 1
8473
# create: true
85-
# - select:
86-
# kind: ServiceMonitor
87-
# group: monitoring.coreos.com
88-
# version: v1
89-
# name: controller-manager-metrics-monitor
90-
# fieldPaths:
91-
# - spec.endpoints.0.tlsConfig.serverName
92-
# options:
93-
# delimiter: '.'
94-
# index: 1
95-
# create: true
9674
#
9775
# - source: # Uncomment the following block if you have any webhook
9876
# kind: Service

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/kustomization.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,6 @@ patches:
120120
# delimiter: '.'
121121
# index: 0
122122
# create: true
123-
# - select:
124-
# kind: ServiceMonitor
125-
# group: monitoring.coreos.com
126-
# version: v1
127-
# name: controller-manager-metrics-monitor
128-
# fieldPaths:
129-
# - spec.endpoints.0.tlsConfig.serverName
130-
# options:
131-
# delimiter: '.'
132-
# index: 0
133-
# create: true
134123
#
135124
# - source:
136125
# kind: Service
@@ -150,17 +139,6 @@ patches:
150139
# delimiter: '.'
151140
# index: 1
152141
# create: true
153-
# - select:
154-
# kind: ServiceMonitor
155-
# group: monitoring.coreos.com
156-
# version: v1
157-
# name: controller-manager-metrics-monitor
158-
# fieldPaths:
159-
# - spec.endpoints.0.tlsConfig.serverName
160-
# options:
161-
# delimiter: '.'
162-
# index: 1
163-
# create: true
164142
#
165143
# - source: # Uncomment the following block if you have any webhook
166144
# kind: Service

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor_tls_patch.go

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,24 @@ func (f *ServiceMonitorPatch) SetTemplateDefaults() error {
4444

4545
const serviceMonitorPatchTemplate = `# Patch for Prometheus ServiceMonitor to enable secure TLS configuration
4646
# using certificates managed by cert-manager
47-
- op: replace
48-
path: /spec/endpoints/0/tlsConfig
49-
value:
50-
# SERVICE_NAME and SERVICE_NAMESPACE will be substituted by kustomize
51-
serverName: SERVICE_NAME.SERVICE_NAMESPACE.svc
52-
insecureSkipVerify: false
53-
ca:
54-
secret:
55-
name: metrics-server-cert
56-
key: ca.crt
57-
cert:
58-
secret:
59-
name: metrics-server-cert
60-
key: tls.crt
61-
keySecret:
62-
name: metrics-server-cert
63-
key: tls.key
47+
apiVersion: monitoring.coreos.com/v1
48+
kind: ServiceMonitor
49+
metadata:
50+
name: controller-manager-metrics-monitor
51+
namespace: system
52+
spec:
53+
endpoints:
54+
- tlsConfig:
55+
insecureSkipVerify: false
56+
ca:
57+
secret:
58+
name: metrics-server-cert
59+
key: ca.crt
60+
cert:
61+
secret:
62+
name: metrics-server-cert
63+
key: tls.crt
64+
keySecret:
65+
name: metrics-server-cert
66+
key: tls.key
6467
`

0 commit comments

Comments
 (0)