From eef4b2b0b67c191486f7178aa8d383814538f045 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Wed, 23 Oct 2024 12:22:44 -0600 Subject: [PATCH 1/2] chore!: remove uds-runtime from core --- .github/filters.yaml | 4 -- .github/workflows/publish.yaml | 2 +- README.md | 1 - .../validation.yaml | 2 +- docs/reference/UDS Core/functional-layers.md | 3 -- packages/ui/README.md | 8 ---- packages/ui/tasks.yaml | 10 ---- packages/ui/zarf.yaml | 19 -------- release-please-config.json | 1 - renovate.json | 5 -- src/runtime/README.md | 3 -- src/runtime/common/zarf.yaml | 29 ------------ src/runtime/tasks.yaml | 35 -------------- src/runtime/values/registry1-values.yaml | 6 --- src/runtime/zarf.yaml | 47 ------------------- 15 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 packages/ui/README.md delete mode 100644 packages/ui/tasks.yaml delete mode 100644 packages/ui/zarf.yaml delete mode 100644 src/runtime/README.md delete mode 100644 src/runtime/common/zarf.yaml delete mode 100644 src/runtime/tasks.yaml delete mode 100644 src/runtime/values/registry1-values.yaml delete mode 100644 src/runtime/zarf.yaml diff --git a/.github/filters.yaml b/.github/filters.yaml index 8ffee6f5b..754725030 100644 --- a/.github/filters.yaml +++ b/.github/filters.yaml @@ -19,10 +19,6 @@ logging: - "src/loki/**" - "src/vector/**" -ui: - - "packages/ui/**" - - "src/runtime/**" - runtime-security: - "packages/runtime-security/**" - "src/neuvector/**" diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3ffbaeaee..ebd83c9e1 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -96,7 +96,7 @@ jobs: strategy: matrix: flavor: [upstream, registry1, unicorn] - layer: [base, identity-authorization, ui, runtime-security, backup-restore, logging, metrics-server, monitoring] + layer: [base, identity-authorization, runtime-security, backup-restore, logging, metrics-server, monitoring] arch: [amd64, arm64] exclude: - flavor: registry1 diff --git a/README.md b/README.md index 878a6b6ae..d56eae513 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ UDS Core establishes a secure baseline for cloud-native systems and ships with c - [Prometheus Stack](https://github.com/prometheus-operator/kube-prometheus) - Monitoring - [Vector](https://vector.dev/) - Log Aggregation - [Velero](https://velero.io/) - Backup & Restore -- [UDS Runtime](https://github.com/defenseunicorns/uds-runtime) - Frontend Views & Insights #### Future Applications diff --git a/compliance/validations/istio/secure-communication-with-istiod/validation.yaml b/compliance/validations/istio/secure-communication-with-istiod/validation.yaml index a0670ff07..d2e0a6cda 100644 --- a/compliance/validations/istio/secure-communication-with-istiod/validation.yaml +++ b/compliance/validations/istio/secure-communication-with-istiod/validation.yaml @@ -28,7 +28,7 @@ provider: # Expected values expected_istiod_port := 15012 expected_istiod_protocol := "TCP" - required_namespaces := {"authservice", "grafana", "keycloak", "loki", "metrics-server", "monitoring", "neuvector", "vector", "velero", "uds-runtime"} + required_namespaces := {"authservice", "grafana", "keycloak", "loki", "metrics-server", "monitoring", "neuvector", "vector", "velero"} # Validate NetworkPolicy for Istiod in required namespaces validate if { diff --git a/docs/reference/UDS Core/functional-layers.md b/docs/reference/UDS Core/functional-layers.md index 47345dc9b..ef5fa878d 100644 --- a/docs/reference/UDS Core/functional-layers.md +++ b/docs/reference/UDS Core/functional-layers.md @@ -42,9 +42,6 @@ packages: - name: core-monitoring repository: ghcr.io/defenseunicorns/packages/uds/core-monitoring ref: 0.29.0-upstream - - name: core-ui - repository: ghcr.io/defenseunicorns/packages/uds/core-ui - ref: 0.29.0-upstream - name: core-backup-restore repository: ghcr.io/defenseunicorns/packages/uds/core-backup-restore ref: 0.29.0-upstream diff --git a/packages/ui/README.md b/packages/ui/README.md deleted file mode 100644 index 77acbd47d..000000000 --- a/packages/ui/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# UDS Core UI (Runtime) - -This layer of UDS Core provides UI capabilities. Currently it includes the application(s): -- runtime - -To deploy this layer you must also deploy its dependent layer(s): -- base -- identity-authorization [( unless disabled with runtime override )](https://github.com/defenseunicorns/uds-runtime/blob/v0.5.0/chart/values.yaml) \ No newline at end of file diff --git a/packages/ui/tasks.yaml b/packages/ui/tasks.yaml deleted file mode 100644 index ef2d5405a..000000000 --- a/packages/ui/tasks.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -includes: - - runtime: ../../src/runtime/tasks.yaml - -tasks: - - name: validate - actions: - - task: runtime:validate diff --git a/packages/ui/zarf.yaml b/packages/ui/zarf.yaml deleted file mode 100644 index 7ff6d9553..000000000 --- a/packages/ui/zarf.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -kind: ZarfPackageConfig -metadata: - name: core-ui - description: "UDS Core (UI)" - authors: "Defense Unicorns - Product" - # x-release-please-start-version - version: "0.29.1" - # x-release-please-end - x-uds-dependencies: ["base", "identity-authorization"] - -components: - # Runtime - - name: uds-runtime - required: true - import: - path: ../../src/runtime diff --git a/release-please-config.json b/release-please-config.json index a1b2701fa..ca434d283 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -18,7 +18,6 @@ "packages/logging/zarf.yaml", "packages/backup-restore/zarf.yaml", "packages/runtime-security/zarf.yaml", - "packages/ui/zarf.yaml", "packages/monitoring/zarf.yaml", "packages/metrics-server/zarf.yaml", "packages/standard/zarf.yaml", diff --git a/renovate.json b/renovate.json index 59b7e37e6..c48799334 100644 --- a/renovate.json +++ b/renovate.json @@ -72,11 +72,6 @@ "groupName": "grafana", "commitMessageTopic": "grafana" }, - { - "matchFileNames": ["src/runtime/**"], - "groupName": "runtime", - "commitMessageTopic": "runtime" - }, { "matchFileNames": ["package.json", "package-lock.json", "tasks/create.yaml"], "groupName": "pepr", diff --git a/src/runtime/README.md b/src/runtime/README.md deleted file mode 100644 index b97b73ec7..000000000 --- a/src/runtime/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## UDS Runtime - -Documentation and code for UDS Runtime can be viewed on the [UDS Runtime Repository](https://github.com/defenseunicorns/uds-runtime). diff --git a/src/runtime/common/zarf.yaml b/src/runtime/common/zarf.yaml deleted file mode 100644 index 7c1fa9d6d..000000000 --- a/src/runtime/common/zarf.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# 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/tasks.yaml b/src/runtime/tasks.yaml deleted file mode 100644 index c07ea9314..000000000 --- a/src/runtime/tasks.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial - -tasks: - - name: validate - actions: - - description: Validate Runtime Pod - wait: - cluster: - kind: Pod - name: app=uds-runtime - condition: Ready - namespace: uds-runtime - - description: Validate Runtime Interface - wait: - network: - protocol: https - address: runtime.admin.uds.dev - code: 200 - - description: Verify Runtime is protected by checking redirect - maxRetries: 3 - cmd: | - set -e - SSO_REDIRECT=$(uds zarf tools kubectl run curl-test --image=cgr.dev/chainguard/curl:latest -q --restart=Never --rm -i -- -Ls -o /dev/null -w %{url_effective} "https://runtime.admin.uds.dev") - case "${SSO_REDIRECT}" in - "https://sso.uds.dev"*) - echo "Protected by authservice" - ;; - *) - # Fallback option if the condition is false - echo "Runtime is not protected by authservice" - echo $SSO_REDIRECT - exit 1 - ;; - esac diff --git a/src/runtime/values/registry1-values.yaml b/src/runtime/values/registry1-values.yaml deleted file mode 100644 index 551e87a08..000000000 --- a/src/runtime/values/registry1-values.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index 1050e6af1..000000000 --- a/src/runtime/zarf.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# 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" - -variables: - - name: DOMAIN - description: "Cluster domain" - default: "uds.dev" - -components: - - name: uds-runtime - required: true - only: - flavor: upstream - import: - path: common - images: - - 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 - valuesFiles: - - values/registry1-values.yaml From c3226f432f3e4938c1272793f7bdb486ed07f1fb Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Wed, 23 Oct 2024 12:32:47 -0600 Subject: [PATCH 2/2] fix: standard package --- packages/standard/zarf.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/standard/zarf.yaml b/packages/standard/zarf.yaml index baeff15ca..03f67c9b2 100644 --- a/packages/standard/zarf.yaml +++ b/packages/standard/zarf.yaml @@ -97,12 +97,6 @@ components: import: path: ../identity-authorization - # UDS Runtime - - name: uds-runtime - required: true - import: - path: ../ui - # Velero - name: velero required: true