From 67cd857624bd33a715dfb68d31f0976f6f46dba5 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Fri, 1 Nov 2024 10:37:16 -0400 Subject: [PATCH] cryostat expects to talk to storage over http only for now --- .../common/resource_definitions/resource_definitions.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/controllers/common/resource_definitions/resource_definitions.go b/internal/controllers/common/resource_definitions/resource_definitions.go index da1316fd..349f132d 100644 --- a/internal/controllers/common/resource_definitions/resource_definitions.go +++ b/internal/controllers/common/resource_definitions/resource_definitions.go @@ -1210,6 +1210,11 @@ func NewCoreContainer(cr *model.CryostatInstance, specs *ServiceSpecs, imageTag configPath := "/opt/cryostat.d/conf.d" templatesPath := "/opt/cryostat.d/templates.d" + storageProtocol := "http" + // TODO + // if tls != nil { + // storageProtocol = "https" + // } envs := []corev1.EnvVar{ { Name: "QUARKUS_HTTP_HOST", @@ -1257,7 +1262,7 @@ func NewCoreContainer(cr *model.CryostatInstance, specs *ServiceSpecs, imageTag }, { Name: "QUARKUS_S3_ENDPOINT_OVERRIDE", - Value: fmt.Sprintf("https://%s-storage.%s.svc.cluster.local:8333", cr.Name, cr.InstallNamespace), + Value: fmt.Sprintf("%s://%s-storage.%s.svc.cluster.local:8333", storageProtocol, cr.Name, cr.InstallNamespace), }, { Name: "QUARKUS_S3_PATH_STYLE_ACCESS", @@ -1639,6 +1644,7 @@ func NewStorageContainer(cr *model.CryostatInstance, imageTag string, tls *TLSCo livenessProbeScheme := corev1.URISchemeHTTP + // TODO /** if tls != nil { tlsEnvs := []corev1.EnvVar{ @@ -1787,6 +1793,7 @@ func NewDatabaseContainer(cr *model.CryostatInstance, imageTag string, tls *TLSC }, } + // TODO /** if tls != nil { tlsEnvs := []corev1.EnvVar{