Skip to content

Commit 3b4865d

Browse files
committed
chore: adjust use for CAFile and TLSConfig fields for po 0.89.0
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
1 parent c7d1324 commit 3b4865d

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

pkg/controllers/monitoring/monitoring-stack/components.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ func newPrometheus(
267267
SafeTLSConfig: monv1.SafeTLSConfig{
268268
ServerName: ptr.To(ms.Name + "-alertmanager"),
269269
},
270-
CAFile: filepath.Join(prometheusSecretsMountPoint, caSecret.Name, caSecret.Key),
270+
TLSFilesConfig: monv1.TLSFilesConfig{
271+
CAFile: filepath.Join(prometheusSecretsMountPoint, caSecret.Name, caSecret.Key),
272+
},
271273
}
272274
}
273275
}

pkg/controllers/operator/components.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,18 @@ func newServiceMonitor(namespace string) *monv1.ServiceMonitor {
4646
{
4747
Port: "metrics",
4848
Scheme: ptr.To(monv1.Scheme("https")),
49-
TLSConfig: &monv1.TLSConfig{
50-
CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
51-
CertFile: "/etc/prometheus/secrets/metrics-client-certs/tls.crt",
52-
KeyFile: "/etc/prometheus/secrets/metrics-client-certs/tls.key",
53-
SafeTLSConfig: monv1.SafeTLSConfig{
54-
ServerName: ptr.To(fmt.Sprintf("%s.%s.svc", name, namespace)),
49+
HTTPConfigWithProxyAndTLSFiles: monv1.HTTPConfigWithProxyAndTLSFiles{
50+
HTTPConfigWithTLSFiles: monv1.HTTPConfigWithTLSFiles{
51+
TLSConfig: &monv1.TLSConfig{
52+
TLSFilesConfig: monv1.TLSFilesConfig{
53+
CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
54+
CertFile: "/etc/prometheus/secrets/metrics-client-certs/tls.crt",
55+
KeyFile: "/etc/prometheus/secrets/metrics-client-certs/tls.key",
56+
},
57+
SafeTLSConfig: monv1.SafeTLSConfig{
58+
ServerName: ptr.To(fmt.Sprintf("%s.%s.svc", name, namespace)),
59+
},
60+
},
5561
},
5662
},
5763
},

pkg/controllers/uiplugin/health_analyzer.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,19 @@ func newHealthAnalyzerServiceMonitor(namespace string) *monv1.ServiceMonitor {
224224
Interval: "30s",
225225
Port: "metrics",
226226
Scheme: ptr.To(monv1.Scheme("https")),
227-
TLSConfig: &monv1.TLSConfig{
228-
SafeTLSConfig: monv1.SafeTLSConfig{
229-
ServerName: ptr.To(name + "." + namespace + ".svc"),
227+
HTTPConfigWithProxyAndTLSFiles: monv1.HTTPConfigWithProxyAndTLSFiles{
228+
HTTPConfigWithTLSFiles: monv1.HTTPConfigWithTLSFiles{
229+
TLSConfig: &monv1.TLSConfig{
230+
TLSFilesConfig: monv1.TLSFilesConfig{
231+
CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
232+
CertFile: "/etc/prometheus/secrets/metrics-client-certs/tls.crt",
233+
KeyFile: "/etc/prometheus/secrets/metrics-client-certs/tls.key",
234+
},
235+
SafeTLSConfig: monv1.SafeTLSConfig{
236+
ServerName: ptr.To(name + "." + namespace + ".svc"),
237+
},
238+
},
230239
},
231-
CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
232-
CertFile: "/etc/prometheus/secrets/metrics-client-certs/tls.crt",
233-
KeyFile: "/etc/prometheus/secrets/metrics-client-certs/tls.key",
234240
},
235241
},
236242
},

0 commit comments

Comments
 (0)