Merge pull request #11 from defenseunicorns/update-deps

chore: update deps

.github/actions/setup/action.yaml

@@ -9,7 +9,7 @@ runs:
       uses: defenseunicorns/setup-zarf@main
       with:
         # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
-        version: v0.31.1
+        version: v0.32.1
         download-init-package: true
 
     - name: Use Node.js latest
@@ -27,4 +27,4 @@ runs:
     - name: Install UDS CLI
       shell: bash
       # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-      run: brew install defenseunicorns/tap/[email protected].2
+      run: brew install defenseunicorns/tap/[email protected].3

.github/workflows/pull-request-conditionals.yaml

@@ -1,4 +1,4 @@
-name: Setup
+name: Conditionals
 
 # This workflow is triggered on pull requests to the main branch.
 on:

CODEOWNERS

@@ -1 +1 @@
-* @defenseunicorns/software-factory-package-core
+/* @defenseunicorns/uds

bundle/uds-bundle.yaml

@@ -7,18 +7,22 @@ metadata:
   # x-release-please-end
 
 packages:
-  - name: gitlab-minio
-    path: ../
+  - name: dev-minio
+    repository: ghcr.io/defenseunicorns/packages/uds/dev-minio
     ref: 5.0.13-0
 
-  - name: gitlab-postgres
-    path: ../
+  - name: dev-postgres
+    repository: ghcr.io/defenseunicorns/packages/uds/dev-postgres
     ref: 12.6.6-0
 
-  - name: gitlab-redis
-    path: ../
+  - name: dev-redis
+    repository: ghcr.io/defenseunicorns/packages/uds/dev-redis
     ref: 17.13.2-0
 
+  - name: dev-secrets
+    path: ../
+    ref: 0.1.0
+
   - name: gitlab
     path: ../
     # x-release-please-start-version

bundle/uds-config.yaml

@@ -1,4 +1,21 @@
 variables:
+  dev-minio:
+    buckets: |
+      - name: uds-gitlab-artifacts
+      - name: uds-gitlab-backups
+      - name: uds-gitlab-ci-secure-files
+      - name: uds-gitlab-dependency-proxy
+      - name: uds-gitlab-lfs
+      - name: uds-gitlab-mr-diffs
+      - name: uds-gitlab-packages
+      - name: uds-gitlab-pages
+      - name: uds-gitlab-terraform-state
+      - name: uds-gitlab-uploads
+      - name: uds-gitlab-registry
+      - name: uds-gitlab-tmp
+  dev-postgres:
+    db_username: "gitlab"
+    db_name: "gitlabdb"
   gitlab:
-    gitlab_redis_endpoint: "redis-master.gitlab-redis.svc.cluster.local"
-    gitlab_db_endpoint: "postgresql.gitlab-db.svc.cluster.local"
+    gitlab_redis_endpoint: "redis-master.dev-redis.svc.cluster.local"
+    gitlab_db_endpoint: "postgresql.dev-postgres.svc.cluster.local"

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

@@ -11,24 +11,24 @@ stringData:
     region: minio
     aws_access_key_id: ###ZARF_VAR_ACCESS_KEY###
     aws_secret_access_key: ###ZARF_VAR_SECRET_KEY###
-    endpoint: "http://minio.gitlab-minio.svc.cluster.local:9000"
+    endpoint: "http://minio.dev-minio.svc.cluster.local:9000"
     aws_signature_version: 4
     path_style: true
   registry: |-
     s3:
       bucket: gitlab-registry
       accesskey: ###ZARF_VAR_ACCESS_KEY###
       secretkey: ###ZARF_VAR_SECRET_KEY###
-      regionendpoint: "http://minio.gitlab-minio.svc.cluster.local:9000"
+      regionendpoint: "http://minio.dev-minio.svc.cluster.local:9000"
       region: minio
       aws_signature_version: 4
       path_style: true
   backups: |-
     [default]
     access_key = ###ZARF_VAR_ACCESS_KEY###
     secret_key = ###ZARF_VAR_SECRET_KEY###
-    host_base = http://minio.gitlab-minio.svc.cluster.local:9000
-    host_bucket = http://minio.gitlab-minio.svc.cluster.local:9000
+    host_base = http://minio.dev-minio.svc.cluster.local:9000
+    host_bucket = http://minio.dev-minio.svc.cluster.local:9000
     bucket_location = minio
     multipart_chunk_size_mb = 128
     use_https = False

src/dev-secrets/zarf.yaml

@@ -0,0 +1,63 @@
+# 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: minio-password
+    required: true
+    actions:
+      onDeploy:
+        before:
+          - cmd: kubectl get secret -n dev-minio minio --template='{{ index .data "rootPassword" }}' | base64 -d
+            mute: true
+            setVariables:
+              - name: SECRET_KEY
+                sensitive: true
+          - cmd: kubectl get secret -n dev-minio minio --template='{{ index .data "rootUser" }}' | base64 -d
+            mute: true
+            setVariables:
+              - name: ACCESS_KEY
+                sensitive: true
+  - name: gitlab-minio
+    required: true
+    manifests:
+      - name: gitlab-minio
+        files:
+          - "minio-secret.yaml"
+  - 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: POSTGRES_DB_PASSWORD
+                sensitive: true
+  - name: gitlab-postgres
+    required: true
+    manifests:
+      - name: gitlab-postgres
+        namespace: gitlab
+        files:
+          - postgres-secret.yaml
+  - name: redis-password
+    required: true
+    actions:
+      onDeploy:
+        before:
+          - cmd: kubectl get secret -n dev-redis redis --template='{{ index .data "redis-password" }}' | base64 -d
+            mute: true
+            setVariables:
+              - name: REDIS_PASSWORD
+                sensitive: true
+  - name: gitlab-redis
+    required: true
+    manifests:
+      - name: gitlab-redis
+        namespace: gitlab
+        files:
+          - redis-secret.yaml

tasks/create.yaml

@@ -14,7 +14,4 @@ tasks:
   - name: dependency-package
     description: Create the Minio, PostgreSQL, and Redis Dependency Zarf Packages
     actions:
-      - cmd: |
-          for dependency in minio postgres redis; 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