diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index 1478e1969a3..54a24fdbc9e 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -75,12 +75,8 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 1 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - cache-dependency-path: | - **/go.sum - **/go.mod + - name: Install Go + uses: ./.github/actions/setup-go - name: Setup Build Directories run: | mkdir -p ./bin ./build/images @@ -109,13 +105,6 @@ jobs: - name: On Failure, Dump Server Logs if: ${{ failure() }} run: cat ./tests/integration/${{ matrix.itest }}/r2log.txt - - name: On Failure, Launch Debug Session - uses: dereknola/action-upterm@v1.1 - if: ${{ failure() }} - with: - ## If no one connects after 5 minutes, shut down server. - wait-timeout-minutes: 5 - limit-access-to-actor: true e2e: name: "E2E Tests" @@ -125,7 +114,7 @@ jobs: strategy: fail-fast: false matrix: - etest: [dnscache] + etest: [dnscache, kine] max-parallel: 3 steps: - name: "Checkout" @@ -144,10 +133,7 @@ jobs: run: vagrant plugin install vagrant-rke2 vagrant-reload vagrant-scp - name: Install Go - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - cache: false + uses: ./.github/actions/setup-go - name: Install Kubectl run: | curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" @@ -169,10 +155,3 @@ jobs: run: | cd tests/e2e/${{ matrix.etest }} go test -v -timeout=45m ./${{ matrix.etest}}_test.go -ci -local - - name: On Failure, Launch Debug Session - uses: dereknola/action-upterm@v1.1 - if: ${{ failure() }} - with: - ## If no one connects after 5 minutes, shut down server. - wait-timeout-minutes: 5 - limit-access-to-actor: true \ No newline at end of file diff --git a/Dockerfile.windows b/Dockerfile.windows index 941207984a8..aac03e85152 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -46,8 +46,8 @@ ARG KUBERNETES_VERSION=dev ENV CRICTL_VERSION="v1.30.1" ENV CALICO_VERSION="v3.28.2" ENV CNI_PLUGIN_VERSION="v1.4.1" -ENV FLANNEL_VERSION="v0.25.7" -ENV CNI_FLANNEL_VERSION="v1.5.1-flannel2" +ENV FLANNEL_VERSION="v0.26.0" +ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1" RUN mkdir -p rancher diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 2088cc81b6d..39e96bc13d8 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -1,5 +1,5 @@ charts: - - version: 1.16.201 + - version: 1.16.303 filename: /charts/rke2-cilium.yaml bootstrap: true - version: v3.28.2-build2024101601 @@ -26,10 +26,10 @@ charts: - version: 3.12.004 filename: /charts/rke2-metrics-server.yaml bootstrap: false - - version: v4.1.205 + - version: v4.1.301 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.704 + - version: v0.26.001 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.9.000 diff --git a/scripts/build-images b/scripts/build-images index 6d813f4358a..0351ebbeb25 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -41,16 +41,16 @@ EOF if [ "${GOARCH}" != "s390x" ]; then xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.2.0 - ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.2 - ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.29.9-1726784081-a90146d13b4cd7d168d573396ccf2b3db5a3b047 - ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.2 - ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.2 + ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.3 + ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.29.9-1728346947-0d05e48bfbb8c4737ec40d5781d970a550ed2bbd + ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.3 + ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.3 ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.1 ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.2 - ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.2 - ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.2 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009 + ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.3 + ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.3 + ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.3 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt @@ -81,8 +81,8 @@ EOF fi xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt - ${REGISTRY}/rancher/hardened-multus-cni:v4.1.2-build20241011 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009 + ${REGISTRY}/rancher/hardened-multus-cni:v4.1.3-build20241028 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022 ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011 ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 EOF @@ -98,8 +98,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt - ${REGISTRY}/rancher/hardened-flannel:v0.25.7-build20241008 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009 + ${REGISTRY}/rancher/hardened-flannel:v0.26.0-build20241024 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images