remove external deps package, add logic to bring secret under config …

…chart ownership
defenseunicorns · Nov 6, 2024 · 2e2b8fb · 2e2b8fb
1 parent e432ed1
commit 2e2b8fb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 93 deletions.
diff --git a/common/zarf.yaml b/common/zarf.yaml
@@ -28,6 +28,9 @@ components:
         localPath: ../charts/settings
     actions:
       onDeploy:
+        before:
+          - cmd: ./zarf tools kubectl label secret -n gitlab gitlab-object-store app.kubernetes.io/managed-by=Helm || true
+          - cmd: ./zarf tools kubectl annotate secret -n gitlab gitlab-object-store meta.helm.sh/release-name=uds-gitlab-config || true
         after:
           - description: Validate GitLab Package
             maxTotalSeconds: 300

diff --git a/src/dev-secrets/minio-secret.yaml b/src/dev-secrets/minio-secret.yaml
diff --git a/src/dev-secrets/zarf.yaml b/src/dev-secrets/zarf.yaml
diff --git a/src/namespace/gitlab-ns.yaml b/src/namespace/gitlab-ns.yaml
diff --git a/src/namespace/zarf.yaml b/src/namespace/zarf.yaml
diff --git a/tasks.yaml b/tasks.yaml
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
 includes:
+  # TODO Delete dependencies.yaml after next releaser
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml
   - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/create.yaml
@@ -33,7 +34,6 @@ tasks:
   - name: create-deploy-test-bundle
     description: Test and validate cluster is deployed with GitLab
     actions:
-      - task: dependencies:create
       - task: create:test-bundle
       - task: deploy:test-bundle
       - task: setup:create-doug-user
@@ -59,6 +59,7 @@ tasks:
   - name: test-upgrade
     description: Test an upgrade from the latest released package to the current branch
     actions:
+      # TODO Delete dependencies.yaml after next releaser
       - task: upgrade:create-latest-tag-bundle
         with:
           dep_commands: ./uds run dependencies:create