Skip to content

Agent Mesh

address comments

Antonio Ojeaca78dd2c8e6f
diff --git a/charts/sam-mesh/templates/secrets.yaml b/charts/sam-mesh/templates/secrets.yaml
index e8fd5abe..7b556ce8 100644
--- a/charts/sam-mesh/templates/secrets.yaml
+++ b/charts/sam-mesh/templates/secrets.yaml
@@ -2,7 +2,7 @@
{{- $existing := lookup "v1" "Secret" .Release.Namespace $secretName }}
{{- $adminToken := .Values.controlPlane.adminToken }}
{{- if not $adminToken }}
- {{- if $existing }}
+ {{- if and $existing (hasKey $existing "data") (hasKey $existing.data "admin-token") }}
{{- $adminToken = index $existing.data "admin-token" | b64dec }}
{{- else }}
{{- $adminToken = randAlphaNum 32 }}
@@ -10,7 +10,7 @@
{{- end }}
{{- $dbPassword := .Values.database.postgres.password }}
{{- if not $dbPassword }}
- {{- if $existing }}
+ {{- if and $existing (hasKey $existing "data") (hasKey $existing.data "db-password") }}
{{- $dbPassword = index $existing.data "db-password" | b64dec }}
{{- else }}
{{- $dbPassword = randAlphaNum 32 }}
diff --git a/cmd/sam-console/public/app.js b/cmd/sam-console/public/app.js
index 00bdb0db..b954d8cf 100644
--- a/cmd/sam-console/public/app.js
+++ b/cmd/sam-console/public/app.js
@@ -469,7 +469,7 @@ window.generateBootstrapToken = async function() {
const role = document.getElementById('token-role').value;
const owner_id = document.getElementById('token-owner').value;
const max_usages = parseInt(document.getElementById('token-usages').value, 10);
- const ttl_hours = parseInt(document.getElementById('token-ttl').value, 10);
+ const ttl_hours = parseInt(document.getElementById('token-ttl').value, 10) || 24;
const description = document.getElementById('token-desc').value;
const payload = {