fix: add alertmanager client config to ruler template

grafana · Jun 12, 2024 · e337e43 · e337e43
1 parent b4d44f8
commit e337e43
Show file tree

Hide file tree

Showing 6 changed files with 452 additions and 4 deletions.
diff --git a/operator/apis/loki/v1/rulerconfig_types.go b/operator/apis/loki/v1/rulerconfig_types.go
@@ -221,6 +221,13 @@ type AlertManagerClientTLSConfig struct {
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Key Path"
 	KeyPath *string `json:"keyPath,omitempty"`
+
+	// Skip validating server certificate.
+	//
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Skip validating server certificate"
+	InsecureSkipVerify *bool `json:"insecureSkipVerify,omitempty"`
 }
 
 // RemoteWriteAuthType defines the type of authorization to use to access the remote write endpoint.

diff --git a/operator/apis/loki/v1/zz_generated.deepcopy.go b/operator/apis/loki/v1/zz_generated.deepcopy.go
diff --git a/operator/config/crd/bases/loki.grafana.com_rulerconfigs.yaml b/operator/config/crd/bases/loki.grafana.com_rulerconfigs.yaml
@@ -89,6 +89,9 @@ spec:
                             description: The client-side certificate file path for
                               the TLS configuration.
                             type: string
+                          insecureSkipVerify:
+                            description: Skip validating server certificate.
+                            type: boolean
                           keyPath:
                             description: The client-side key file path for the TLS
                               configuration.
@@ -292,6 +295,9 @@ spec:
                                   description: The client-side certificate file path
                                     for the TLS configuration.
                                   type: string
+                                insecureSkipVerify:
+                                  description: Skip validating server certificate.
+                                  type: boolean
                                 keyPath:
                                   description: The client-side key file path for the
                                     TLS configuration.

diff --git a/operator/internal/manifests/config.go b/operator/internal/manifests/config.go
@@ -248,10 +248,11 @@ func alertManagerConfig(spec *lokiv1.AlertManagerSpec) *config.AlertManagerConfi
 		conf.Notifier = &config.NotifierConfig{}
 		if tls := clt.TLS; tls != nil {
 			conf.Notifier.TLS = config.TLSConfig{
-				CAPath:     tls.CAPath,
-				ServerName: tls.ServerName,
-				CertPath:   tls.CertPath,
-				KeyPath:    tls.KeyPath,
+				CAPath:             tls.CAPath,
+				ServerName:         tls.ServerName,
+				InsecureSkipVerify: tls.InsecureSkipVerify,
+				CertPath:           tls.CertPath,
+				KeyPath:            tls.KeyPath,
 			}
 		}