Merge branch 'release/2.7.0-alpha.2'

GrahamDumpleton · Feb 19, 2024 · 2c2d510 · 2c2d510
2 parents 86e0075 + 1e3caea
commit 2c2d510
Show file tree

Hide file tree

Showing 29 changed files with 469 additions and 210 deletions.
diff --git a/.github/workflows/build-and-publish-images.yaml b/.github/workflows/build-and-publish-images.yaml
@@ -77,7 +77,7 @@ jobs:
 
       - name: Restore Docker cache (amd64)
         if: ${{ (matrix.image == 'secrets-manager') || (matrix.image == 'session-manager') || (matrix.image == 'training-portal') || (matrix.image == 'tunnel-manager') }}
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache-amd64-new
           key: ${{runner.os}}-buildx-cache-amd64-${{matrix.image}}-${{github.sha}}
@@ -86,7 +86,7 @@ jobs:
 
       - name: Restore Docker cache (arm64)
         if: ${{ (matrix.image == 'secrets-manager') || (matrix.image == 'session-manager') || (matrix.image == 'training-portal') || (matrix.image == 'tunnel-manager') }}
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache-arm64-new
           key: ${{runner.os}}-buildx-cache-arm64-${{matrix.image}}-${{github.sha}}
@@ -155,14 +155,14 @@ jobs:
 
       - name: Save Docker cache (amd64)
         if: ${{ (matrix.image == 'secrets-manager') || (matrix.image == 'session-manager') || (matrix.image == 'training-portal') || (matrix.image == 'tunnel-manager') }}
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: /tmp/.buildx-cache-amd64-new
           key: ${{runner.os}}-buildx-cache-amd64-${{matrix.image}}-${{github.sha}}
 
       - name: Save Docker cache (arm64)
         if: ${{ (matrix.image == 'secrets-manager') || (matrix.image == 'session-manager') || (matrix.image == 'training-portal') || (matrix.image == 'tunnel-manager') }}
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: /tmp/.buildx-cache-arm64-new
           key: ${{runner.os}}-buildx-cache-arm64-${{matrix.image}}-${{github.sha}}
@@ -224,15 +224,15 @@ jobs:
           docker images prune
 
       - name: Restore Docker cache (amd64)
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache-amd64-new
           key: ${{runner.os}}-buildx-cache-amd64-base-environment-${{github.sha}}
           restore-keys: |
             ${{runner.os}}-buildx-cache-amd64-base-environment-
 
       - name: Restore Docker cache (arm64)
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache-arm64-new
           key: ${{runner.os}}-buildx-cache-arm64-base-environment-${{github.sha}}
@@ -304,13 +304,13 @@ jobs:
           du -ks /tmp/.buildx-cache-* || true
 
       - name: Save Docker cache (amd64)
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: /tmp/.buildx-cache-amd64-new
           key: ${{runner.os}}-buildx-cache-amd64-base-environment-${{github.sha}}
 
       - name: Save Docker cache (arm64)
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: /tmp/.buildx-cache-arm64-new
           key: ${{runner.os}}-buildx-cache-arm64-base-environment-${{github.sha}}
@@ -386,7 +386,7 @@ jobs:
 
       - name: Restore Docker cache (amd64)
         if: ${{ (matrix.image == 'conda-environment') }}
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache-amd64-new
           key: ${{runner.os}}-buildx-cache-amd64-${{matrix.image}}-${{github.sha}}
@@ -395,7 +395,7 @@ jobs:
 
       - name: Restore Docker cache (arm64)
         if: ${{ (matrix.image == 'conda-environment') }}
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache-arm64-new
           key: ${{runner.os}}-buildx-cache-arm64-${{matrix.image}}-${{github.sha}}
@@ -480,14 +480,14 @@ jobs:
 
       - name: Save Docker cache (amd64)
         if: ${{ (matrix.image == 'conda-environment') }}
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: /tmp/.buildx-cache-amd64-new
           key: ${{runner.os}}-buildx-cache-amd64-${{matrix.image}}-${{github.sha}}
 
       - name: Save Docker cache (arm64)
         if: ${{ (matrix.image == 'conda-environment') }}
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: /tmp/.buildx-cache-arm64-new
           key: ${{runner.os}}-buildx-cache-arm64-${{matrix.image}}-${{github.sha}}
