Skip to content

Commit

Permalink
chore: Capability releases and tool upgrades (#11)
Browse files Browse the repository at this point in the history
* chore: Capability releases and tool upgrades

* fix: revert bundle db manifest refs

* chore: Update bundle to dubbd 0.14.0

* chore: Use custom rook-ceph init package

* chore: update to oci custom zarf init

* docs: Add custom init to README
  • Loading branch information
anthonywendt authored Dec 1, 2023
1 parent 9c7d5c2 commit b54e8a9
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The version of Zarf to use. To keep this repo as portable as possible the Zarf binary will be downloaded and added to
# the build folder.
# renovate: datasource=github-tags depName=defenseunicorns/zarf
UDS_CLI_VERSION := v0.0.11-alpha
UDS_CLI_VERSION := v0.3.1

ZARF_VERSION := v0.30.1
ZARF_VERSION := v0.31.1

# Figure out which Zarf binary we should use based on the operating system we are on
ZARF_BIN := zarf
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
# uds-bundle-software-factory-nutanix
A UDS Bundle
A UDS Bundle Containing
- custom init package
- metallb
- dubbd-rke2
- keycloak
- gitlab
- gitlab-runner
- sonarqube
- jira
- confluence
- mattermost
- nexus
32 changes: 16 additions & 16 deletions uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ kind: UDSBundle
metadata:
name: software-factory-nutanix
description: A UDS bundle for deploying a software factory to an RKE2 cluster
version: 0.0.1
version: 0.1.0
architecture: amd64

zarf-packages:
# Zarf init
- name: init
repository: ghcr.io/defenseunicorns/packages/init
ref: v0.30.1
repository: ghcr.io/defenseunicorns/uds-bundle-software-factory-nutanix/init
optional-components:
- git-server
ref: v0.31.1

# Namespace pre-reqs for swf capabilities
- name: software-factory-namespaces
Expand All @@ -27,7 +27,7 @@ zarf-packages:
# Defense Unicorns Big Bang Distro
- name: dubbd-rke2
repository: ghcr.io/defenseunicorns/packages/dubbd-rke2
ref: 0.12.1
ref: 0.14.0

# Change the realm file keycloak imports from
- name: software-factory-idam-realm
Expand All @@ -45,7 +45,7 @@ zarf-packages:

- name: uds-idam
repository: ghcr.io/defenseunicorns/uds-capability/uds-idam
ref: 0.1.12
ref: 0.1.14
imports:
- name: REALM_IMPORT_FILE
package: software-factory-idam-realm
Expand Down Expand Up @@ -75,19 +75,19 @@ zarf-packages:
# Gitlab
- name: gitlab-redis
repository: ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency/gitlab-redis
ref: 0.0.2
ref: 0.1.8

- name: gitlab-minio
repository: ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency/gitlab-minio
ref: 0.0.2
ref: 0.1.8

- name: gitlab-database-manifests
path: build
ref: 0.0.1

- name: gitlab
repository: ghcr.io/defenseunicorns/uds-capability/gitlab
ref: 0.1.2
ref: 0.1.8
imports:
- name: GITLAB_IDAM_ENABLED
package: software-factory-idam-gitlab
Expand All @@ -99,11 +99,11 @@ zarf-packages:
# Gitlab Runner
- name: gitlab-runner-rbac
repository: ghcr.io/defenseunicorns/uds-capability/gitlab-runner/dev-dependency/gitlab-runner-rbac
ref: 0.0.1
ref: 0.1.2

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/uds-capability/gitlab-runner
ref: 0.0.8
ref: 0.1.2

# Sonarqube
- name: sonarqube-database-manifests
Expand All @@ -112,7 +112,7 @@ zarf-packages:

- name: sonarqube
repository: ghcr.io/defenseunicorns/uds-capability/sonarqube
ref: 0.0.11
ref: 0.1.2
imports:
- name: SONARQUBE_IDAM_ENABLED
package: software-factory-idam-sonarqube
Expand All @@ -136,7 +136,7 @@ zarf-packages:

- name: jira
repository: ghcr.io/defenseunicorns/uds-capability/jira
ref: 0.0.5
ref: 0.1.2

# Confluence
- name: confluence-database-manifests
Expand All @@ -145,20 +145,20 @@ zarf-packages:

- name: confluence
repository: ghcr.io/defenseunicorns/uds-capability/confluence
ref: 0.0.4
ref: 0.1.2

# Mattermost Operator with a Mattermost instance
- name: mattermost-minio
repository: ghcr.io/defenseunicorns/uds-capability/mattermost/dev-dependency/mattermost-minio
ref: 0.0.2
ref: 0.1.2

- name: mattermost-database-manifests
path: build
ref: 0.0.1

- name: mattermost
repository: ghcr.io/defenseunicorns/uds-capability/mattermost
ref: 0.0.2
ref: 0.1.2

# Nexus
- name: nexus-database-manifests
Expand All @@ -167,7 +167,7 @@ zarf-packages:

- name: nexus
repository: ghcr.io/defenseunicorns/uds-capability/nexus
ref: 0.0.4
ref: 0.1.2

# Add all virtualservices as internal dns entries for auth callbacks
- name: software-factory-idam-dns
Expand Down
2 changes: 2 additions & 0 deletions uds-config/dev-cluster/uds-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ bundle:
DOMAIN: "mtsi-dev.bigbang.dev"
GITLAB_DB_NAME: "gitlabdb"
GITLAB_DB_USERNAME: "postgres"
GITLAB_PAGES_ENABLED: "true"
GITLAB_SIGNUP_ENABLED: "false"
sonarqube-database-manifests:
set:
SONARQUBE_DB_EXTERNAL_NAME: "sonarqube-pg.mtsi-dev.bigbang.dev"
Expand Down
2 changes: 2 additions & 0 deletions uds-config/test-cluster/uds-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ bundle:
DOMAIN: "mtsi.bigbang.dev"
GITLAB_DB_NAME: "gitlabdb"
GITLAB_DB_USERNAME: "postgres"
GITLAB_PAGES_ENABLED: "true"
GITLAB_SIGNUP_ENABLED: "false"
sonarqube-database-manifests:
set:
SONARQUBE_DB_EXTERNAL_NAME: "sonarqube-pg.mtsi.bigbang.dev"
Expand Down

0 comments on commit b54e8a9

Please sign in to comment.