feat: use uds package dependencies

.github/workflows/commitlint.yaml

@@ -22,7 +22,9 @@ jobs:
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
 
       - name: Install commitlint
-        run: npm install --save-dev @commitlint/{config-conventional,cli}
+        run: |
+          npm install --save-dev @commitlint/[email protected]
+          npm install --save-dev @commitlint/[email protected]
 
       - name: Lint PR title
         run: echo "${{ github.event.pull_request.title }}" | npx commitlint

bundle/uds-bundle.yaml

@@ -7,13 +7,13 @@ metadata:
   # x-release-please-end
 
 packages:
-  - name: artifactory-postgres
-    path: ../
-    ref: 12.6.6-0
+  - name: dev-postgres
+    repository: ghcr.io/defenseunicorns/packages/uds/dev-postgres
+    ref: 0.0.2
 
-  - name: artifactory-secrets
+  - name: dev-secrets
     path: ../
-    ref: 107.63.9-uds.0
+    ref: 0.1.0
 
   - name: artifactory
     path: ../

bundle/uds-config.yaml

@@ -1,3 +1,4 @@
 variables:
-  artifactory:
-    artifactory_db_endpoint: "postgresql.artifactory-db.svc.cluster.local"
+  dev-postgres:
+    db_username: "artifactory"
+    db_name: "artifactorydb"

renovate.json

@@ -104,6 +104,13 @@
         "# renovate: bb-chart\\n .*- name: .*?\\n *url: ['\"]{0,1}(?<registryUrl>https:\\/\\/.*?)\\/(?<depName>.*?)\\.git['\"]{0,1}\\n *version: ['\"]{0,1}(?<currentValue>.*?)['\"]{0,1}\\n"
       ],
       "datasourceTemplate": "gitlab-tags"
+    },
+    {
+      "fileMatch": ["^\\.github/workflows/commitlint\\.yaml$"],
+      "matchStrings": [
+        "npm install --save-dev (?<depName>@?.*?)@(?<currentValue>.+)"
+      ],
+      "datasourceTemplate": "npm"
     }
   ],
   "packageRules": [

test/postgres/secret.yaml → src/dev-secrets/postgres-secret.yaml

@@ -5,6 +5,6 @@ metadata:
   namespace: artifactory
 type: kubernetes.io/opaque
 stringData:
-  password: "###ZARF_VAR_POSTGRES_DB_PASSWORD###"
-  url: jdbc:postgresql://postgresql.artifactory-db.svc.cluster.local:5432/artifactorydb
+  password: "###ZARF_VAR_DB_PASSWORD###"
+  url: jdbc:postgresql://postgresql.dev-postgres.svc.cluster.local:5432/artifactorydb
   user: artifactory

src/dev-secrets/zarf.yaml

@@ -0,0 +1,32 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/main/zarf.schema.json
+kind: ZarfPackageConfig
+metadata:
+  name: dev-secrets
+  version: "0.1.0"
+  architecture: amd64
+
+components:
+  - name: postgres-password
+    required: true
+    actions:
+      onDeploy:
+        before:
+          - cmd: kubectl get secret -n dev-postgres postgresql --template={{.data.password}} | base64 -d
+            mute: true
+            setVariables:
+              - name: DB_PASSWORD
+                sensitive: true
+  - name: artifactory-postgres
+    required: true
+    manifests:
+      - name: artifactory-postgres
+        namespace: artifactory
+        files:
+          - postgres-secret.yaml
+  - name: artifactory-keys
+    required: true
+    manifests:
+      - name: artifactory-keys
+        namespace: artifactory
+        files:
+          - join-master-key-secret.yaml

tasks/create.yaml

@@ -18,10 +18,4 @@ tasks:
   - name: dependency-package
     description: Create the Dependency Zarf Package(s)
     actions:
-      - cmd: |
-          for dependency in artifactory; do
-            zarf package create test/${dependency}/ --confirm --no-progress --architecture=${UDS_ARCH} --skip-sbom
-          done
-          for dependency in postgres; do
-            zarf package create test/${dependency}/ --confirm --no-progress --architecture=${UDS_ARCH} --skip-sbom
-          done
+      - cmd: zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${UDS_ARCH} --skip-sbom