Skip to content

Commit b08609e

Browse files
committed
fix: use monv1.Scheme struct instead of strings
Signed-off-by: Jan Fajerski <[email protected]>
1 parent 01d120f commit b08609e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func newPrometheus(
256256
{
257257
Name: ms.Name + "-alertmanager",
258258
Namespace: ptr.To(ms.Namespace),
259-
Scheme: "http",
259+
Scheme: ptr.To(monv1.Scheme("http")),
260260
Port: intstr.FromString("web"),
261261
},
262262
},
@@ -266,7 +266,7 @@ func newPrometheus(
266266

267267
prometheus.Spec.Secrets = append(prometheus.Spec.Secrets, caSecret.Name)
268268

269-
prometheus.Spec.Alerting.Alertmanagers[0].Scheme = "https"
269+
prometheus.Spec.Alerting.Alertmanagers[0].Scheme = ptr.To(monv1.Scheme("https"))
270270
prometheus.Spec.Alerting.Alertmanagers[0].TLSConfig = &monv1.TLSConfig{
271271
SafeTLSConfig: monv1.SafeTLSConfig{
272272
ServerName: ptr.To(ms.Name + "-alertmanager"),

pkg/controllers/monitoring/thanos-querier/components.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func newServiceMonitor(name string, namespace string, thanos *msoapi.ThanosQueri
252252
Endpoints: []monv1.Endpoint{
253253
{
254254
Port: "http",
255-
Scheme: "http",
255+
Scheme: ptr.To(monv1.Scheme("http")),
256256
},
257257
},
258258
Selector: metav1.LabelSelector{
@@ -263,7 +263,7 @@ func newServiceMonitor(name string, namespace string, thanos *msoapi.ThanosQueri
263263
},
264264
}
265265
if thanos.Spec.WebTLSConfig != nil {
266-
serviceMonitor.Spec.Endpoints[0].Scheme = "https"
266+
serviceMonitor.Spec.Endpoints[0].Scheme = ptr.To(monv1.Scheme("https"))
267267
serviceMonitor.Spec.Endpoints[0].TLSConfig = &monv1.TLSConfig{
268268
SafeTLSConfig: monv1.SafeTLSConfig{
269269
CA: monv1.SecretOrConfigMap{

pkg/controllers/operator/components.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func newServiceMonitor(namespace string) *monv1.ServiceMonitor {
4545
Endpoints: []monv1.Endpoint{
4646
{
4747
Port: "metrics",
48-
Scheme: "https",
48+
Scheme: ptr.To(monv1.Scheme("https")),
4949
TLSConfig: &monv1.TLSConfig{
5050
CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
5151
CertFile: "/etc/prometheus/secrets/metrics-client-certs/tls.crt",

pkg/controllers/uiplugin/health_analyzer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func newHealthAnalyzerServiceMonitor(namespace string) *monv1.ServiceMonitor {
197197
{
198198
Interval: "30s",
199199
Port: "metrics",
200-
Scheme: "https",
200+
Scheme: ptr.To(monv1.Scheme("https")),
201201
TLSConfig: &monv1.TLSConfig{
202202
SafeTLSConfig: monv1.SafeTLSConfig{
203203
ServerName: ptr.To(name + "." + namespace + ".svc"),

0 commit comments

Comments
 (0)