Check if custom certs are enabled before use service cert

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
grafana · Jul 11, 2024 · e4e890d · e4e890d
1 parent 75de22c
commit e4e890d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/internal/manifests/distributor/distributor.go b/internal/manifests/distributor/distributor.go
@@ -44,7 +44,8 @@ func BuildDistributor(params manifestutils.Params) ([]client.Object, error) {
 	objects := []client.Object{dep, distributorService}
 
 	if tempo.Spec.Template.Distributor.TLS.Enabled {
-		if params.CtrlConfig.Gates.OpenShift.ServingCertsService {
+		if params.CtrlConfig.Gates.OpenShift.ServingCertsService && tempo.Spec.Template.Distributor.TLS.CA == "" &&
+			tempo.Spec.Template.Distributor.TLS.Cert == "" {
 			caSecretName := naming.ServingCABundleName(tempo.Name)
 			certSecretName := naming.ServingCertName(manifestutils.DistributorComponentName, tempo.Name)
 			err = configureReceiversTLS(dep, caSecretName, certSecretName)