Skip to content

Commit

Permalink
fix: gitlab redis secret fix (#44)
Browse files Browse the repository at this point in the history
chore: update uds tasks to use ./uds
chore: remove core dns package
  • Loading branch information
anthonywendt authored Mar 22, 2024
1 parent 3576a24 commit 16e23b7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 125 deletions.
9 changes: 1 addition & 8 deletions bundles/uds-core-swf/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ packages:
# Gitlab Runner
- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 16.8.0-uds.0-registry1
ref: 16.9.1-uds.2-registry1

# Sonarqube
- name: sonarqube-database-secret
Expand Down Expand Up @@ -346,10 +346,3 @@ packages:
- name: nexus
repository: ghcr.io/defenseunicorns/packages/uds/nexus
ref: 3.64.0-uds.1-registry1

# Add all virtualservices as internal dns entries for auth callbacks
- name: software-factory-idam-dns
path: ../../build
ref: 1.0.0
optionalComponents:
- create-internal-dns-entries
2 changes: 1 addition & 1 deletion packages/gitlab-redis/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ components:
actions:
onDeploy:
before:
- cmd: kubectl get secret -n dev-redis redis --template='{{ index .data "redis-password" }}' | base64 -d
- cmd: ./zarf tools kubectl get secret -n dev-redis redis --template='{{ index .data "redis-password" }}' | base64 -d
mute: true
setVariables:
- name: REDIS_PASSWORD
Expand Down
79 changes: 0 additions & 79 deletions packages/idam-dns/files/coredns-add-hostname.sh

This file was deleted.

22 changes: 0 additions & 22 deletions packages/idam-dns/zarf.yaml

This file was deleted.

1 change: 0 additions & 1 deletion tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ tasks:
- task: create:database-manifest-packages
- task: create:gitlab-redis-secret-package
- task: create:namespaces-package
- task: create:idam-packages
- task: create:object-store-packages
- task: create:additional-manifests-package
- task: create:bundle
Expand Down
23 changes: 9 additions & 14 deletions tasks/create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,34 @@ tasks:
- name: bundle
description: Create the UDS Bundle with SWF on UDS Core
actions:
- cmd: uds create ./bundles/uds-core-swf --architecture=${ARCH} --confirm
- cmd: ./uds create ./bundles/uds-core-swf --architecture=${ARCH} --confirm
- cmd: mv ./bundles/uds-core-swf/uds-bundle-* ./build

# Packages
- name: database-manifest-packages
description: Create database manifest packages
actions:
- cmd: uds zarf package create ./packages/databases/confluence/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: uds zarf package create ./packages/databases/gitlab/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: uds zarf package create ./packages/databases/jira/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: uds zarf package create ./packages/databases/sonarqube/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/databases/confluence/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/databases/gitlab/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/databases/jira/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/databases/sonarqube/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: gitlab-redis-secret-package
description: Create package for the gitlab redis secret
actions:
- cmd: uds zarf package create ./packages/gitlab-redis --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/gitlab-redis --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: namespaces-package
description: Create the namespaces package
actions:
- cmd: uds zarf package create ./packages/namespaces --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: idam-packages
description: Create the idam packages
actions:
- cmd: uds zarf package create ./packages/idam-dns --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/namespaces --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: object-store-packages
description: Create the object storage packages
actions:
- cmd: uds zarf package create ./packages/object-store/gitlab --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/object-store/gitlab --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: additional-manifests-package
description: Create package create additional manifests needed.
actions:
- cmd: uds zarf package create ./packages/additional-manifests --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
- cmd: ./uds zarf package create ./packages/additional-manifests --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

0 comments on commit 16e23b7

Please sign in to comment.