fix: clean up default-queue secret

There were some ugly leftovers from an earlier time. Signed-off-by: Nick Mitchell <nickm@us.ibm.com>
IBM · Aug 4, 2024 · b1ab849 · b1ab849
1 parent 443c1f5
commit b1ab849
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/charts/templates/default-queue.yaml b/charts/templates/default-queue.yaml
@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/component: taskqueue
     app.kubernetes.io/instance: {{ .Release.Name }}
 type: Opaque
-data:
-  bucket: {{ .Values.taskqueue.bucket | default .Values.taskqueue.dataset | b64enc }}
-  endpoint: {{ .Values.taskqueue.endpoint | default .Values.global.s3Endpoint | b64enc }}
-  accessKeyID: {{ .Values.taskqueue.accessKey | default .Values.global.s3AccessKey | b64enc }}
-  secretAccessKey: {{ .Values.taskqueue.secretKey | default .Values.global.s3SecretKey | b64enc }}
+stringData:
+  bucket: {{ .Values.taskqueue.bucket }}
+  endpoint: {{ .Values.taskqueue.endpoint }}
+  accessKeyID: {{ .Values.taskqueue.accessKey }}
+  secretAccessKey: {{ .Values.taskqueue.secretKey }}
diff --git a/pkg/fe/linker/configure.go b/pkg/fe/linker/configure.go
@@ -84,6 +84,15 @@ func Configure(appname, runname, namespace, templatePath string, internalS3Port
 		runnameMax40 = runname[:40]
 	}
 
+	if queueSpec.Endpoint == "" {
+		queueSpec.Endpoint = fmt.Sprintf("http://%s-lunchpail-s3.%s.svc.cluster.local:%d", runnameMax40, systemNamespace, internalS3Port)
+		queueSpec.AccessKey = "lunchpail"
+		queueSpec.SecretKey = "lunchpail"
+	}
+	if queueSpec.Bucket == "" {
+		queueSpec.Bucket = queueSpec.Name
+	}
+
 	yaml := fmt.Sprintf(`
 global:
   unused: %s # "" (1)