Merge branch 'main' into laverya/error-typo

Makefile

@@ -134,11 +134,11 @@ all-ttl.sh: build-ttl.sh
 		DOCKER_BUILD_ARGS="--platform $(GOOS)/$(GOARCH)" \
 		make -C migrations build_schema
 
-	docker pull --platform $(GOOS)/$(GOARCH)" kotsadm/minio:${MINIO_TAG}
+	docker pull --platform $(GOOS)/$(GOARCH) kotsadm/minio:${MINIO_TAG}
 	docker tag kotsadm/minio:${MINIO_TAG} ttl.sh/${CURRENT_USER}/minio:${MINIO_TAG}
 	docker push ttl.sh/${CURRENT_USER}/minio:${MINIO_TAG}
 
-	docker pull --platform $(GOOS)/$(GOARCH)" kotsadm/rqlite:${RQLITE_TAG}
+	docker pull --platform $(GOOS)/$(GOARCH) kotsadm/rqlite:${RQLITE_TAG}
 	docker tag kotsadm/rqlite:${RQLITE_TAG} ttl.sh/${CURRENT_USER}/rqlite:${RQLITE_TAG}
 	docker push ttl.sh/${CURRENT_USER}/rqlite:${RQLITE_TAG}
 

README.md

@@ -75,3 +75,8 @@ cosign verify-blob --key sbom/key.pub --signature sbom/kots-sbom.tgz.sig sbom/ko
     ```
 1. Visit the Admin Console URL. For VS Code:
    ![Image 2024-02-23 at 2 55 11 PM](https://github.com/replicatedhq/kots/assets/39952863/aa86019f-0111-4d04-a142-3dfc539858a2)
+
+1. If you'll be working on the webapp or plan on using `make all-ttl.sh` for local testing, be sure to setup yarn:
+    ```bash
+   cd web && yarn
+    ```

deploy/dex/apko.yaml.tmpl

@@ -7,8 +7,6 @@ contents:
     - dex=__DEX_VERSION__
     - gomplate
     - bash
-    - busybox
-    - wolfi-baselayout
 
 accounts:
   groups:

deploy/minio/apko.yaml.tmpl

@@ -7,8 +7,6 @@ contents:
     - minio=__MINIO_VERSION__
     - mc
     - bash
-    - busybox
-    - wolfi-baselayout
 
 accounts:
   groups:

deploy/rqlite/apko.yaml.tmpl

@@ -7,8 +7,6 @@ contents:
     - rqlite=__RQLITE_VERSION__
     - rqlite-oci-entrypoint=__RQLITE_VERSION__
     - bash
-    - busybox
-    - wolfi-baselayout
 
 accounts:
   groups: