fix(proxy): use fqdn for kotsadm-rqlite and kotsadm-minio addresses (#…

…4874) * fix(proxy): use fqdn for kotsadm-rqlite address * fix(proxy): use fqdn for kotsadm-minio address
replicatedhq · Sep 9, 2024 · abe9f73 · abe9f73
1 parent b4c1bfa
commit abe9f73
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml b/deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml
@@ -6,7 +6,7 @@ metadata:
     kots.io/kotsadm: 'true'
     kots.io/backup: velero
 stringData:
-  uri: http://kotsadm:${RQLITE_PASSWORD}@kotsadm-rqlite:4001?timeout=60&disableClusterDiscovery=true
+  uri: http://kotsadm:${RQLITE_PASSWORD}@kotsadm-rqlite.default.svc.cluster.local:4001?timeout=60&disableClusterDiscovery=true
   password: ${RQLITE_PASSWORD}
   authconfig.json: |
     [{"username": "kotsadm", "password": "${RQLITE_PASSWORD}", "perms": ["all"]}, {"username": "*", "perms": ["status", "ready"]}]
diff --git a/pkg/kotsadm/objects/kotsadm_objects.go b/pkg/kotsadm/objects/kotsadm_objects.go
@@ -290,7 +290,7 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 		},
 		{
 			Name:  "S3_ENDPOINT",
-			Value: "http://kotsadm-minio:9000",
+			Value: fmt.Sprintf("http://kotsadm-minio.%s.svc.cluster.local:9000", deployOptions.Namespace),
 		},
 		{
 			Name:  "S3_BUCKET_NAME",
@@ -562,7 +562,7 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 							Env: []corev1.EnvVar{
 								{
 									Name:  "S3_ENDPOINT",
-									Value: "http://kotsadm-minio:9000",
+									Value: fmt.Sprintf("http://kotsadm-minio.%s.svc.cluster.local:9000", deployOptions.Namespace),
 								},
 								{
 									Name:  "S3_BUCKET_NAME",
@@ -1082,7 +1082,7 @@ func KotsadmStatefulSet(deployOptions types.DeployOptions, size resource.Quantit
 							Env: []corev1.EnvVar{
 								{
 									Name:  "S3_ENDPOINT",
-									Value: "http://kotsadm-minio:9000",
+									Value: fmt.Sprintf("http://kotsadm-minio.%s.svc.cluster.local:9000", deployOptions.Namespace),
 								},
 								{
 									Name:  "S3_BUCKET_NAME",

diff --git a/pkg/kotsadm/objects/secrets_objects.go b/pkg/kotsadm/objects/secrets_objects.go
@@ -49,7 +49,7 @@ func RqliteSecret(namespace string, password string) *corev1.Secret {
 			Labels:    types.GetKotsadmLabels(),
 		},
 		Data: map[string][]byte{
-			"uri":             []byte(fmt.Sprintf("http://kotsadm:%s@kotsadm-rqlite:4001?timeout=60&disableClusterDiscovery=true", password)),
+			"uri":             []byte(fmt.Sprintf("http://kotsadm:%s@kotsadm-rqlite.%s.svc.cluster.local:4001?timeout=60&disableClusterDiscovery=true", password, namespace)),
 			"password":        []byte(password),
 			"authconfig.json": []byte(fmt.Sprintf(`[{"username": "kotsadm", "password": "%s", "perms": ["all"]}, {"username": "*", "perms": ["status", "ready"]}]`, password)),
 		},

diff --git a/pkg/supportbundle/staticspecs/kurlspec.yaml b/pkg/supportbundle/staticspecs/kurlspec.yaml
@@ -121,7 +121,7 @@ spec:
             - name: rqlite-status
               image: busybox:1
               command: ["wget"]
-              args: ["-q", "-T", "5", "http://kotsadm-rqlite:4001/status?pretty", "-O-"]
+              args: ["-q", "-T", "5", "http://kotsadm-rqlite.default.svc.cluster.local:4001/status?pretty", "-O-"]
     - runPod:
         collectorName: "rqlite-nodes"
         name: rqlite-nodes
@@ -131,7 +131,7 @@ spec:
             - name: rqlite-nodes
               image: busybox:1
               command: ["wget"]
-              args: ["-q", "-T", "5", "http://kotsadm-rqlite:4001/nodes?pretty&ver=2", "-O-"]
+              args: ["-q", "-T", "5", "http://kotsadm-rqlite.default.svc.cluster.local:4001/nodes?pretty&ver=2", "-O-"]
     - copyFromHost:
         collectorName: kurl-host-preflights
         name: kots/kurl/host-preflights