From 310ec7167b54605e77b1da84df007aab1d09a5ae Mon Sep 17 00:00:00 2001 From: Andrei Matveyeu Date: Tue, 18 Feb 2025 12:16:52 +0100 Subject: [PATCH] testrun controller: remove hostname assumption for etcd Change-Id: I65399d709d616abf46af24c5079706ebbad1e02d --- internal/controller/testrun_controller.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/internal/controller/testrun_controller.go b/internal/controller/testrun_controller.go index 4924114d..e7e6d7f6 100644 --- a/internal/controller/testrun_controller.go +++ b/internal/controller/testrun_controller.go @@ -440,6 +440,16 @@ func (r TestRunReconciler) environmentRequest(cluster *etosv1alpha1.Cluster, tes etosMessageBus.Host = fmt.Sprintf("%s-%s", cluster.Name, etosMessageBus.Host) } + databaseHost := cluster.Spec.Database.Etcd.Host + if databaseHost == "" { + databaseHost = "etcd-client" + } + + databasePort := cluster.Spec.Database.Etcd.Port + if databasePort == "" { + databasePort = "2379" + } + return &etosv1alpha1.EnvironmentRequest{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ @@ -485,8 +495,8 @@ func (r TestRunReconciler) environmentRequest(cluster *etosv1alpha1.Cluster, tes EncryptionKey: cluster.Spec.ETOS.Config.EncryptionKey, RoutingKeyTag: cluster.Spec.ETOS.Config.RoutingKeyTag, GraphQlServer: eventRepository, - EtcdHost: fmt.Sprintf("%s-etcd", cluster.Name), - EtcdPort: cluster.Spec.Database.Etcd.Port, + EtcdHost: databaseHost, + EtcdPort: databasePort, EventDataTimeout: cluster.Spec.ETOS.Config.EventDataTimeout, WaitForTimeout: cluster.Spec.ETOS.Config.EnvironmentTimeout, EnvironmentProviderEventDataTimeout: cluster.Spec.ETOS.Config.EventDataTimeout,