Merge branch 'main' into jgantunes/sc-113015/preflight-remote-access-…

…on-join
replicatedhq · Nov 26, 2024 · dcd6f84 · dcd6f84
2 parents 715977a + e87a657
commit dcd6f84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/ha/ha_test.go b/pkg/ha/ha_test.go
@@ -313,7 +313,7 @@ func TestEnableHA(t *testing.T) {
 												Name: "rqlite",
 												Args: []string{
 													"-disco-mode=dns",
-													"-disco-config={\"name\":\"kotsadm-rqlite-headless\"}",
+													"-disco-config={\"name\":\"kotsadm-rqlite-headless.default.svc\"}",
 													"-bootstrap-expect=1",
 													"-auth=/auth/config.json",
 													"-join-as=kotsadm",
@@ -333,7 +333,7 @@ func TestEnableHA(t *testing.T) {
 			wantReplicas: 3,
 			wantArgs: []string{
 				"-disco-mode=dns",
-				"-disco-config={\"name\":\"kotsadm-rqlite-headless\"}",
+				"-disco-config={\"name\":\"kotsadm-rqlite-headless.default.svc\"}",
 				"-bootstrap-expect=3",
 				"-auth=/auth/config.json",
 				"-join-as=kotsadm",
@@ -360,7 +360,7 @@ func TestEnableHA(t *testing.T) {
 												Name: "rqlite",
 												Args: []string{
 													"-disco-mode=dns",
-													"-disco-config={\"name\":\"kotsadm-rqlite-headless\"}",
+													"-disco-config={\"name\":\"kotsadm-rqlite-headless.default.svc\"}",
 													"-bootstrap-expect=1",
 													"-auth=/auth/config.json",
 													"-join-as=kotsadm",
@@ -380,7 +380,7 @@ func TestEnableHA(t *testing.T) {
 			wantReplicas: 3,
 			wantArgs: []string{
 				"-disco-mode=dns",
-				"-disco-config={\"name\":\"kotsadm-rqlite-headless\"}",
+				"-disco-config={\"name\":\"kotsadm-rqlite-headless.default.svc\"}",
 				"-bootstrap-expect=3",
 				"-auth=/auth/config.json",
 				"-join-as=kotsadm",

diff --git a/pkg/kotsadm/objects/rqlite_objects.go b/pkg/kotsadm/objects/rqlite_objects.go
@@ -1,6 +1,7 @@
 package kotsadm
 
 import (
+	"fmt"
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/pkg/k8sutil"
 	"github.com/replicatedhq/kots/pkg/kotsadm/types"
@@ -57,6 +58,8 @@ func RqliteStatefulset(deployOptions types.DeployOptions, size resource.Quantity
 		podLabels[k] = v
 	}
 
+	rqliteDiscoveryFlag := fmt.Sprintf(`-disco-config={"name":"kotsadm-rqlite-headless.%s.svc"}`, deployOptions.Namespace)
+
 	statefulset := &appsv1.StatefulSet{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "apps/v1",
@@ -132,7 +135,7 @@ func RqliteStatefulset(deployOptions types.DeployOptions, size resource.Quantity
 							Name:            "rqlite",
 							Args: []string{
 								"-disco-mode=dns",
-								"-disco-config={\"name\":\"kotsadm-rqlite-headless\"}",
+								rqliteDiscoveryFlag,
 								"-bootstrap-expect=1",
 								"-auth=/auth/config.json",
 								"-join-as=kotsadm",