Skip to content

Commit 6148c37

Browse files
aleertaleert
authored
fix(operator): add alertmanager client config to ruler template (#13182)
1 parent b4d44f8 commit 6148c37

File tree

16 files changed

+521
-7
lines changed

16 files changed

+521
-7
lines changed

‎operator/apis/loki/v1/rulerconfig_types.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,13 @@ type AlertManagerClientTLSConfig struct {
221221
// +kubebuilder:validation:Optional
222222
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Key Path"
223223
KeyPath *string `json:"keyPath,omitempty"`
224+
225+
// Skip validating server certificate.
226+
//
227+
// +optional
228+
// +kubebuilder:validation:Optional
229+
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Skip validating server certificate"
230+
InsecureSkipVerify *bool `json:"insecureSkipVerify,omitempty"`
224231
}
225232

226233
// RemoteWriteAuthType defines the type of authorization to use to access the remote write endpoint.

‎operator/apis/loki/v1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ metadata:
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152152
containerImage: docker.io/grafana/loki-operator:0.6.1
153-
createdAt: "2024-06-04T16:17:47Z"
153+
createdAt: "2024-06-12T17:07:27Z"
154154
description: The Community Loki Operator provides Kubernetes native deployment
155155
and management of Loki and related logging components.
156156
features.operators.openshift.io/disconnected: "true"
@@ -995,6 +995,9 @@ spec:
995995
- description: The client-side certificate file path for the TLS configuration.
996996
displayName: Cert Path
997997
path: alertmanager.client.tls.certPath
998+
- description: Skip validating server certificate.
999+
displayName: Skip validating server certificate
1000+
path: alertmanager.client.tls.insecureSkipVerify
9981001
- description: The client-side key file path for the TLS configuration.
9991002
displayName: Key Path
10001003
path: alertmanager.client.tls.keyPath
@@ -1144,6 +1147,9 @@ spec:
11441147
- description: The client-side certificate file path for the TLS configuration.
11451148
displayName: Cert Path
11461149
path: overrides.alertmanager.client.tls.certPath
1150+
- description: Skip validating server certificate.
1151+
displayName: Skip validating server certificate
1152+
path: overrides.alertmanager.client.tls.insecureSkipVerify
11471153
- description: The client-side key file path for the TLS configuration.
11481154
displayName: Key Path
11491155
path: overrides.alertmanager.client.tls.keyPath

‎operator/bundle/community-openshift/manifests/loki.grafana.com_rulerconfigs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ spec:
107107
description: The client-side certificate file path for
108108
the TLS configuration.
109109
type: string
110+
insecureSkipVerify:
111+
description: Skip validating server certificate.
112+
type: boolean
110113
keyPath:
111114
description: The client-side key file path for the TLS
112115
configuration.
@@ -310,6 +313,9 @@ spec:
310313
description: The client-side certificate file path
311314
for the TLS configuration.
312315
type: string
316+
insecureSkipVerify:
317+
description: Skip validating server certificate.
318+
type: boolean
313319
keyPath:
314320
description: The client-side key file path for the
315321
TLS configuration.

‎operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ metadata:
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152152
containerImage: docker.io/grafana/loki-operator:0.6.1
153-
createdAt: "2024-06-04T16:17:41Z"
153+
createdAt: "2024-06-12T17:07:25Z"
154154
description: The Community Loki Operator provides Kubernetes native deployment
155155
and management of Loki and related logging components.
156156
operators.operatorframework.io/builder: operator-sdk-unknown
@@ -988,6 +988,9 @@ spec:
988988
- description: The client-side certificate file path for the TLS configuration.
989989
displayName: Cert Path
990990
path: alertmanager.client.tls.certPath
991+
- description: Skip validating server certificate.
992+
displayName: Skip validating server certificate
993+
path: alertmanager.client.tls.insecureSkipVerify
991994
- description: The client-side key file path for the TLS configuration.
992995
displayName: Key Path
993996
path: alertmanager.client.tls.keyPath
@@ -1137,6 +1140,9 @@ spec:
11371140
- description: The client-side certificate file path for the TLS configuration.
11381141
displayName: Cert Path
11391142
path: overrides.alertmanager.client.tls.certPath
1143+
- description: Skip validating server certificate.
1144+
displayName: Skip validating server certificate
1145+
path: overrides.alertmanager.client.tls.insecureSkipVerify
11401146
- description: The client-side key file path for the TLS configuration.
11411147
displayName: Key Path
11421148
path: overrides.alertmanager.client.tls.keyPath

‎operator/bundle/community/manifests/loki.grafana.com_rulerconfigs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ spec:
107107
description: The client-side certificate file path for
108108
the TLS configuration.
109109
type: string
110+
insecureSkipVerify:
111+
description: Skip validating server certificate.
112+
type: boolean
110113
keyPath:
111114
description: The client-side key file path for the TLS
112115
configuration.
@@ -310,6 +313,9 @@ spec:
310313
description: The client-side certificate file path
311314
for the TLS configuration.
312315
type: string
316+
insecureSkipVerify:
317+
description: Skip validating server certificate.
318+
type: boolean
313319
keyPath:
314320
description: The client-side key file path for the
315321
TLS configuration.

‎operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ metadata:
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152152
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
153-
createdAt: "2024-06-04T16:17:54Z"
153+
createdAt: "2024-06-12T17:07:29Z"
154154
description: |
155155
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
156156
## Prerequisites and Requirements
@@ -1008,6 +1008,9 @@ spec:
10081008
- description: The client-side certificate file path for the TLS configuration.
10091009
displayName: Cert Path
10101010
path: alertmanager.client.tls.certPath
1011+
- description: Skip validating server certificate.
1012+
displayName: Skip validating server certificate
1013+
path: alertmanager.client.tls.insecureSkipVerify
10111014
- description: The client-side key file path for the TLS configuration.
10121015
displayName: Key Path
10131016
path: alertmanager.client.tls.keyPath
@@ -1157,6 +1160,9 @@ spec:
11571160
- description: The client-side certificate file path for the TLS configuration.
11581161
displayName: Cert Path
11591162
path: overrides.alertmanager.client.tls.certPath
1163+
- description: Skip validating server certificate.
1164+
displayName: Skip validating server certificate
1165+
path: overrides.alertmanager.client.tls.insecureSkipVerify
11601166
- description: The client-side key file path for the TLS configuration.
11611167
displayName: Key Path
11621168
path: overrides.alertmanager.client.tls.keyPath

‎operator/bundle/openshift/manifests/loki.grafana.com_rulerconfigs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ spec:
107107
description: The client-side certificate file path for
108108
the TLS configuration.
109109
type: string
110+
insecureSkipVerify:
111+
description: Skip validating server certificate.
112+
type: boolean
110113
keyPath:
111114
description: The client-side key file path for the TLS
112115
configuration.
@@ -310,6 +313,9 @@ spec:
310313
description: The client-side certificate file path
311314
for the TLS configuration.
312315
type: string
316+
insecureSkipVerify:
317+
description: Skip validating server certificate.
318+
type: boolean
313319
keyPath:
314320
description: The client-side key file path for the
315321
TLS configuration.

‎operator/config/crd/bases/loki.grafana.com_rulerconfigs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ spec:
8989
description: The client-side certificate file path for
9090
the TLS configuration.
9191
type: string
92+
insecureSkipVerify:
93+
description: Skip validating server certificate.
94+
type: boolean
9295
keyPath:
9396
description: The client-side key file path for the TLS
9497
configuration.
@@ -292,6 +295,9 @@ spec:
292295
description: The client-side certificate file path
293296
for the TLS configuration.
294297
type: string
298+
insecureSkipVerify:
299+
description: Skip validating server certificate.
300+
type: boolean
295301
keyPath:
296302
description: The client-side key file path for the
297303
TLS configuration.

‎operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,6 +1376,9 @@ spec:
13761376
- description: The client-side certificate file path for the TLS configuration.
13771377
displayName: Cert Path
13781378
path: alertmanager.client.tls.certPath
1379+
- description: Skip validating server certificate.
1380+
displayName: Skip validating server certificate
1381+
path: alertmanager.client.tls.insecureSkipVerify
13791382
- description: The client-side key file path for the TLS configuration.
13801383
displayName: Key Path
13811384
path: alertmanager.client.tls.keyPath
@@ -1525,6 +1528,9 @@ spec:
15251528
- description: The client-side certificate file path for the TLS configuration.
15261529
displayName: Cert Path
15271530
path: overrides.alertmanager.client.tls.certPath
1531+
- description: Skip validating server certificate.
1532+
displayName: Skip validating server certificate
1533+
path: overrides.alertmanager.client.tls.insecureSkipVerify
15281534
- description: The client-side key file path for the TLS configuration.
15291535
displayName: Key Path
15301536
path: overrides.alertmanager.client.tls.keyPath

‎operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,9 @@ spec:
13691369
- description: The client-side certificate file path for the TLS configuration.
13701370
displayName: Cert Path
13711371
path: alertmanager.client.tls.certPath
1372+
- description: Skip validating server certificate.
1373+
displayName: Skip validating server certificate
1374+
path: alertmanager.client.tls.insecureSkipVerify
13721375
- description: The client-side key file path for the TLS configuration.
13731376
displayName: Key Path
13741377
path: alertmanager.client.tls.keyPath
@@ -1518,6 +1521,9 @@ spec:
15181521
- description: The client-side certificate file path for the TLS configuration.
15191522
displayName: Cert Path
15201523
path: overrides.alertmanager.client.tls.certPath
1524+
- description: Skip validating server certificate.
1525+
displayName: Skip validating server certificate
1526+
path: overrides.alertmanager.client.tls.insecureSkipVerify
15211527
- description: The client-side key file path for the TLS configuration.
15221528
displayName: Key Path
15231529
path: overrides.alertmanager.client.tls.keyPath

‎operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,6 +1388,9 @@ spec:
13881388
- description: The client-side certificate file path for the TLS configuration.
13891389
displayName: Cert Path
13901390
path: alertmanager.client.tls.certPath
1391+
- description: Skip validating server certificate.
1392+
displayName: Skip validating server certificate
1393+
path: alertmanager.client.tls.insecureSkipVerify
13911394
- description: The client-side key file path for the TLS configuration.
13921395
displayName: Key Path
13931396
path: alertmanager.client.tls.keyPath
@@ -1537,6 +1540,9 @@ spec:
15371540
- description: The client-side certificate file path for the TLS configuration.
15381541
displayName: Cert Path
15391542
path: overrides.alertmanager.client.tls.certPath
1543+
- description: Skip validating server certificate.
1544+
displayName: Skip validating server certificate
1545+
path: overrides.alertmanager.client.tls.insecureSkipVerify
15401546
- description: The client-side key file path for the TLS configuration.
15411547
displayName: Key Path
15421548
path: overrides.alertmanager.client.tls.keyPath

‎operator/docs/operator/api.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,18 @@ string
237237
<p>The client-side key file path for the TLS configuration.</p>
238238
</td>
239239
</tr>
240+
<tr>
241+
<td>
242+
<code>insecureSkipVerify</code><br/>
243+
<em>
244+
bool
245+
</em>
246+
</td>
247+
<td>
248+
<em>(Optional)</em>
249+
<p>Skip validating server certificate.</p>
250+
</td>
251+
</tr>
240252
</tbody>
241253
</table>
242254

‎operator/internal/manifests/config.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,11 @@ func alertManagerConfig(spec *lokiv1.AlertManagerSpec) *config.AlertManagerConfi
248248
conf.Notifier = &config.NotifierConfig{}
249249
if tls := clt.TLS; tls != nil {
250250
conf.Notifier.TLS = config.TLSConfig{
251-
CAPath: tls.CAPath,
252-
ServerName: tls.ServerName,
253-
CertPath: tls.CertPath,
254-
KeyPath: tls.KeyPath,
251+
CAPath: tls.CAPath,
252+
ServerName: tls.ServerName,
253+
InsecureSkipVerify: tls.InsecureSkipVerify,
254+
CertPath: tls.CertPath,
255+
KeyPath: tls.KeyPath,
255256
}
256257
}
257258

0 commit comments

Comments
 (0)