Merge branch 'main' into renovate/promtail

defenseunicorns · Jan 24, 2024 · 4050bd5 · 4050bd5
2 parents 5567c04 + 98134bb
commit 4050bd5
Show file tree

Hide file tree

Showing 27 changed files with 107 additions and 138 deletions.
diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
@@ -37,7 +37,7 @@ runs:
     - name: Install UDS CLI
       shell: bash
       # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-      run: brew install defenseunicorns/tap/uds@0.6.1
+      run: brew install defenseunicorns/tap/uds@0.6.2
 
     - name: Login to GHCR
       uses: docker/login-action@v3

diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Install UDS CLI
         shell: bash
         # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-        run: brew install defenseunicorns/tap/uds@0.6.1
+        run: brew install defenseunicorns/tap/uds@0.6.2
       - name: Run Formatting Checks
         run: uds run lint-check
 

diff --git a/.github/workflows/tag-and-release.yml b/.github/workflows/tag-and-release.yml
@@ -48,6 +48,7 @@ jobs:
         run: uds run -f tasks/publish.yaml packages --set FLAVOR=${{ matrix.flavor }}
 
       - name: Publish UDS Bundles
+        if: ${{ matrix.flavor != 'registry1' }}
         run: uds run -f tasks/publish.yaml bundles
 
       - name: Save logs

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "0.8.1"
+    ".": "0.9.1"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,12 +9,12 @@
   },
   "yaml.schemas": {
     // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.6.1/uds.schema.json": [
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.6.2/uds.schema.json": [
       "uds-bundle.yaml"
     ],
 
     // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.6.1/tasks.schema.json": [
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.6.2/tasks.schema.json": [
       "tasks.yaml",
       "tasks/**/*.yaml",
       "src/**/validate.yaml"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.1](https://github.com/defenseunicorns/uds-core/compare/v0.9.0...v0.9.1) (2024-01-22)
+
+
+### Bug Fixes
+
+* update missing flavor create inputs in publish step ([#118](https://github.com/defenseunicorns/uds-core/issues/118)) ([a0233eb](https://github.com/defenseunicorns/uds-core/commit/a0233eb45e2d39035f483f3ed8fb3f396e5030d8))
+
+## [0.9.0](https://github.com/defenseunicorns/uds-core/compare/v0.8.1...v0.9.0) (2024-01-21)
+
+
+### Features
+
+* add Zarf Flavors to support Iron Bank & upstream images ([#63](https://github.com/defenseunicorns/uds-core/issues/63)) ([232c256](https://github.com/defenseunicorns/uds-core/commit/232c2566b96be0285c24b8b5787350897e72332f))
+
 ## [0.8.1](https://github.com/defenseunicorns/uds-core/compare/v0.8.0...v0.8.1) (2024-01-18)
 
 

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ The core applications are:
 | Dependency                                                     | Minimum Version |
 | -------------------------------------------------------------- | --------------- |
 | [Zarf](https://github.com/defenseunicorns/zarf/releases)       | 0.32.1          |
-| [UDS CLI](https://github.com/defenseunicorns/uds-cli/releases) | 0.6.1           |
+| [UDS CLI](https://github.com/defenseunicorns/uds-cli/releases) | 0.6.2           |
 | [NodeJS](https://nodejs.org/en/download/)                      | LTS or Current  |
 
 <!-- endtable -->
@@ -41,10 +41,10 @@ A common need is bootstrapping a new UDS Core environment for development or tes
 
 ```bash
 # ARM version
-uds deploy oci://ghcr.io/defenseunicorns/packages/uds/bundles/upstream/k3d-core:arm64
+uds deploy oci://ghcr.io/defenseunicorns/packages/uds/bundles/k3d-core-demo:arm64
 
 # AMD version
-uds deploy oci://ghcr.io/defenseunicorns/packages/uds/bundles/upstream/k3d-core:amd64
+uds deploy oci://ghcr.io/defenseunicorns/packages/uds/bundles/k3d-core-demo:amd64
 ```
 
 The bundle includes the uds.dev certs by default. You can use the UDS environment variables to override the default values. E.g.
@@ -58,32 +58,22 @@ UDS_TENANT_TLS_KEY=$(cat tenant.key)
 
 UDS_DOMAIN=example.com
 
-uds deploy oci://ghcr.io/defenseunicorns/package/uds/bundles/upstream/k3d-core:amd64
+uds deploy oci://ghcr.io/defenseunicorns/package/uds/bundles/k3d-core-demo:amd64
 ```
 
-Note: In order to deploy using Iron Bank images, update the registry path replaceing ```upstream``` with ```registry1``` For example:
+### UDS Core Package
 
-```bash
-# ARM version
-uds deploy oci://ghcr.io/defenseunicorns/packages/uds/bundles/registry1/k3d-core:arm64
-
-```
-
-### UDS Core Packages
-
-UDS core publishes two packages:
+UDS core publishes one package:
 
 - [core](./packages/standard/README.md): The standard UDS Core package that is a collection of individual packages that are deployed as a single unit.
 
-- [core-istio](./packages/istio/README.md): The UDS Core Istio package that only deploys Istio.
-
 ### UDS Core Bundles
 
 These bundles are intended for bootstrapping common development & testing environments and should not be used for production. They also serve as examples to create custom bundles.
 
-- [k3d-core](./bundles/k3d-standard/README.md): A bundle to create a local k3d cluster with UDS Core installed.
+- [k3d-core-demo](./bundles/k3d-standard/README.md): A bundle to create a local k3d cluster with UDS Core installed.
 
-- [k3d-core-istio](./bundles/k3d-istio/README.md): A bundle to create a local k3d cluster with only Istio from UDS Core installed.
+- [k3d-core-istio-dev](./bundles/k3d-istio/README.md): A bundle to create a local k3d cluster with only Istio from UDS Core installed.
 
 ## Development: Create, build, and test the UDS Core Package
 

diff --git a/bundles/k3d-istio/uds-bundle.yaml b/bundles/k3d-istio/uds-bundle.yaml
@@ -1,16 +1,16 @@
 kind: UDSBundle
 metadata:
-  name: k3d-core-istio
+  name: k3d-core-istio-dev
   description: A UDS bundle for deploying Istio from UDS Core on a development cluster
   # x-release-please-start-version
-  version: "0.8.1"
+  version: "0.9.1"
   # x-release-please-end
 
 packages:
   - name: uds-k3d-dev
     repository: ghcr.io/defenseunicorns/packages/uds-k3d
     # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
-    ref: 0.3.0
+    ref: 0.3.1
     overrides:
       uds-dev-stack:
         minio:
@@ -36,7 +36,7 @@ packages:
   - name: core-istio
     path: ../../build/
     # x-release-please-start-version
-    ref: 0.8.1
+    ref: 0.9.1
     # x-release-please-end
     overrides:
       istio-admin-gateway:

diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml
@@ -1,16 +1,16 @@
 kind: UDSBundle
 metadata:
-  name: k3d-core
+  name: k3d-core-demo
   description: A UDS bundle for deploying the standard UDS Core package on a development cluster
   # x-release-please-start-version
-  version: "0.8.1"
+  version: "0.9.1"
   # x-release-please-end
 
 packages:
   - name: uds-k3d-dev
     repository: ghcr.io/defenseunicorns/packages/uds-k3d
     # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
-    ref: 0.3.0
+    ref: 0.3.1
     overrides:
       uds-dev-stack:
         minio:
@@ -36,7 +36,7 @@ packages:
   - name: core
     path: ../../build/
     # x-release-please-start-version
-    ref: 0.8.1
+    ref: 0.9.1
     # x-release-please-end
     overrides:
       istio-admin-gateway:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,12 +32,12 @@
     "k3d-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'"
   },
   "dependencies": {
-    "pepr": "0.22.2"
+    "pepr": "0.23.0"
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
     "jest": "29.7.0",
-    "ts-jest": "29.1.1"
+    "ts-jest": "29.1.2"
   },
   "jest": {
     "preset": "ts-jest",

diff --git a/packages/istio/zarf.yaml b/packages/istio/zarf.yaml
@@ -4,7 +4,7 @@ metadata:
   description: "UDS Core (Istio Only)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.8.1"
+  version: "0.9.1"
   # x-release-please-end
 
 components:

diff --git a/packages/standard/zarf.yaml b/packages/standard/zarf.yaml
@@ -4,7 +4,7 @@ metadata:
   description: "UDS Core"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.8.1"
+  version: "0.9.1"
   # x-release-please-end
 
 components:

diff --git a/src/grafana/common/zarf.yaml b/src/grafana/common/zarf.yaml
@@ -14,7 +14,7 @@ components:
         localPath: ../chart
       - name: grafana
         url: https://grafana.github.io/helm-charts/
-        version: 7.0.6
+        version: 7.2.4
         namespace: grafana
         valuesFiles:
           - ../values/values.yaml
diff --git a/src/grafana/values/registry1-values.yaml b/src/grafana/values/registry1-values.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry1.dso.mil
   repository: ironbank/opensource/grafana/grafana
-  tag: 10.2.2
+  tag: 10.2.3
 
 initChownData:
   image:
@@ -18,4 +18,4 @@ sidecar:
   image:
     registry: registry1.dso.mil
     repository: ironbank/kiwigrid/k8s-sidecar
-    tag: 1.25.2
+    tag: 1.25.3
diff --git a/src/grafana/values/upstream-values.yaml b/src/grafana/values/upstream-values.yaml
@@ -3,20 +3,20 @@ sidecar:
     # -- The Docker registry
     registry: ghcr.io
     repository: kiwigrid/k8s-sidecar
-    tag: 1.25.2
+    tag: 1.25.3
 
 image:
   registry: docker.io
   repository: grafana/grafana
-  tag: 10.1.5
+  tag: 10.3.1
 
 initChownData:
   image:
     registry: docker.io
     repository: library/busybox
-    tag: 1.31.1
+    tag: 1.36.1
 
 downloadDashboardsImage:
   registry: docker.io
   repository: curlimages/curl
-  tag: 7.85.0
+  tag: 8.5.0
diff --git a/src/grafana/zarf.yaml b/src/grafana/zarf.yaml
@@ -16,10 +16,10 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - docker.io/grafana/grafana:10.1.5
-      - docker.io/curlimages/curl:7.85.0
-      - docker.io/library/busybox:1.31.1
-      - ghcr.io/kiwigrid/k8s-sidecar:1.25.2
+      - docker.io/grafana/grafana:10.3.1
+      - docker.io/curlimages/curl:8.5.0
+      - docker.io/library/busybox:1.36.1
+      - ghcr.io/kiwigrid/k8s-sidecar:1.25.3
 
   - name: grafana
     required: true
@@ -32,6 +32,6 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/grafana/grafana:10.2.2
+      - registry1.dso.mil/ironbank/opensource/grafana/grafana:10.2.3
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.3
-      - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.25.2
+      - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.25.3
diff --git a/src/loki/common/zarf.yaml b/src/loki/common/zarf.yaml
@@ -13,7 +13,7 @@ components:
         localPath: ../chart
       - name: loki
         url: https://grafana.github.io/helm-charts/
-        version: 5.36.3
+        version: 5.41.8
         namespace: loki
         valuesFiles:
           - ../values/values.yaml