diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml index 83c65e9d7..d4e8f6cad 100644 --- a/bundles/k3d-standard/uds-bundle.yaml +++ b/bundles/k3d-standard/uds-bundle.yaml @@ -42,7 +42,6 @@ packages: optionalComponents: - istio-passthrough-gateway - metrics-server - - uds-runtime overrides: loki: loki: diff --git a/packages/standard/zarf.yaml b/packages/standard/zarf.yaml index d43b791b9..baeff15ca 100644 --- a/packages/standard/zarf.yaml +++ b/packages/standard/zarf.yaml @@ -99,7 +99,7 @@ components: # UDS Runtime - name: uds-runtime - required: false + required: true import: path: ../ui diff --git a/src/runtime/common/zarf.yaml b/src/runtime/common/zarf.yaml new file mode 100644 index 000000000..7c1fa9d6d --- /dev/null +++ b/src/runtime/common/zarf.yaml @@ -0,0 +1,29 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + +kind: ZarfPackageConfig +metadata: + name: uds-core-runtime + description: "UDS Core Runtime" + url: "https://github.com/defenseunicorns/uds-runtime" + +components: + - name: uds-runtime + required: true + charts: + - name: uds-runtime + namespace: uds-runtime + version: "v0.7.0" + url: https://github.com/defenseunicorns/uds-runtime.git + gitPath: chart + actions: + onDeploy: + after: + - description: Validate Runtime Package + maxTotalSeconds: 300 + wait: + cluster: + kind: packages.uds.dev + name: uds-runtime + namespace: uds-runtime + condition: "'{.status.phase}'=Ready" diff --git a/src/runtime/values/registry1-values.yaml b/src/runtime/values/registry1-values.yaml new file mode 100644 index 000000000..551e87a08 --- /dev/null +++ b/src/runtime/values/registry1-values.yaml @@ -0,0 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + +image: + repository: registry1.dso.mil/ironbank/opensource/defenseunicorns/uds/runtime + tag: 0.7.0 diff --git a/src/runtime/zarf.yaml b/src/runtime/zarf.yaml index 3c07f4aae..1050e6af1 100644 --- a/src/runtime/zarf.yaml +++ b/src/runtime/zarf.yaml @@ -14,23 +14,34 @@ variables: components: - name: uds-runtime - required: false + required: true + only: + flavor: upstream + import: + path: common images: - - ghcr.io/defenseunicorns/uds-runtime:0.6.1 + - ghcr.io/defenseunicorns/uds-runtime:0.7.0 + + - name: uds-runtime + required: true + only: + flavor: unicorn + import: + path: common + images: + - ghcr.io/defenseunicorns/uds-runtime:0.7.0 + + - name: uds-runtime + required: true + only: + flavor: registry1 + cluster: + architecture: amd64 + import: + path: common + images: + - registry1.dso.mil/ironbank/opensource/defenseunicorns/uds/runtime:0.7.0 charts: - name: uds-runtime - namespace: uds-runtime - version: "v0.6.1" - url: https://github.com/defenseunicorns/uds-runtime.git - gitPath: chart - actions: - onDeploy: - after: - - description: Validate Runtime Package - maxTotalSeconds: 300 - wait: - cluster: - kind: packages.uds.dev - name: uds-runtime - namespace: uds-runtime - condition: "'{.status.phase}'=Ready" + valuesFiles: + - values/registry1-values.yaml