Skip to content

Commit

Permalink
chore: update uds-core to 0.18.0 (#77)
Browse files Browse the repository at this point in the history
chore: update gitlab to 16.10.1-uds.1
chore: update gitlab-runner to 16.10.0-uds.0
chore: update sonarqube to 8.0.3-uds.6
chore: update jira to 1.17.2-uds.0
chore: update confluence to 1.18.0-uds.0
chore: update mattermost to 9.6.1-uds.0
chore: update uds-cli to v0.10.3
chore: update zarf init/rook to v0.32.6-0.2.5
chore: add new keycloak admin and loki scalable configs
fix: gitlab workhorse resource config
fix: jira variable override names
fix: confluence variable override names
chore: update nexus to 3.66.0-uds.1-registry1
  • Loading branch information
anthonywendt authored Apr 5, 2024
1 parent 16e23b7 commit 6196853
Show file tree
Hide file tree
Showing 10 changed files with 146 additions and 274 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ runs:
- name: Install UDS CLI
shell: bash
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.9.4
run: brew install defenseunicorns/tap/uds@0.10.3
37 changes: 24 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Once the below [Prerequisites](#prerequisites) are met, these are the steps to d

### Prerequisites
**Tools**:
* [uds version v0.9.4](https://github.com/defenseunicorns/uds-cli/tree/v0.9.4)
- `sudo curl -sL https://github.com/defenseunicorns/uds-cli/releases/download/v0.9.4/uds-cli_v0.9.4_Linux_amd64`
* [uds version v0.10.3](https://github.com/defenseunicorns/uds-cli/tree/v0.10.3)
- `sudo curl -sL https://github.com/defenseunicorns/uds-cli/releases/download/v0.10.3/uds-cli_v0.10.3_Linux_amd64`
* (OPTIONAL) [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl)
* (OPTIONAL) [helm](https://github.com/helm/helm)

Expand Down Expand Up @@ -48,7 +48,19 @@ Once the below [Prerequisites](#prerequisites) are met, these are the steps to d

> NOTE: If using the example domain (`*.bigbang.dev`), a valid corresponding certificate and key can be found [in the Platform1 Big Bang repo](https://repo1.dso.mil/big-bang/bigbang/-/blob/master/chart/ingress-certs.yaml?ref_type=heads).
* Object Storage with provisioned buckets (expand for details).
These are the default bucket names. Gitlab allows you to add a suffix in your `uds-config.yaml`, so reflect that if you configure a suffix. Also, Velero and Mattermost allow you to configure your bucket name in your `uds-config.yaml`. Reflect that if you configure those differently then the below defaults.
These are the default bucket names. Gitlab allows you to add a suffix in your `uds-config.yaml`, so reflect that if you configure a suffix. Also, Loki, Velero and Mattermost allow you to configure your bucket name in your `uds-config.yaml`. Reflect that if you configure those differently then the below defaults.
<details>
<summary> Loki </summary>

* loki-chunks-bucket
* loki-ruler-bucket
* loki-admin-bucket
</details>
<details>
<summary> Velero </summary>

* velero-backups
</details>
<details>
<summary> Velero </summary>

Expand Down Expand Up @@ -94,7 +106,7 @@ These are the default bucket names. Gitlab allows you to add a suffix in your `u
Deployment configuration is managed via a `uds-config.yaml` file in the deployment directory. Some values in the configuration will be sensitive, **we do not recommend checking this into source control in its entierty**. Best practice would involve either storing the configuration in an external secrets manager (like Vault), or managing deployments via CD and generating the config file dynamically at deploy time using CD managed secrets.

For demonstration purposes, you can setup a local configfile as follows:
* Copy an example configuration from [config/dev-cluster/uds-config.yaml](config/dev-cluster/uds-config.yaml) to your working directory
* Copy an example configuration from [config/uds-config.yaml](config/uds-config.yaml) to your working directory
* Update the config according to your environment taking care to set:
* domain variables
* certificate values
Expand All @@ -106,18 +118,23 @@ For demonstration purposes, you can setup a local configfile as follows:
### Deployment
Select a target version number and gather the OCI image reference [from the packages page](https://github.com/orgs/defenseunicorns/packages?repo_name=uds-bundle-software-factory-nutanix). With the above prerequisites and configuration complete, you can deploy the bundle directly via OCI:
```
uds deploy oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix:0.1.x --architecure amd64 --confirm
uds deploy oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix:0.x.x --architecure amd64 --confirm
```

### (OPTIONAL) Local Deployment Reference
Situationally, it may be useful to download the deployment artifact so that it may be referenced offline. This can be accomplished by first downloading the target release:
```
uds pull oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix:0.1.x --architecture amd64
uds pull oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix:0.x.x --architecture amd64
```

And subsequently deploying from the local file:
```
uds deploy uds-bundle-software-factory-nutanix-amd64-0.1.4.tar.zst --confirm
uds deploy uds-bundle-software-factory-nutanix-amd64-0.x.x.tar.zst --confirm
```

>NOTE: There is a new default terminal user interface for UDS. When running a deploy from a pipeline you can choose to have the normal terminal output by using the `--no-tea` flag with your uds deploy.
```
uds deploy uds-bundle-software-factory-nutanix-amd64-0.x.x.tar.zst --confirm --no-tea
```

## Additional Notes
Expand All @@ -129,11 +146,5 @@ uds run --list

# Run the create-bundle task
uds run create-bundle

# Run the deploy-bundle-to-dev task
uds run deploy-bundle-to-dev

# Run the deploy-bundle-to-test task
uds run deploy-bundle-to-test
```

80 changes: 58 additions & 22 deletions bundles/uds-core-swf/uds-bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.9.4/uds.schema.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.3/uds.schema.json
kind: UDSBundle
metadata:
name: software-factory-nutanix
Expand All @@ -14,7 +14,7 @@ packages:
repository: ghcr.io/defenseunicorns/uds-capability/rook-ceph/init
optionalComponents:
- git-server
ref: v0.32.4-0.2.3
ref: v0.32.6-0.2.5
overrides:
rook-ceph-cluster:
rook-ceph-cluster:
Expand All @@ -38,7 +38,7 @@ packages:

- name: core
repository: ghcr.io/defenseunicorns/packages/uds/core
ref: 0.16.1-upstream
ref: 0.18.0-registry1
overrides:
velero:
velero:
Expand Down Expand Up @@ -130,12 +130,52 @@ packages:
description: "keycloak database name"
path: postgresql.host
default: "postgresql"
- name: KEYCLOAK_INSECURE_ADMIN_PASSWORD_GENERATION
description: "Generate an insecure admin password for dev/test"
path: insecureAdminPasswordGeneration.enabled
loki:
loki:
values:
# Override default dns service name for Loki Gateway
- path: "global.dnsService"
value: "rke2-coredns-rke2-coredns"
variables:
- name: LOKI_CHUNKS_BUCKET
description: "The object storage bucket for Loki chunks"
path: loki.storage.bucketNames.chunks
default: "loki-chunks-bucket"
- name: LOKI_RULER_BUCKET
description: "The object storage bucket for Loki ruler"
path: loki.storage.bucketNames.ruler
default: "loki-ruler-bucket"
- name: LOKI_ADMIN_BUCKET
description: "The object storage bucket for Loki admin"
path: loki.storage.bucketNames.admin
default: "loki-admin-bucket"
- name: LOKI_S3_ENDPOINT
description: "The S3 endpoint"
path: loki.storage.s3.endpoint
- name: LOKI_S3_REGION
description: "The S3 region"
path: loki.storage.s3.region
- name: LOKI_S3_ACCESS_KEY_ID
description: "The S3 Access Key ID"
path: loki.storage.s3.accessKeyId
- name: LOKI_S3_SECRET_ACCESS_KEY
path: loki.storage.s3.secretAccessKey
description: "The S3 Secret Access Key"
- name: LOKI_WRITE_REPLICAS
path: write.replicas
description: "Loki write replicas"
default: "1"
- name: LOKI_READ_REPLICAS
path: read.replicas
description: "Loki read replicas"
default: "1"
- name: LOKI_BACKEND_REPLICAS
path: backend.replicas
description: "Loki backend replicas"
default: "1"
istio-admin-gateway:
uds-istio-config:
variables:
Expand Down Expand Up @@ -199,7 +239,7 @@ packages:

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 16.9.2-uds.0-registry1
ref: 16.10.1-uds.1-registry1
overrides:
gitlab:
gitlab:
Expand All @@ -221,7 +261,7 @@ packages:
path: "gitlab.webservice.resources"
- name: WORKHORSE_RESOURCES
description: "Gitlab Workhorse Resources"
path: "gitlab.workhorse.resources"
path: "gitlab.webservice.workhorse.resources"
- name: SIDEKIQ_REPLICAS
description: "Gitlab Sidekiq Min Replicas"
path: "gitlab.sidekiq.minReplicas"
Expand All @@ -244,7 +284,7 @@ packages:
# Gitlab Runner
- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 16.9.1-uds.2-registry1
ref: 16.10.0-uds.0-registry1

# Sonarqube
- name: sonarqube-database-secret
Expand All @@ -253,7 +293,7 @@ packages:

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
ref: 8.0.3-uds.4-registry1
ref: 8.0.3-uds.6-registry1

# Jira
- name: jira-database-secret
Expand All @@ -262,20 +302,19 @@ packages:

- name: jira
repository: ghcr.io/defenseunicorns/packages/uds/jira
ref: 1.17.0-uds.1-registry1
ref: 1.17.2-uds.0-registry1
overrides:
jira:
jira:
variables:
- name: LOCAL_HOME_ENABLED
- name: JIRA_LOCAL_HOME_ENABLED
path: "volumes.localHome.persistentVolumeClaim.create"
description: "Local Home Toggle"
default: "true"
- name: RWO_STORAGE_CLASS
- name: JIRA_RWO_STORAGE_CLASS
path: "volumes.localHome.persistentVolumeClaim.storageClassName"
description: "RWO storage class name"
default: "ceph-block"
- name: LOCAL_HOME_SIZE
- name: JIRA_LOCAL_HOME_SIZE
path: "volumes.localHome.persistentVolumeClaim.resources.requests.storage"
description: "Storage size"
default: "128Gi"
Expand All @@ -287,28 +326,27 @@ packages:

- name: confluence
repository: ghcr.io/defenseunicorns/packages/uds/confluence
ref: 1.17.0-uds.2-registry1
ref: 1.18.0-uds.0-registry1
overrides:
confluence:
confluence:
variables:
- name: LOCAL_HOME_ENABLED
- name: CONFLUENCE_LOCAL_HOME_ENABLED
path: "volumes.localHome.persistentVolumeClaim.create"
description: "Local Home Toggle"
default: "true"
- name: RWO_STORAGE_CLASS
- name: CONFLUENCE_RWO_STORAGE_CLASS
path: "volumes.localHome.persistentVolumeClaim.storageClassName"
description: "RWO storage class name"
default: "ceph-block"
- name: LOCAL_HOME_SIZE
- name: CONFLUENCE_LOCAL_HOME_SIZE
path: "volumes.localHome.persistentVolumeClaim.resources.requests.storage"
description: "Storage size"
default: "128Gi"

# Mattermost
- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.4.1-uds.2-registry1
ref: 9.6.1-uds.0-registry1
overrides:
mattermost:
uds-mattermost-config:
Expand All @@ -320,15 +358,13 @@ packages:
- name: OBJECT_STORE_ENDPOINT
path: "objectStorage.endpoint"
description: "Object storage endpoint"
default: "swf.objects.mtsi.bigbang.dev"
- name: OBJECT_STORE_BUCKET
path: "objectStorage.bucket"
description: "Object storage bucket"
default: "mattermost-bucket-dev"
default: "mattermost-bucket"
- name: DB_ENDPOINT
path: "postgres.host"
description: "Postgres DB endpoint"
default: "mattermost-pg.mtsi-dev.bigbang.dev"
- name: DB_USERNAME
path: "postgres.username"
description: "Postgres DB username"
Expand All @@ -345,4 +381,4 @@ packages:
# Nexus
- name: nexus
repository: ghcr.io/defenseunicorns/packages/uds/nexus
ref: 3.64.0-uds.1-registry1
ref: 3.66.0-uds.1-registry1
Loading

0 comments on commit 6196853

Please sign in to comment.