chore: working setup, now need

.gitignore

@@ -19,10 +19,18 @@ zarf-sbom
 tmp/
 values-*.yaml
 overlay-values-*
+.tool-versions
 
 # Terraform
 test/tf/public-ec2-instance/.test-data
 test/tf/public-ec2-instance/.terraform
 terraform.tfstate
 terraform.tfstate.backup
 .terraform.lock.hcl
+
+# Tests
+node_modules/
+.playwright/
+
+# VSCode
+.vscode/

chart/templates/jira-admin.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.setup.createSecrets }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,5 +7,4 @@ data:
   username: {{ .Values.setup.admin.username | b64enc }}
   password: {{ .Values.setup.admin.password | b64enc }}
   email: {{ .Values.setup.admin.email | b64enc }}
-  fullname: {{ .Values.setup.admin.fullname | b64enc }}
-{{- end }}
+  fullname: {{ .Values.setup.admin.fullname | b64enc }}

chart/templates/jira-setup-configmap.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.setup.createSecrets }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -29,12 +28,12 @@ data:
     requests.packages.urllib3.disable_warnings(category=InsecureRequestWarning)
 
     class Config:
-        JIRA_DOMAIN = os.getenv("JIRA_DOMAIN", "jira.uds.dev")
-        JIRA_ADMIN_USERNAME = os.getenv("JIRA_ADMIN_USERNAME", "admin")
-        JIRA_ADMIN_PASSWORD = os.getenv("JIRA_ADMIN_PASSWORD", "admin")
-        JIRA_ADMIN_EMAIL = os.getenv("JIRA_ADMIN_EMAIL", "[email protected]")
-        JIRA_ADMIN_FULLNAME = os.getenv("JIRA_ADMIN_FULLNAME", "Admin User")
-        JIRA_LICENSE_KEY = os.getenv("JIRA_LICENSE_KEY", "AAAB4Q0ODAoPeNqVUk2P2jAUvOdXROqlVRUUB7JZkCx1CaZkC8luAogDFxMexAWcyHZg2V/ffICgZRepR4/tmTfz5ss4B/2Zch21dIQ6VqvTtHU3GuuWadmaK4AqlvIeVYBLxDCRgWxtyGLgEsbHDHy6A+wGoxEJXe9pqP1mgjZO92TJyt+Y+GMSvoReRDQ/3y1ABKuJBCGxgc5U5C1j4nilYxmoVZNlIl3msWqUB0OmK3WgAho0VmwPWIkctChfyFiwrBKrELKn25xezhVRwU5d4ApEDW5r6QGVCR65B7fvQtZ/d7+bi9n71DNnTh60vXCSKDLbPCXhoDn+NemSjVQTexC/Haf2epmz9uHnw+scz/HZidfDQ68XEd8YWqaD2s5j+56PSFFRTrSiW1k4AbEHUVB0iecYgdd/NUK/7RsW8rvaBo7TIrXSFHowTcd8bDaRthYAPEmzDMSd3F9yESdUwr+bvP5dRZMJJs+xEh//7eMDrY860IPLOp4Lt3p0cqt/LXeg10v4Nu/olz1pI8oKlFMe/38Zblp1Peh1U+5wfNKOc+KWFog15UzWrerBqrzVJ5zFqeBSc1OuCiVS2NhikS528Y9l/SY/PWnE6a4e4GbcCr2Z807CJ7UK/lzsD+lDVU4wLAIUDh8J3BnMCPGC9z4pMZxph+utjboCFDTa3S1umpcLoVwqWBI2JELm2ZTkX02mq")
+        JIRA_DOMAIN = os.getenv("JIRA_DOMAIN", "")
+        JIRA_ADMIN_USERNAME = os.getenv("JIRA_ADMIN_USERNAME", "")
+        JIRA_ADMIN_PASSWORD = os.getenv("JIRA_ADMIN_PASSWORD", "")
+        JIRA_ADMIN_EMAIL = os.getenv("JIRA_ADMIN_EMAIL", "")
+        JIRA_ADMIN_FULLNAME = os.getenv("JIRA_ADMIN_FULLNAME", "")
+        JIRA_LICENSE_KEY = os.getenv("JIRA_LICENSE_KEY", "")
         
         MAX_RETRIES = 30
         RETRY_INTERVAL = 10
@@ -398,5 +397,3 @@ data:
 
     if __name__ == "__main__":
         main() 
-
-{{- end }} 

chart/templates/jira-setup-job.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.setup.createSecrets }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -24,6 +23,9 @@ spec:
             - |
               sleep 10
               echo "Proceeding with setup..."
+          env:
+            - name: JIRA_DOMAIN
+              value: jira.{{ .Values.domain }}
       containers:
         - name: setup
           image: {{ .Values.setup.job.image }}
@@ -49,7 +51,7 @@ spec:
               python3 /scripts/test_license.py
           env:
             - name: JIRA_DOMAIN
-              value: "jira.uds.dev"
+              value: jira.{{ .Values.domain }}
             - name: JIRA_ADMIN_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -73,8 +75,8 @@ spec:
             - name: JIRA_LICENSE_KEY
               valueFrom:
                 secretKeyRef:
-                  name: jira-license
-                  key: license-key
+                  name: {{ .Values.jira.license.secretName }}
+                  key: license_key
           resources:
             requests:
               cpu: 500m
@@ -95,4 +97,3 @@ spec:
             defaultMode: 0755
         - name: setup
           emptyDir: {}
-{{- end }} 

chart/templates/license-secret.yaml

@@ -5,4 +5,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 stringData:
-  license-key: {{ .Values.jira.license.stringData.license_key }} 
+  license_key: {{ .Values.jira.license.stringData.license_key }} 

chart/values.yaml

@@ -24,20 +24,17 @@ sso:
   defaultClientScopes: []
   requiredGroups: []
 
-setup:
-  # Whether to create setup secrets
-  createSecrets: true
-
+setup:  
   # Admin user configuration
   admin:
     username: "admin"
     password: "admin"
     email: "[email protected]" 
     fullname: "Jira Administrator"
 
-  # License configuration  
-  license:
-    key: ""
+  # # License configuration  
+  # license:
+  #   key: ""
 
   # Setup job configuration
   job: