Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-v2.11] add support for new release-v2.11 branch #864

Merged
merged 2 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "/"
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/e2e-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-kind-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down