From 4711c2a2a6902c0be39ccc695b35aef870457119 Mon Sep 17 00:00:00 2001 From: Krunal Hingu Date: Thu, 20 Feb 2025 12:17:10 +0530 Subject: [PATCH 1/2] add support for new release-v2.11 branch --- .github/dependabot.yml | 20 ++++++++++++++++++++ .github/workflows/e2e-workflow.yaml | 14 +++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d65ac2e9..832440f4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,6 +28,26 @@ updates: commit-message: prefix: ":seedling:" target-branch: "main" +# Go modules in release-v2.11 branch +- package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + ignore: + # Ignore controller-runtime as it's upgraded manually. + - dependency-name: "sigs.k8s.io/controller-runtime" + # Ignore k8s and its transitives modules as they are upgraded manually + # together with controller-runtime. + - dependency-name: "k8s.io/*" + # Ignore wrangler + - dependency-name: "github.com/rancher/wrangler" + - dependency-name: "github.com/rancher/wrangler/v3" + - dependency-name: "github.com/rancher/rancher/pkg/apis" + - dependency-name: "go.etcd.io/*" + - dependency-name: "github.com/Azure/azure-sdk-for-go" + commit-message: + prefix: ":seedling:" + target-branch: "release-v2.11" # Go modules in release-v2.10 branch - package-ecosystem: "gomod" directory: "/" diff --git a/.github/workflows/e2e-workflow.yaml b/.github/workflows/e2e-workflow.yaml index e1b1c9e1..7b748907 100644 --- a/.github/workflows/e2e-workflow.yaml +++ b/.github/workflows/e2e-workflow.yaml @@ -17,10 +17,22 @@ jobs: AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - e2e-test-v2_10: + e2e-test-v2_11: if: ${{ always() }} needs: e2e-test-main uses: ./.github/workflows/e2e-branch.yaml + with: + branch: release-v2.11 + secrets: + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + e2e-test-v2_10: + if: ${{ always() }} + needs: e2e-test-v2_11 + uses: ./.github/workflows/e2e-branch.yaml with: branch: release-v2.10 secrets: From dab470d1630f488f745e3e5f48797f3ab057049d Mon Sep 17 00:00:00 2001 From: Krunal Hingu Date: Thu, 20 Feb 2025 12:58:09 +0530 Subject: [PATCH 2/2] bump kube version to v1.32.2 --- scripts/setup-kind-cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-kind-cluster.sh b/scripts/setup-kind-cluster.sh index fafa322f..b6d62c10 100755 --- a/scripts/setup-kind-cluster.sh +++ b/scripts/setup-kind-cluster.sh @@ -2,7 +2,7 @@ set -e -KUBE_VERSION=${KUBE_VERSION:-v1.28.9} +KUBE_VERSION=${KUBE_VERSION:-v1.32.2} CLUSTER_NAME="${CLUSTER_NAME:-operator-e2e}" if ! kind get clusters | grep "$CLUSTER_NAME"; then