@@ -536,7 +536,7 @@ jobs:
             -v imageRegistry.namespace=${{env.REPOSITORY_OWNER}} > package-repository/packages/cluster-essentials.educates.dev/educates-cluster-essentials-${{env.REPOSITORY_TAG}}.yaml
 
       - name: Save educates-cluster-essentials.yaml
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: educates-cluster-essentials-${{env.REPOSITORY_TAG}}.yaml
           path: package-repository/packages/cluster-essentials.educates.dev/educates-cluster-essentials-${{env.REPOSITORY_TAG}}.yaml
@@ -568,7 +568,7 @@ jobs:
             -v imageRegistry.namespace=${{env.REPOSITORY_OWNER}} > package-repository/packages/training-platform.educates.dev/educates-training-platform-${{env.REPOSITORY_TAG}}.yaml
 
       - name: Save educates-training-platform.yaml
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: educates-training-platform-${{env.REPOSITORY_TAG}}.yaml
           path: package-repository/packages/training-platform.educates.dev/educates-training-platform-${{env.REPOSITORY_TAG}}.yaml
@@ -581,13 +581,13 @@ jobs:
           ytt -f carvel-packages/repository.yaml -v packageRepository=ghcr.io/${{env.REPOSITORY_OWNER}} -v repositoryVersion=${{env.REPOSITORY_TAG}} > educates-packagerepository.yaml
 
       - name: Save educates-training-platform repository.yaml
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: educates-packagerepository.yaml
           path: educates-packagerepository.yaml
 
       - name: Save educates-training-platform package repository
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: package-repository
           path: package-repository
@@ -607,7 +607,7 @@ jobs:
           echo "REPOSITORY_OWNER=${REPOSITORY_OWNER,,}" >>${GITHUB_ENV}
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21.4"
           cache-dependency-path: |
@@ -624,7 +624,7 @@ jobs:
           IMAGE_REPOSITORY=ghcr.io/${{env.REPOSITORY_OWNER}}
           go build -o educates-linux-amd64 -ldflags "-X 'main.projectVersion=$REPOSITORY_TAG' -X 'main.imageRepository=$IMAGE_REPOSITORY'" cmd/educates/main.go
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: educates-linux-amd64
           path: client-programs/educates-linux-amd64
@@ -644,7 +644,7 @@ jobs:
           echo "REPOSITORY_OWNER=${REPOSITORY_OWNER,,}" >>${GITHUB_ENV}
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21.4"
           cache-dependency-path: |
@@ -661,7 +661,7 @@ jobs:
           IMAGE_REPOSITORY=ghcr.io/${{env.REPOSITORY_OWNER}}
           GOOS=linux GOARCH=arm64 go build -o educates-linux-arm64 -ldflags "-X 'main.projectVersion=$REPOSITORY_TAG' -X 'main.imageRepository=$IMAGE_REPOSITORY'" cmd/educates/main.go
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: educates-linux-arm64
           path: client-programs/educates-linux-arm64
@@ -681,7 +681,7 @@ jobs:
           echo "REPOSITORY_OWNER=$(echo "$REPOSITORY_OWNER" | tr '[:upper:]' '[:lower:]')" >>${GITHUB_ENV}
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21.4"
           cache-dependency-path: |
@@ -703,7 +703,7 @@ jobs:
           # GOOS=darwin GOARCH=amd64 go build -o educates-darwin-amd64 -ldflags "-X 'main.projectVersion=$REPOSITORY_TAG' -X 'main.imageRepository=$IMAGE_REPOSITORY'" cmd/educates/main.go
           go build -o educates-darwin-amd64 -ldflags "-X 'main.projectVersion=$REPOSITORY_TAG' -X 'main.imageRepository=$IMAGE_REPOSITORY'" cmd/educates/main.go
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: educates-darwin-amd64
           path: client-programs/educates-darwin-amd64
@@ -723,7 +723,7 @@ jobs:
           echo "REPOSITORY_OWNER=$(echo "$REPOSITORY_OWNER" | tr '[:upper:]' '[:lower:]')" >>${GITHUB_ENV}
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21.4"
           cache-dependency-path: |
@@ -740,7 +740,7 @@ jobs:
           IMAGE_REPOSITORY=ghcr.io/${{env.REPOSITORY_OWNER}}
           GOOS=darwin GOARCH=arm64 go build -o educates-darwin-arm64 -ldflags "-X 'main.projectVersion=$REPOSITORY_TAG' -X 'main.imageRepository=$IMAGE_REPOSITORY'" cmd/educates/main.go
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: educates-darwin-arm64
           path: client-programs/educates-darwin-arm64
@@ -756,25 +756,25 @@ jobs:
 
     steps:
       - name: Restore educates-linux-amd64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-linux-amd64
           path: client-programs
 
       - name: Restore educates-linux-arm64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-linux-arm64
           path: client-programs
 
       - name: Restore educates-darwin-amd64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-darwin-amd64
           path: client-programs
 
       - name: Restore educates-darwin-arm64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-darwin-arm64
           path: client-programs
@@ -889,37 +889,37 @@ jobs:
           echo "PRERELEASE=${PRERELEASE}" >>${GITHUB_ENV}
 
       - name: Restore packagerepository.yaml
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-packagerepository.yaml
 
       - name: Restore educates-cluster-essentials.yaml
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-cluster-essentials-${{env.REPOSITORY_TAG}}.yaml
 
       - name: Restore educates-training-platform.yaml
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-training-platform-${{env.REPOSITORY_TAG}}.yaml
 
       - name: Restore educates-linux-amd64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-linux-amd64
 
       - name: Restore educates-linux-arm64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-linux-arm64
 
       - name: Restore educates-darwin-amd64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-darwin-amd64
 
       - name: Restore educates-darwin-arm64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-darwin-arm64
 
@@ -939,12 +939,12 @@ jobs:
           cat checksums.txt >> release-notes.md
           echo '```' >> release-notes.md
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: checksums.txt
           path: checksums.txt
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: release-notes.md
           path: release-notes.md
@@ -996,13 +996,13 @@ jobs:
           echo "REPOSITORY_TAG=${REPOSITORY_TAG}" >>${GITHUB_ENV}
 
       - name: Restore educates-cluster-essentials.yaml
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-cluster-essentials-${{env.REPOSITORY_TAG}}.yaml
           path: package-repository/packages/cluster-essentials.educates.dev/
 
       - name: Restore educates-training-platform.yaml
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: educates-training-platform-${{env.REPOSITORY_TAG}}.yaml
           path: package-repository/packages/training-platform.educates.dev/

diff --git a/carvel-packages/training-platform/bundle/config/00-values.yaml b/carvel-packages/training-platform/bundle/config/00-values.yaml
@@ -6,16 +6,16 @@ imageVersions:
   image: "debian:sid-20230502-slim"
 - name: docker-in-docker
   image: "docker:20.10.18-dind"
-- name: rancher-k3s-v1.22
-  image: "rancher/k3s:v1.22.16-k3s1"
-- name: rancher-k3s-v1.23
-  image: "rancher/k3s:v1.23.14-k3s1"
-- name: rancher-k3s-v1.24
-  image: "rancher/k3s:v1.24.8-k3s1"
 - name: rancher-k3s-v1.25
-  image: "rancher/k3s:v1.25.3-k3s1"
+  image: "rancher/k3s:v1.25.16-k3s4"
+- name: rancher-k3s-v1.26
+  image: "rancher/k3s:v1.26.12-k3s1"
+- name: rancher-k3s-v1.27
+  image: "rancher/k3s:v1.27.9-k3s1"
+- name: rancher-k3s-v1.28
+  image: "rancher/k3s:v1.28.5-k3s1"
 - name: loftsh-vcluster
-  image: "loftsh/vcluster:0.13.0"
+  image: "loftsh/vcluster:0.18.1"
 - name: contour-bundle
   #! contour.community.tanzu.vmware.com.1.22.0
   image: "projects.registry.vmware.com/tce/contour@sha256:b68ad8ec3012db7d2a2e84f8544685012e2dca09d28d54dce8735fb60f0d05bf"
diff --git a/carvel-packages/training-platform/bundle/config/06-secrets.yaml b/carvel-packages/training-platform/bundle/config/06-secrets.yaml
@@ -52,7 +52,6 @@ kind: Secret
 metadata:
   name: #@ "{}-ca".format(data.values.clusterIngress.domain)
   namespace: #@ data.values.operator.namespace
-type: kubernetes.io/tls
 data:
   ca.crt: #@ base64.encode(ingress_ca_certificate)
 #@ end