Merge branch 'main' into renovate/google-github-actions-release-pleas…

…e-action-digest
defenseunicorns · May 23, 2024 · bd25bbd · bd25bbd
2 parents 5ce02af + 4960e94
commit bd25bbd
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 31 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -17,28 +17,24 @@ jobs:
     strategy:
       matrix:
         image: ["ghcr.io/defenseunicorns/oss/uds-k3d-k3s"]
-        version: ["v1.27.11-k3s1", "v1.28.7-k3s1", "v1.29.2-k3s1"]
-        # Test the default image as well
-        include:
-          - image: "rancher/k3s"
-            version: "v1.27.4-k3s1"
+        version: ["v1.27.13-k3s1", "v1.28.9-k3s1", "v1.29.4-k3s1"]
 
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: Setup UDS
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/setup@b604d2e1b3fc69f29122f9a709c605f5ecf4da18 # v0.4.0
+        uses: defenseunicorns/uds-common/.github/actions/setup@859a9b2469c8a6c24c414fe34b127ec5677aea62 # v0.4.3
         with:
           username: ${{secrets.IRON_BANK_ROBOT_USERNAME}}
           password: ${{secrets.IRON_BANK_ROBOT_PASSWORD}}
 
       - name: Build the custom k3s image
         if: ${{matrix.image}} != "rancher/k3s"
-        run: uds run build-image --set VERSION=${{matrix.version}}
+        run: uds run build-image --set VERSION=${{matrix.version}} --no-progress
 
       - name: Create and deploy the uds-k3d package
-        run: uds run --set IMAGE_NAME=${{matrix.image}} --set VERSION=${{matrix.version}}
+        run: uds run --set IMAGE_NAME=${{matrix.image}} --set VERSION=${{matrix.version}} --no-progress
 
       - name: Validate uds-k3d package
-        run: uds run validate
+        run: uds run validate --no-progress
diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml
@@ -13,20 +13,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["v1.27.11-k3s1", "v1.28.7-k3s1", "v1.29.2-k3s1"]
+        version: ["v1.27.13-k3s1", "v1.28.9-k3s1", "v1.29.4-k3s1"]
 
     permissions:
       contents: read
       packages: write
 
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
-      - uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
+      - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
       - name: Setup UDS
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/setup@05f42bb3117b66ebef8c72ae050b34bce19385f5 # v0.3.6
+        uses: defenseunicorns/uds-common/.github/actions/setup@859a9b2469c8a6c24c414fe34b127ec5677aea62 # v0.4.3
         with:
           username: ${{secrets.IRON_BANK_ROBOT_USERNAME}}
           password: ${{secrets.IRON_BANK_ROBOT_PASSWORD}}
@@ -39,4 +39,4 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish the custom k3s image
-        run: uds run publish-image --set VERSION=${{matrix.version}}
+        run: uds run publish-image --set VERSION=${{matrix.version}} --no-progress
diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
@@ -30,11 +30,11 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: Setup UDS
         if: always()
-        uses: defenseunicorns/uds-common/.github/actions/setup@05f42bb3117b66ebef8c72ae050b34bce19385f5 # v0.3.6
+        uses: defenseunicorns/uds-common/.github/actions/setup@859a9b2469c8a6c24c414fe34b127ec5677aea62 # v0.4.3
         with:
           username: ${{secrets.IRON_BANK_ROBOT_USERNAME}}
           password: ${{secrets.IRON_BANK_ROBOT_PASSWORD}}

diff --git a/chart/templates/nginx.yaml b/chart/templates/nginx.yaml
@@ -71,9 +71,9 @@ spec:
           command: ["nginx", "-g", "daemon off;"]
           ports:
             - containerPort: 80
-              hostPort: 20080
+              hostPort: 80
             - containerPort: 443
-              hostPort: 20443
+              hostPort: 443
           volumeMounts:
             - name: config-volume
               mountPath: /etc/nginx/nginx.conf

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG K3S_TAG="v1.28.7-k3s1"
+ARG K3S_TAG="v1.28.9-k3s1"
 
 FROM rancher/k3s:$K3S_TAG as k3s
 

diff --git a/tasks.yaml b/tasks.yaml
@@ -1,18 +1,20 @@
 variables:
   - name: VERSION
-    default: "v1.28.7-k3s1"
+    default: "v1.28.9-k3s1"
   - name: IMAGE_NAME
     default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s"
+  - name: K3D_EXTRA_ARGS
+    default: ""
 
 tasks:
   - name: default
     description: "Build and deploy uds-k3d"
     actions:
       - description: "Build UDS K3d package"
-        cmd: "uds zarf package create --confirm"
+        cmd: "uds zarf package create --confirm --no-progress"
 
       - description: "Deploy UDS K3d package"
-        cmd: "uds zarf package deploy zarf-package-uds-k3d-*.tar.zst --confirm --set K3D_IMAGE=${IMAGE_NAME}:${VERSION}"
+        cmd: "uds zarf package deploy zarf-package-uds-k3d-*.tar.zst --confirm --set K3D_IMAGE=${IMAGE_NAME}:${VERSION} --set K3D_EXTRA_ARGS=\"${K3D_EXTRA_ARGS}\" --no-progress"
 
   - name: validate
     actions:
@@ -36,10 +38,9 @@ tasks:
       - description: Validate zarf init
         cmd: |
           set -e
-          # uds zarf tools download-init does not work in 0.9.4 - https://github.com/defenseunicorns/uds-cli/issues/517
-          uds zarf package pull oci://ghcr.io/defenseunicorns/packages/init:$(uds zarf version)
+          uds zarf tools download-init --no-progress
           # Test zarf init due to containerd issue - https://github.com/defenseunicorns/zarf/issues/592
-          uds zarf init --confirm
+          uds zarf init --confirm --no-progress
 
   - name: build-image
     actions:

diff --git a/zarf.yaml b/zarf.yaml
@@ -17,7 +17,7 @@ variables:
 
   - name: K3D_IMAGE
     description: "K3d image to use"
-    default: "rancher/k3s:v1.27.4-k3s1"
+    default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s:v1.28.9-k3s1"
 
   - name: K3D_EXTRA_ARGS
     description: "Optionally pass k3d arguments to the default"
@@ -41,8 +41,8 @@ components:
         before:
           - cmd: |
               k3d cluster create \
-              -p "80:20080@server:*" \
-              -p "443:20443@server:*" \
+              -p "80:80@server:*" \
+              -p "443:443@server:*" \
               --api-port 6550 \
               --k3s-arg "--disable=traefik@server:*" \
               --k3s-arg "--disable=metrics-server@server:*" \
@@ -80,14 +80,14 @@ components:
       - name: metallb
         namespace: uds-dev-stack
         url: https://metallb.github.io/metallb
-        version: 0.13.11
+        version: 0.14.5
       - name: uds-dev-stack
         namespace: uds-dev-stack
         localPath: chart
         version: 0.2.0
       - name: minio
         namespace: uds-dev-stack
-        version: 5.0.14
+        version: 5.2.0
         url: https://charts.min.io/
         valuesFiles:
           - "values/minio-values.yaml"