diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 903e990..92397fb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -71,19 +71,19 @@ jobs: uses: supplypike/setup-bin@v3 with: # renovate: zarf-uri datasource=github-tags depName=defenseunicorns/zarf - uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.30.1/zarf_v0.30.1_Linux_amd64' + uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.31.3/zarf_v0.31.3_Linux_amd64' name: 'zarf' # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver - version: 'v0.30.1' + version: 'v0.31.3' - name: Install uds-cli uses: supplypike/setup-bin@v3 with: # renovate: uds-cli-uri datasource=github-tags depName=defenseunicorns/uds-cli - uri: 'https://github.com/defenseunicorns/uds-cli/releases/download/v0.0.11-alpha/uds-cli_v0.0.11-alpha_Linux_amd64 ' + uri: 'https://github.com/defenseunicorns/uds-cli/releases/download/v0.3.1/uds-cli_v0.3.1_Linux_amd64 ' name: 'uds' # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver - version: 'v0.0.11-alpha' + version: 'v0.3.1' - name: Login to GHCR uses: docker/login-action@v2 @@ -110,7 +110,7 @@ jobs: zarf package create packages/namespaces --confirm --no-progress --output-directory build - name: Build software factory bundle - run: uds bundle create --confirm --no-progress + run: uds create --confirm --no-progress - name: Run clean install test on created artifact uses: ./.github/actions/e2e @@ -129,4 +129,4 @@ jobs: copy-bundle: "yes" - name: Publish software factory bundle - run: uds bundle publish uds-bundle-software-factory-demo-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-package --no-progress + run: uds publish uds-bundle-software-factory-demo-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-package --no-progress diff --git a/Makefile b/Makefile index 6d7c1fb..205f028 100755 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ # 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.3 # The version of the build harness container to use BUILD_HARNESS_REPO := ghcr.io/defenseunicorns/build-harness/build-harness # renovate: datasource=docker depName=ghcr.io/defenseunicorns/build-harness/build-harness -BUILD_HARNESS_VERSION := 1.10.2 +BUILD_HARNESS_VERSION := 1.14.2 # Figure out which Zarf binary we should use based on the operating system we are on ZARF_BIN := zarf @@ -179,7 +179,7 @@ build/idam-realm: | build ## Build idam-realm package cd build && ./zarf package create ../packages/idam-realm/ --confirm --output-directory . build/idam-postgres: | build ## Build idam-postgres package - cd build && ./zarf package create ../packages/idam-postgres/ --confirm --output-directory . + cd build && ./zarf package create --skip-sbom ../packages/idam-postgres/ --confirm --output-directory . build/uds-bundle-software-factory: | build ## Build the software factory cd build && ./uds create ../ --confirm diff --git a/README.md b/README.md index 177f7ba..8203f81 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ This is the early stages of a UDS Bundle we call the UDS Software Factory. This ### Kubernetes Cluster - 1.26 -- Compute power that is comparable to the **[m6id.8xlarge](https://aws.amazon.com/ec2/instance-types/#:~:text=Up%20to%2010-,m6id.8xlarge,-32)** AWS instance type used in our E2E tests. +- Compute power that is comparable to the **[m6id.12xlarge](https://aws.amazon.com/ec2/instance-types/#:~:text=Up%20to%2010-,m6id.8xlarge,-32)** AWS instance type used in our E2E tests. ## Documentation @@ -43,4 +43,4 @@ This is the early stages of a UDS Bundle we call the UDS Software Factory. This - Ensure the machine you are using has a valid kubecontext and has access to a sufficiently large cluster - Ensure uds-cli is present on your machine by running `uds version` and verify it matches the version in the [makefile](https://github.com/defenseunicorns/uds-package-software-factory/blob/main/Makefile#L4) -- Run `uds bundle deploy oci://ghcr.io/defenseunicorns/uds-package/software-factory-demo: --confirm` and replace `` with the [version of SWF](https://github.com/defenseunicorns/uds-package-software-factory/pkgs/container/uds-package%2Fsoftware-factory-demo) you need +- Run `uds deploy oci://ghcr.io/defenseunicorns/uds-package/software-factory-demo: --confirm` and replace `` with the [version of SWF](https://github.com/defenseunicorns/uds-package-software-factory/pkgs/container/uds-package%2Fsoftware-factory-demo) you need diff --git a/uds-bundle.yaml b/uds-bundle.yaml index d1fe46f..2eff122 100644 --- a/uds-bundle.yaml +++ b/uds-bundle.yaml @@ -3,7 +3,7 @@ kind: UDSBundle metadata: name: software-factory-demo description: A UDS bundle for deploying a software factory to k3d for demonstration purposes NOT FOR PRODUCTION - version: 0.0.7 + version: 0.0.8 architecture: amd64 zarf-packages: @@ -17,7 +17,7 @@ zarf-packages: # Defense Unicorns Big Bang Distro - name: dubbd-k3d repository: ghcr.io/defenseunicorns/packages/dubbd-k3d - ref: 0.13.0 + ref: 0.14.0 # Namespace pre-reqs for swf capabilities - name: software-factory-namespaces @@ -42,7 +42,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 @@ -74,19 +74,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-postgres repository: ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency/gitlab-postgres - ref: 0.0.2 + ref: 0.1.8 - 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 @@ -98,20 +98,20 @@ 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-postgres repository: ghcr.io/defenseunicorns/uds-capability/sonarqube/dev-dependency/sonarqube-postgres - ref: 0.0.2 + ref: 0.1.2 - 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 @@ -131,42 +131,42 @@ zarf-packages: # Jira - name: jira-postgres repository: ghcr.io/defenseunicorns/uds-capability/jira/dev-dependency/jira-postgres - ref: 0.0.1 + ref: 0.1.2 - name: jira repository: ghcr.io/defenseunicorns/uds-capability/jira - ref: 0.0.5 + ref: 0.1.2 # Confluence - name: confluence-postgres repository: ghcr.io/defenseunicorns/uds-capability/confluence/dev-dependency/confluence-postgres - ref: 0.0.1 + ref: 0.1.2 - 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-postgres repository: ghcr.io/defenseunicorns/uds-capability/mattermost/dev-dependency/mattermost-postgres - ref: 0.0.3 + ref: 0.1.2 - name: mattermost repository: ghcr.io/defenseunicorns/uds-capability/mattermost - ref: 0.0.2 + ref: 0.1.2 # Nexus - name: nexus-postgres repository: ghcr.io/defenseunicorns/uds-capability/nexus/dev-dependency/nexus-postgres - ref: 0.0.1 + ref: 0.1.2 - 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 diff --git a/uds-config.yaml b/uds-config.yaml index d8ad211..9f9c110 100644 --- a/uds-config.yaml +++ b/uds-config.yaml @@ -18,6 +18,8 @@ bundle: DOMAIN: "bigbang.dev" GITLAB_DB_NAME: "gitlabdb" GITLAB_DB_USERNAME: "gitlab" + GITLAB_PAGES_ENABLED: "false" + GITLAB_SIGNUP_ENABLED: "true" sonarqube: set: DOMAIN: "bigbang.dev"