Fix UUID format

mhoshi-vm · Jan 7, 2025 · 17c23f6 · 17c23f6
1 parent 79e4858
commit 17c23f6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/secretgen/password.yml b/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/secretgen/password.yml
@@ -135,6 +135,7 @@ spec:
     type: Opaque
     stringData:
       pass: $(value)
+#! https://github.gwd.broadcom.net/TNZ/ensemble-observability-store/blob/master/tss-server/src/main/java/com/vmware/aria/tss/server/validation/UUID.java
 ---
 apiVersion: secretgen.k14s.io/v1alpha1
 kind: Password
@@ -176,9 +177,9 @@ metadata:
   annotations:
     kapp.k14s.io/change-group: "secrettemplate"
 spec:
-  length: 4
-  symbols: 4
-  symbolCharSet: "1234567890abcdef"
+  length: 1
+  symbols: 1
+  symbolCharSet: "12345"
   secretTemplate:
     type: Opaque
     stringData:
@@ -192,8 +193,8 @@ metadata:
   annotations:
     kapp.k14s.io/change-group: "secrettemplate"
 spec:
-  length: 4
-  symbols: 4
+  length: 3
+  symbols: 3
   symbolCharSet: "1234567890abcdef"
   secretTemplate:
     type: Opaque
@@ -207,6 +208,38 @@ metadata:
   namespace: #@ data.values.tp.namespace
   annotations:
     kapp.k14s.io/change-group: "secrettemplate"
+spec:
+  length: 1
+  symbols: 1
+  symbolCharSet: "89ab"
+  secretTemplate:
+    type: Opaque
+    stringData:
+      pass: $(value)
+---
+apiVersion: secretgen.k14s.io/v1alpha1
+kind: Password
+metadata:
+  name: organization-id-6
+  namespace: #@ data.values.tp.namespace
+  annotations:
+    kapp.k14s.io/change-group: "secrettemplate"
+spec:
+  length: 3
+  symbols: 3
+  symbolCharSet: "1234567890abcdef"
+  secretTemplate:
+    type: Opaque
+    stringData:
+      pass: $(value)
+---
+apiVersion: secretgen.k14s.io/v1alpha1
+kind: Password
+metadata:
+  name: organization-id-7
+  namespace: #@ data.values.tp.namespace
+  annotations:
+    kapp.k14s.io/change-group: "secrettemplate"
 spec:
   length: 12
   symbols: 12

diff --git a/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/values-template/secret-template.yaml b/manifests/tpk8s-opinionated.tanzu.japan.com/10.0.0/values-template/secret-template.yaml
@@ -131,7 +131,7 @@ spec:
             admin:
               password: #@ base64.decode("$(.tp-pass.data.pass)")
         organization:
-          id: #@ base64.decode("$(.organization-id-1.data.pass)") + "-" + base64.decode("$(.organization-id-2.data.pass)") + "-" + base64.decode("$(.organization-id-3.data.pass)") + "-" + base64.decode("$(.organization-id-4.data.pass)") + "-" + base64.decode("$(.organization-id-5.data.pass)")   
+          id: #@ base64.decode("$(.organization-id-1.data.pass)") + "-" + base64.decode("$(.organization-id-2.data.pass)") + "-" + base64.decode("$(.organization-id-3.data.pass)") + base64.decode("$(.organization-id-4.data.pass)") + "-" + base64.decode("$(.organization-id-5.data.pass)") + base64.decode("$(.organization-id-6.data.pass)") + "-" + base64.decode("$(.organization-id-7.data.pass)")   
         cas:
           encryptionKey: #@ base64.decode("$(.encryption-key.data.pass)")
         rsa: