add local upgrade test, fix remote upgrade test, align som resource v…

…alues, update remote task versions, update system requirements in docs

README.md

@@ -27,7 +27,7 @@ This repository publishes multiple bundles for dev, test and demo purposes. They
 
 This is a bundle primarily for development that is located at `bundles/dev`. It requires an existing k3d cluster to deploy.
 
-This bundle requires ~ `8 CPUs and 28GB of memory` available to run.
+This bundle requires ~ `9 CPUs and 28GB of memory` available to run.
 
 ### k3d-swf-demo
 
@@ -43,7 +43,7 @@ This is a fairly large bundle and requires `16 CPUs and 64GB of memory` availabl
 
 - [K3D](https://k3d.io/) for dev & test environments or any [CNCF Certified Kubernetes Cluster](https://www.cncf.io/training/certification/software-conformance/#logos) for production environments.
 <!-- renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver -->
-- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.9.4 or later
+- [UDS CLI](https://github.com/defenseunicorns/uds-cli?tab=readme-ov-file#install) v0.10.2 or later
 
 #### Quickstart
 
@@ -76,7 +76,7 @@ Alternatively, you can deploy from OCI by running the following two commands:
 1. Run the below command to deploy the `k3d-core-slim-dev` bundle:
 
     ```bash
-    uds deploy k3d-core-slim-dev:0.16.1
+    uds deploy k3d-core-slim-dev:0.18.0
     ```
 
 1. Run the below command to deploy the `swf-dev` bundle on top of the dev cluster:

bundles/dev/uds-bundle.yaml

@@ -70,6 +70,19 @@ packages:
   - name: dev-redis
     repository: ghcr.io/defenseunicorns/packages/uds/dev-redis
     ref: 0.0.1
+    overrides:
+      redis:
+        redis:
+          variables:
+            - name: REDIS_RESOURCES
+              path: "master.resources"
+              default:
+                limits:
+                  cpu: 100m
+                  memory: 300Mi
+                requests:
+                  cpu: 100m
+                  memory: 300Mi
 
   - name: dev-secrets
     path: ../../
@@ -128,6 +141,16 @@ packages:
                 requests:
                   cpu: 10m
                   memory: 10M
+            - name: TOOLBOX_RESOURCES
+              description: "Gitlab Toolbox Resources"
+              path: "gitlab.toolbox.resources"
+              default:
+                limits:
+                  cpu: 2000m
+                  memory: 3584M
+                requests:
+                  cpu: 500m
+                  memory: 1000M
             - name: SIDEKIQ_REPLICAS
               description: "Gitlab Sidekiq Min Replicas"
               path: "gitlab.sidekiq.minReplicas"
@@ -234,3 +257,12 @@ packages:
             - name: MATTERMOST_OBJECT_STORAGE_BUCKET
               path: "objectStorage.bucket"
               default: "uds-mattermost-dev"
+            - name: MATTERMOST_RESOURCES
+              path: "resources"
+              default:
+                limits:
+                  cpu: 100m
+                  memory: 300Mi
+                requests:
+                  cpu: 100m
+                  memory: 300Mi

bundles/dev/uds-config.yaml

@@ -41,6 +41,13 @@ variables:
     DISABLE_REGISTRY_REDIRECT: "true"
     # # Overrides for scaled down cluster for local dev and CI
     webservice_replicas: 1
+    toolbox_resources:
+      limits:
+        cpu: 2000m
+        memory: 3584M
+      requests:
+        cpu: 500m
+        memory: 1000M
     webservice_resources:
       limits:
         memory: 2.5G

bundles/k3d-demo/uds-bundle.yaml

@@ -60,6 +60,19 @@ packages:
   - name: dev-redis
     repository: ghcr.io/defenseunicorns/packages/uds/dev-redis
     ref: 0.0.1
+    overrides:
+      redis:
+        redis:
+          variables:
+            - name: REDIS_RESOURCES
+              path: "master.resources"
+              default:
+                limits:
+                  cpu: 100m
+                  memory: 300Mi
+                requests:
+                  cpu: 100m
+                  memory: 300Mi
 
   - name: dev-secrets
     path: ../../
@@ -118,6 +131,16 @@ packages:
                 requests:
                   cpu: 10m
                   memory: 10M
+            - name: TOOLBOX_RESOURCES
+              description: "Gitlab Toolbox Resources"
+              path: "gitlab.toolbox.resources"
+              default:
+                limits:
+                  cpu: 2000m
+                  memory: 3584M
+                requests:
+                  cpu: 500m
+                  memory: 1000M
             - name: SIDEKIQ_REPLICAS
               description: "Gitlab Sidekiq Min Replicas"
               path: "gitlab.sidekiq.minReplicas"
@@ -224,3 +247,12 @@ packages:
             - name: MATTERMOST_OBJECT_STORAGE_BUCKET
               path: "objectStorage.bucket"
               default: "uds-mattermost-dev"
+            - name: MATTERMOST_RESOURCES
+              path: "resources"
+              default:
+                limits:
+                  cpu: 100m
+                  memory: 300Mi
+                requests:
+                  cpu: 100m
+                  memory: 300Mi

bundles/k3d-demo/uds-config.yaml

@@ -47,6 +47,13 @@ variables:
       requests:
         cpu: 300m
         memory: 2.5G
+    toolbox_resources:
+      limits:
+        cpu: 2000m
+        memory: 3584M
+      requests:
+        cpu: 500m
+        memory: 1000M
     migrations_resources:
       limits:
         cpu: 500m

docs/development.md

@@ -7,7 +7,7 @@ If deploying on an Apple Silicon Mac you can use colima, an open source alternat
 To set up an appropriately configured colima VM you can run the following command:
 
 ```bash
-colima start --cpu 10 --memory 28 --disk 50 --vm-type vz  --vz-rosetta --arch aarch64 --profile uds
+colima start --cpu 9 --memory 28 --disk 50 --vm-type vz  --vz-rosetta --arch aarch64 --profile uds
 ```
 
 Additionally, some settings need to be configured on the host to facilitate a successful deployment of Sonarqube:

tasks.yaml

@@ -1,9 +1,9 @@
 includes:
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.9/tasks/create.yaml
-  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.9/tasks/lint.yaml
-  - pull: ./tasks/pull.yaml #https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.3/tasks/pull.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.9/tasks/deploy.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.9/tasks/setup.yaml
+  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.10/tasks/create.yaml
+  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.10/tasks/lint.yaml
+  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.10/tasks/pull.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.10/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.3.10/tasks/setup.yaml
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml