Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eaf3f9
fix(proxy): use fqdn for kotsadm-rqlite address
emosbaugh Sep 9, 2024
24f282a
fix(proxy): use fqdn for kotsadm-minio address
emosbaugh Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}]
6 changes: 3 additions & 3 deletions pkg/kotsadm/objects/kotsadm_objects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kotsadm/objects/secrets_objects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/supportbundle/staticspecs/kurlspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading