Revert "chore(main): release 0.35.0 (#1219)" (#1236)

This reverts commit c31c608. ## Description #1219 ultimately should not have been merged due to an underlying issue with our CI that did not get caught. We discovered that during `publish:single-layer`, we ran out of CPU resources available to the test cluster (4 CPU). We can mitigate this issue by disabling the `istio-ambient` component that is mistakenly being installed by default with `deploy:single-layer` when `layer==base`. ## Related Issue Fixes #  Relates to # ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [x] Other (security config, docs update, etc) ## Steps to Validate - N/A ## Checklist before merging - [ ] Test, docs, adr added or updated as needed - [ ] [Contributor Guide](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md) followed
defenseunicorns · Jan 29, 2025 · df19314 · df19314
1 parent c31c608
commit df19314
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 58 deletions.
diff --git a/.github/bundles/aks/uds-bundle.yaml b/.github/bundles/aks/uds-bundle.yaml
@@ -6,7 +6,7 @@ metadata:
   name: uds-core-aks-nightly
   description: A UDS bundle for deploying UDS Core on AKS
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
 
 packages:
@@ -17,7 +17,7 @@ packages:
   - name: core
     path: ../../../build
     # x-release-please-start-version
-    ref: 0.35.0
+    ref: 0.34.1
     # x-release-please-end
     # https://github.com/defenseunicorns/uds-core/issues/1222
     # optionalComponents:

diff --git a/.github/bundles/eks/uds-bundle.yaml b/.github/bundles/eks/uds-bundle.yaml
@@ -6,7 +6,7 @@ metadata:
   name: uds-core-eks-nightly
   description: A UDS bundle for deploying EKS and UDS Core
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
 
 packages:
@@ -17,7 +17,7 @@ packages:
   - name: core
     path: ../../../build
     # x-release-please-start-version
-    ref: 0.35.0
+    ref: 0.34.1
     # x-release-please-end
     optionalComponents:
       - istio-ambient

diff --git a/.github/bundles/rke2/uds-bundle.yaml b/.github/bundles/rke2/uds-bundle.yaml
@@ -6,7 +6,7 @@ metadata:
   name: uds-core-rke2-nightly
   description: A UDS bundle for deploying RKE2 and UDS Core
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
 
 packages:
@@ -38,7 +38,7 @@ packages:
   - name: core
     path: ../../../build
     # x-release-please-start-version
-    ref: 0.35.0
+    ref: 0.34.1
     # x-release-please-end
     optionalComponents:
       # https://github.com/defenseunicorns/uds-core/issues/1222

diff --git a/.github/test-infra/azure/aks/main.tf b/.github/test-infra/azure/aks/main.tf
@@ -55,8 +55,8 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
     name                 = var.default_node_pool_name
     auto_scaling_enabled = var.enable_autoscaling
     vnet_subnet_id       = azurerm_subnet.cluster_node_subnet.id
-    max_count            = var.autoscaling_max_node_count
-    min_count            = var.autoscaling_min_node_count
+    max_count            = var.enable_autoscaling ? var.autoscaling_max_node_count : null
+    min_count            = var.enable_autoscaling ? var.autoscaling_max_node_count : null
     vm_size              = var.default_node_pool_vm_size
     zones                = var.default_node_pool_availability_zones
     node_labels          = var.default_node_pool_node_labels
@@ -106,3 +106,13 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
     azurerm_resource_group.this
   ]
 }
+
+resource "azurerm_kubernetes_cluster_node_pool" "worker" {
+  name                  = "worker1"
+  mode                  = "User"
+  kubernetes_cluster_id = azurerm_kubernetes_cluster.aks_cluster.id
+  vm_size               = var.worker_pool_vm_size
+  auto_scaling_enabled  = var.enable_autoscaling
+  min_count             = var.enable_autoscaling ? var.autoscaling_min_node_count_worker : null
+  max_count             = var.enable_autoscaling ? var.autoscaling_max_node_count_worker : null
+}
diff --git a/.github/test-infra/azure/aks/variables.tf b/.github/test-infra/azure/aks/variables.tf
@@ -25,7 +25,7 @@ variable "dns_prefix" {
 
 variable "sku_tier" {
   description = "(Optional) The SKU Tier that should be used for this Kubernetes Cluster. Possible values are Free and Standard (which includes the Uptime SLA), and Premium. Defaults to Free."
-  default     = "Standard"
+  default     = "Free"
   type        = string
 
   validation {
@@ -43,19 +43,31 @@ variable "kubernetes_version" {
 variable "enable_autoscaling" {
   description = "(Optional) Enable cluster-autoscaler on all nodepools. Defaults to true."
   type        = bool
-  default     = true
+  default     = false
 }
 
 variable "autoscaling_max_node_count" {
   description = "The maximum number of nodes to allow the default (system) node pool to scale up to."
   type        = number
-  default     = 6
+  default     = 3
+}
+
+variable "autoscaling_max_node_count_worker" {
+  description = "The maximum number of nodes to allow the worker (user) node pool to scale up to."
+  type        = number
+  default     = 3
 }
 
 variable "autoscaling_min_node_count" {
   description = "The minimum number of nodes that should always be present in the default (system) node pool."
   type        = number
-  default     = 4
+  default     = 2
+}
+
+variable "autoscaling_min_node_count_worker" {
+  description = "The minimum number of nodes that should always be present in the worker (user) node pool."
+  type        = number
+  default     = 3
 }
 
 variable "default_node_pool_vm_size" {
@@ -64,6 +76,12 @@ variable "default_node_pool_vm_size" {
   type        = string
 }
 
+variable "worker_pool_vm_size" {
+  description = "Specifies the vm size of the worker node pool"
+  default     = "Standard_F8s_v2"
+  type        = string
+}
+
 variable "default_node_pool_availability_zones" {
   description = "Specifies the availability zones of the default node pool"
   default     = ["1", "2", "3"]

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "0.35.0"
+    ".": "0.34.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,33 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.35.0](https://github.com/defenseunicorns/uds-core/compare/v0.34.1...v0.35.0) (2025-01-27)
-
-
-### Features
-
-* add logic to handle updates to operator config ([#1186](https://github.com/defenseunicorns/uds-core/issues/1186)) ([004e8b4](https://github.com/defenseunicorns/uds-core/commit/004e8b4114a46869488e7412d6f2d7201f83acd3))
-* optional istio cni ztunnel component ([#1175](https://github.com/defenseunicorns/uds-core/issues/1175)) ([e003924](https://github.com/defenseunicorns/uds-core/commit/e00392484e9d43ee2d33be531ed11e8836b5b545))
-
-
-### Bug Fixes
-
-* add healthz port to neuvector services ([#1223](https://github.com/defenseunicorns/uds-core/issues/1223)) ([ec55729](https://github.com/defenseunicorns/uds-core/commit/ec55729692c753f1ec983d3ea38fb627ca9557e1))
-* checkpoint ci issue ([#1234](https://github.com/defenseunicorns/uds-core/issues/1234)) ([548ff6a](https://github.com/defenseunicorns/uds-core/commit/548ff6af3eec1a2c03438bfdf9e2f9301997aefb))
-* denied user permissions policy messaging ([#1227](https://github.com/defenseunicorns/uds-core/issues/1227)) ([1ccf4f7](https://github.com/defenseunicorns/uds-core/commit/1ccf4f7bce2cc09a74a2bb5e28a894900440d4a7))
-* istio package no longer assumes pepr deployments exist ([#1232](https://github.com/defenseunicorns/uds-core/issues/1232)) ([ab11592](https://github.com/defenseunicorns/uds-core/commit/ab115926cf07a5c0bfe52d25df0791cd99d9d78e))
-
-
-### Miscellaneous
-
-* **deps:** update authservice to v1.0.4 ([#1211](https://github.com/defenseunicorns/uds-core/issues/1211)) ([da4d043](https://github.com/defenseunicorns/uds-core/commit/da4d043b56cd7aa746838f432da8e7501469f1d7))
-* **deps:** update pepr ([#1197](https://github.com/defenseunicorns/uds-core/issues/1197)) ([652c925](https://github.com/defenseunicorns/uds-core/commit/652c925629a89408fd69f46b9933a8bc4bc15bc9))
-
-
-### Documentation
-
-* add documentation on metrics/dashboards for apps ([#1221](https://github.com/defenseunicorns/uds-core/issues/1221)) ([d9062da](https://github.com/defenseunicorns/uds-core/commit/d9062da0e653a9148c60c8be9a30a88095038737))
-
 ## [0.34.1](https://github.com/defenseunicorns/uds-core/compare/v0.34.0...v0.34.1) (2025-01-21)
 
 

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ If you want to try out UDS Core, you can use the [k3d-core-demo bundle](./bundle
 <!-- x-release-please-start-version -->
 
 ```bash
-uds deploy k3d-core-demo:0.35.0
+uds deploy k3d-core-demo:0.34.1
 ```
 
 <!-- x-release-please-end -->
@@ -74,7 +74,7 @@ Deploy Istio, Keycloak and Pepr:
 <!-- x-release-please-start-version -->
 
 ```bash
-uds deploy k3d-core-slim-dev:0.35.0
+uds deploy k3d-core-slim-dev:0.34.1
 ```
 
 <!-- x-release-please-end -->

diff --git a/bundles/k3d-slim-dev/uds-bundle.yaml b/bundles/k3d-slim-dev/uds-bundle.yaml
@@ -6,7 +6,7 @@ metadata:
   name: k3d-core-slim-dev
   description: A UDS bundle for deploying Istio from UDS Core on a development cluster
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
 
 packages:
@@ -37,7 +37,7 @@ packages:
   - name: core-base
     path: ../../build/
     # x-release-please-start-version
-    ref: 0.35.0
+    ref: 0.34.1
     # x-release-please-end
     overrides:
       pepr-uds-core:
@@ -92,7 +92,7 @@ packages:
   - name: core-identity-authorization
     path: ../../build/
     # x-release-please-start-version
-    ref: 0.35.0
+    ref: 0.34.1
     # x-release-please-end
     overrides:
       keycloak:

diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml
@@ -6,7 +6,7 @@ metadata:
   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.35.0"
+  version: "0.34.1"
   # x-release-please-end
 
 packages:
@@ -37,7 +37,7 @@ packages:
   - name: core
     path: ../../build/
     # x-release-please-start-version
-    ref: 0.35.0
+    ref: 0.34.1
     # x-release-please-end
     optionalComponents:
       - istio-ambient

diff --git a/packages/backup-restore/zarf.yaml b/packages/backup-restore/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core (Backup and Restore)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: ["base"]
 

diff --git a/packages/base/zarf.yaml b/packages/base/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core (Base)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: []
 

diff --git a/packages/checkpoint-dev/zarf.yaml b/packages/checkpoint-dev/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "Rehydratable UDS K3d + UDS Core Slim (Istio, UDS Operator and Keycloak) Checkpoint"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
 
 variables:

diff --git a/packages/identity-authorization/zarf.yaml b/packages/identity-authorization/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core (Identity & Authorization)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: ["base"]
 

diff --git a/packages/logging/zarf.yaml b/packages/logging/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core (Logging)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: ["base"]
 

diff --git a/packages/metrics-server/zarf.yaml b/packages/metrics-server/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core (Metrics Server)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: ["base"]
 

diff --git a/packages/monitoring/zarf.yaml b/packages/monitoring/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core Monitoring (Prometheus and Grafana)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: ["base", "identity-authorization"]
 

diff --git a/packages/runtime-security/zarf.yaml b/packages/runtime-security/zarf.yaml
@@ -7,7 +7,7 @@ metadata:
   description: "UDS Core (Runtime Security)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
-  version: "0.35.0"
+  version: "0.34.1"
   # x-release-please-end
   x-uds-dependencies: ["base", "identity-authorization"]
 

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

diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
@@ -9,7 +9,7 @@ variables:
   - name: VERSION
     description: "The version of the packages to deploy"
     # x-release-please-start-version
-    default: "0.35.0"
+    default: "0.34.1"
     # x-release-please-end
   - name: FLAVOR
     default: upstream
@@ -46,7 +46,11 @@ tasks:
         default: base
         description: The UDS Core layer to deploy
     actions:
+      - description: "Deploy UDS Core Base Layer without Ambient (must set UDS_LAYER environment variable)"
+        if: ${{ eq .inputs.layer "base"}}
+        cmd: uds zarf package deploy build/zarf-package-core-${{ index .inputs "layer" }}-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress --components '-istio-ambient,*'
       - description: "Deploy a single UDS Core Layer (must set UDS_LAYER environment variable)"
+        if: ${{ ne .inputs.layer "base"}}
         cmd: uds zarf package deploy build/zarf-package-core-${{ index .inputs "layer" }}-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress --components '*'
 
   - name: latest-package-release

diff --git a/tasks/publish.yaml b/tasks/publish.yaml
@@ -14,7 +14,7 @@ variables:
   - name: VERSION
     description: "The version of the packages to build"
     # x-release-please-start-version
-    default: "0.35.0"
+    default: "0.34.1"
     # x-release-please-end
 
   - name: LAYER