Skip to content

Commit

Permalink
chore: remove old namespace pattern (#149)
Browse files Browse the repository at this point in the history
chore: upgrade gitlab to 17.1.2-uds.0
chore: upgrade valkey to 7.2.5-uds.2
docs: update dep docs
  • Loading branch information
anthonywendt authored Jul 23, 2024
1 parent 8de287a commit 77ca71e
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 83 deletions.
9 changes: 2 additions & 7 deletions bundles/uds-core-swf/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ packages:
path: persistence.storageClass
default: "nutanix-dynamicfile"

# Namespace pre-reqs for swf capabilities
- name: software-factory-namespaces
path: ../../build
ref: 1.0.0

- name: trust-manager
path: ../../build
ref: 0.0.1
Expand Down Expand Up @@ -399,7 +394,7 @@ packages:
# Gitlab
- name: gitlab-valkey
repository: ghcr.io/defenseunicorns/packages/uds/valkey
ref: 7.2.5-uds.1-upstream
ref: 7.2.5-uds.2-upstream
overrides:
valkey:
uds-valkey-config:
Expand Down Expand Up @@ -429,7 +424,7 @@ packages:

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 17.1.1-uds.1-registry1
ref: 17.1.2-uds.0-registry1
overrides:
gitlab:
uds-gitlab-config:
Expand Down
4 changes: 2 additions & 2 deletions docs/packages-and-dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ The UDS Software Factory Bundle (SWF) is a collection of Zarf packages which inc
| [Nutanix CSI Driver Init](https://portal.nutanix.com/page/documents/details?targetId=CSI-Volume-Driver-v2_6:CSI-Volume-Driver-v2_6) | v0.35.0 | v2.6.8 | A zarf component installed in the cluster for orchestrating further deployment of Zarf based packages |
| [MetalLB](https://github.com/defenseunicorns/uds-capability-metallb) | 0.0.5 | v0.13.12 | Tool for providing load balancer capabilities for ingress into a Kubernetes deployment |
| [uds-core](https://github.com/defenseunicorns/uds-core) | 0.23.0 | N/A | [DESCRIPTION BELOW](#UDS-Core) |
| [Valkey](https://github.com/defenseunicorns/uds-package-valkey) | v7.2.5-uds.1-upstream | 7.2.5 | A key-value store used as a data backend for several applications in the stack |
| [Gitlab](https://github.com/defenseunicorns/uds-package-gitlab) | v17.1.1-uds.1-registry1 | 17.1.1 | A source control management tool used in the software development lifecycle for storing, updating, building and deploying custom software |
| [Valkey](https://github.com/defenseunicorns/uds-package-valkey) | v7.2.5-uds.2-upstream | 7.2.5 | A key-value store used as a data backend for several applications in the stack |
| [Gitlab](https://github.com/defenseunicorns/uds-package-gitlab) | v17.1.2-uds.0-registry1 | 17.1.2 | A source control management tool used in the software development lifecycle for storing, updating, building and deploying custom software |
| [Gitlab Runner](https://github.com/defenseunicorns/uds-package-gitlab-runner) | 17.0.0-uds.0-registry1 | v17.0.0 | A counterpart to Gitlab (above) in which automated software builds, tests and deployments are executed |
| [Sonarqube](https://github.com/defenseunicorns/uds-package-sonarqube) | 8.0.3-uds.6-registry1 | 9.9.3-community | A code inspection tool used during automated pipelines to evaluate security considerations of custom software and packaged images |
| [Jira](https://github.com/defenseunicorns/uds-package-jira) | 1.19.0-uds.0-registry1 | 9.15.1 | A collaboration tool used for team management and task organization |
Expand Down
2 changes: 0 additions & 2 deletions packages/init/values/namespaces.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions packages/init/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@ components:
- registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-csi:v0.7.1
- registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.10.0

- name: namespaces
required: true
charts:
- name: namespaces
version: 1.0.0
namespace: default
url: https://defenseunicorns.github.io/uds-support-charts/
valuesFiles:
- values/namespaces.yaml

- name: nutanix-csi-storage
required: true
charts:
Expand Down
36 changes: 0 additions & 36 deletions packages/namespaces/values.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions packages/namespaces/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 @@ -11,7 +11,6 @@ tasks:
- task: create:build-dir
- task: create:database-manifest-packages
- task: create:keycloak-config-wrapper-package
- task: create:namespaces-package
- task: create:object-store-packages
- task: create:additional-manifests-package
- task: create:init-package
Expand Down
9 changes: 2 additions & 7 deletions tasks/create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@ tasks:
- name: keycloak-config-wrapper-package
description: Create the keycloak configurations shim loader
actions:
- cmd: ./uds zarf package create ./packages/keycloak-config-wrapper --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
- cmd: ./uds zarf package create ./packages/keycloak-config-wrapper --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: object-store-packages
description: Create the object storage packages
Expand All @@ -50,7 +45,7 @@ tasks:
description: Create init package with Nutanix CSI driver.
actions:
- cmd: ZARF_CONFIG=./packages/init/zarf-config.yaml ./uds zarf package create ./packages/init --set AGENT_IMAGE_TAG=$(uds zarf version) --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build

- name: trust-manager-package
description: Create trust-manager package.
actions:
Expand Down

0 comments on commit 77ca71e

Please sign in to comment.