From 0c89ec8ca0aedd2962b64325de30fac425eef7df Mon Sep 17 00:00:00 2001 From: "shouchen.zz" Date: Mon, 9 Jun 2025 15:47:54 +0800 Subject: [PATCH] update dependency to 1.28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 守辰 --- .github/workflows/ci.yaml | 29 +- ...yaml => e2e-advanced-deployment-1.24.yaml} | 19 +- .../e2e-advanced-deployment-1.26.yaml | 15 +- ...yaml => e2e-advanced-deployment-1.28.yaml} | 23 +- ...neset-1.19.yaml => e2e-cloneset-1.24.yaml} | 19 +- .github/workflows/e2e-cloneset-1.26.yaml | 14 +- ...neset-1.23.yaml => e2e-cloneset-1.28.yaml} | 19 +- .github/workflows/e2e-custom.yaml | 13 +- ...nset-1.19.yaml => e2e-daemonset-1.24.yaml} | 19 +- .github/workflows/e2e-daemonset-1.26.yaml | 14 +- ...nset-1.23.yaml => e2e-daemonset-1.28.yaml} | 19 +- ...ent-1.19.yaml => e2e-deployment-1.24.yaml} | 19 +- .github/workflows/e2e-deployment-1.26.yaml | 14 +- ...ent-1.23.yaml => e2e-deployment-1.28.yaml} | 19 +- .github/workflows/e2e-gateway.yaml | 17 +- .../workflows/e2e-multi-network-provider.yaml | 13 +- ...-others-1.19.yaml => e2e-others-1.24.yaml} | 19 +- .github/workflows/e2e-others-1.26.yaml | 14 +- ...-others-1.23.yaml => e2e-others-1.28.yaml} | 19 +- ...et-1.19.yaml => e2e-statefulset-1.24.yaml} | 19 +- .github/workflows/e2e-statefulset-1.26.yaml | 16 +- ...et-1.23.yaml => e2e-statefulset-1.28.yaml} | 19 +- ...3.yaml => e2e-v1beta1-bluegreen-1.24.yaml} | 19 +- .../workflows/e2e-v1beta1-bluegreen-1.26.yaml | 14 +- ...9.yaml => e2e-v1beta1-bluegreen-1.28.yaml} | 23 +- ...p-1.23.yaml => e2e-v1beta1-jump-1.24.yaml} | 19 +- .github/workflows/e2e-v1beta1-jump-1.26.yaml | 14 +- ...p-1.19.yaml => e2e-v1beta1-jump-1.28.yaml} | 20 +- .github/workflows/license.yml | 5 +- .golangci.yml | 128 +- Dockerfile | 3 +- Makefile | 28 +- api/v1alpha1/zz_generated.deepcopy.go | 1 - api/v1beta1/rollout_types.go | 3 + api/v1beta1/zz_generated.deepcopy.go | 1 - .../rollouts.kruise.io_batchreleases.yaml | 271 ++-- .../rollouts.kruise.io_rollouthistories.yaml | 44 +- .../bases/rollouts.kruise.io_rollouts.yaml | 1300 ++++++++++------- .../rollouts.kruise.io_trafficroutings.yaml | 246 ++-- config/rbac/role.yaml | 2 - config/webhook/manifests.yaml | 2 - go.mod | 96 +- go.sum | 620 ++------ main.go | 17 +- pkg/client/clientset/versioned/clientset.go | 19 + pkg/client/clientset/versioned/doc.go | 20 + .../versioned/fake/clientset_generated.go | 19 + pkg/client/clientset/versioned/fake/doc.go | 20 + .../clientset/versioned/fake/register.go | 19 + pkg/client/clientset/versioned/scheme/doc.go | 20 + .../clientset/versioned/scheme/register.go | 19 + .../versioned/typed/rollouts/v1beta1/doc.go | 20 + .../typed/rollouts/v1beta1/fake/doc.go | 20 + .../v1beta1/fake/fake_rollouts_client.go | 19 + .../rollouts/v1beta1/generated_expansion.go | 19 + .../typed/rollouts/v1beta1/rollouts_client.go | 19 + .../batchrelease/batchrelease_controller.go | 11 +- .../batchrelease_controller_test.go | 8 +- .../batchrelease_event_handler.go | 16 +- .../batchrelease_event_handler_test.go | 11 +- .../bluegreenstyle/cloneset/control_test.go | 1 + .../control/partitionstyle/control_plane.go | 2 +- pkg/controller/batchrelease/control/util.go | 2 +- .../batchrelease/labelpatch/patcher.go | 2 +- .../batchrelease/labelpatch/patcher_test.go | 2 + pkg/controller/deployment/controller.go | 13 +- .../deployment/deployment_event_handler.go | 8 +- pkg/controller/rollout/rollout_controller.go | 11 +- .../rollout/rollout_event_handler.go | 16 +- .../rollout/rollout_event_handler_test.go | 4 +- .../rollout/rollout_progressing_test.go | 5 +- .../rollout/rollout_releaseManager.go | 2 +- .../rollout/rollout_releaseManager_test.go | 1 + pkg/controller/rollout/rollout_status_test.go | 4 +- .../rollouthistory_controller.go | 4 +- .../rollouthistory_controller_test.go | 2 +- .../rollouthistory_event_handler.go | 18 +- .../trafficrouting_controller.go | 2 +- .../trafficrouting_controller_test.go | 5 +- pkg/util/client/cache.go | 77 + pkg/util/client/client.go | 90 -- pkg/util/client/delegating_client.go | 165 --- pkg/util/client/generic_client.go | 41 + pkg/util/client/no_deepcopy_lister.go | 2 +- pkg/util/client/registry.go | 40 + pkg/util/controller_finder_test.go | 12 +- pkg/util/grace/grace_expectations_test.go | 3 + pkg/util/rollout_utils.go | 17 +- .../rollout_create_update_handler.go | 17 - pkg/webhook/rollout/validating/webhooks.go | 2 +- pkg/webhook/server.go | 7 +- .../mutating/unified_update_handler_test.go | 2 +- pkg/webhook/workload/mutating/webhooks.go | 8 +- .../mutating/workload_update_handler_test.go | 8 +- test/kind-conf.yaml | 2 - 95 files changed, 2242 insertions(+), 1901 deletions(-) rename .github/workflows/{e2e-advanced-deployment-1.23.yaml => e2e-advanced-deployment-1.24.yaml} (89%) rename .github/workflows/{e2e-advanced-deployment-1.19.yaml => e2e-advanced-deployment-1.28.yaml} (88%) rename .github/workflows/{e2e-cloneset-1.19.yaml => e2e-cloneset-1.24.yaml} (87%) rename .github/workflows/{e2e-cloneset-1.23.yaml => e2e-cloneset-1.28.yaml} (87%) rename .github/workflows/{e2e-daemonset-1.19.yaml => e2e-daemonset-1.24.yaml} (87%) rename .github/workflows/{e2e-daemonset-1.23.yaml => e2e-daemonset-1.28.yaml} (87%) rename .github/workflows/{e2e-deployment-1.19.yaml => e2e-deployment-1.24.yaml} (87%) rename .github/workflows/{e2e-deployment-1.23.yaml => e2e-deployment-1.28.yaml} (87%) rename .github/workflows/{e2e-others-1.19.yaml => e2e-others-1.24.yaml} (87%) rename .github/workflows/{e2e-others-1.23.yaml => e2e-others-1.28.yaml} (87%) rename .github/workflows/{e2e-statefulset-1.19.yaml => e2e-statefulset-1.24.yaml} (87%) rename .github/workflows/{e2e-statefulset-1.23.yaml => e2e-statefulset-1.28.yaml} (87%) rename .github/workflows/{e2e-v1beta1-bluegreen-1.23.yaml => e2e-v1beta1-bluegreen-1.24.yaml} (91%) rename .github/workflows/{e2e-v1beta1-bluegreen-1.19.yaml => e2e-v1beta1-bluegreen-1.28.yaml} (90%) rename .github/workflows/{e2e-v1beta1-jump-1.23.yaml => e2e-v1beta1-jump-1.24.yaml} (87%) rename .github/workflows/{e2e-v1beta1-jump-1.19.yaml => e2e-v1beta1-jump-1.28.yaml} (87%) create mode 100644 pkg/client/clientset/versioned/clientset.go create mode 100644 pkg/client/clientset/versioned/doc.go create mode 100644 pkg/client/clientset/versioned/fake/clientset_generated.go create mode 100644 pkg/client/clientset/versioned/fake/doc.go create mode 100644 pkg/client/clientset/versioned/fake/register.go create mode 100644 pkg/client/clientset/versioned/scheme/doc.go create mode 100644 pkg/client/clientset/versioned/scheme/register.go create mode 100644 pkg/client/clientset/versioned/typed/rollouts/v1beta1/doc.go create mode 100644 pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/doc.go create mode 100644 pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/fake_rollouts_client.go create mode 100644 pkg/client/clientset/versioned/typed/rollouts/v1beta1/generated_expansion.go create mode 100644 pkg/client/clientset/versioned/typed/rollouts/v1beta1/rollouts_client.go create mode 100644 pkg/util/client/cache.go delete mode 100644 pkg/util/client/client.go delete mode 100644 pkg/util/client/delegating_client.go create mode 100644 pkg/util/client/generic_client.go create mode 100644 pkg/util/client/registry.go diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 355d6e9..e520fc0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,24 +10,24 @@ on: env: # Common versions - GO_VERSION: '1.19' - GOLANGCI_VERSION: 'v1.52' + GO_VERSION: '1.20' + GOLANGCI_VERSION: 'v2.1' jobs: golangci-lint: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Cache Go Dependencies - uses: actions/cache@v4 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -36,25 +36,27 @@ jobs: run: | make generate - name: Lint golang code - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0 with: version: ${{ env.GOLANGCI_VERSION }} args: --verbose + skip-pkg-cache: true + mod: readonly unit-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Fetch History run: git fetch --prune --unshallow - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Cache Go Dependencies - uses: actions/cache@v4 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -64,8 +66,11 @@ jobs: make test git status - name: Publish Unit Test Coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: + token: ${{ secrets.CODECOV_TOKEN }} flags: unittests file: cover.out - name: Check diff diff --git a/.github/workflows/e2e-advanced-deployment-1.23.yaml b/.github/workflows/e2e-advanced-deployment-1.24.yaml similarity index 89% rename from .github/workflows/e2e-advanced-deployment-1.23.yaml rename to .github/workflows/e2e-advanced-deployment-1.24.yaml index 0a851b0..6fe15f7 100644 --- a/.github/workflows/e2e-advanced-deployment-1.23.yaml +++ b/.github/workflows/e2e-advanced-deployment-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-Advanced-Deployment-1.23 +name: E2E-Advanced-Deployment-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' KIND_CLUSTER_NAME: 'ci-testing' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-advanced-deployment-1.26.yaml b/.github/workflows/e2e-advanced-deployment-1.26.yaml index 3ab4682..842e3bb 100644 --- a/.github/workflows/e2e-advanced-deployment-1.26.yaml +++ b/.github/workflows/e2e-advanced-deployment-1.26.yaml @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.18.0' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-advanced-deployment-1.19.yaml b/.github/workflows/e2e-advanced-deployment-1.28.yaml similarity index 88% rename from .github/workflows/e2e-advanced-deployment-1.19.yaml rename to .github/workflows/e2e-advanced-deployment-1.28.yaml index a99f710..3b06ffc 100644 --- a/.github/workflows/e2e-advanced-deployment-1.19.yaml +++ b/.github/workflows/e2e-advanced-deployment-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-Advanced-Deployment-1.19 +name: E2E-Advanced-Deployment-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" @@ -81,13 +86,13 @@ jobs: done set +e PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l) + kubectl get node -o yaml + kubectl get all -n kruise-rollout -o yaml set -e if [ "$PODS" -eq "1" ]; then echo "Wait for kruise-rollout ready successfully" else echo "Timeout to wait for kruise-rollout ready" - kubectl get pod -n kruise-rollout --no-headers | awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout - kubectl get pod -n kruise-rollout --no-headers | awk '{print $1}' | xargs kubectl logs -n kruise-rollout exit 1 fi - name: Run E2E Tests For Deployment Controller diff --git a/.github/workflows/e2e-cloneset-1.19.yaml b/.github/workflows/e2e-cloneset-1.24.yaml similarity index 87% rename from .github/workflows/e2e-cloneset-1.19.yaml rename to .github/workflows/e2e-cloneset-1.24.yaml index 6a61197..f7c66f5 100644 --- a/.github/workflows/e2e-cloneset-1.19.yaml +++ b/.github/workflows/e2e-cloneset-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-CloneSet-1.19 +name: E2E-CloneSet-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-cloneset-1.26.yaml b/.github/workflows/e2e-cloneset-1.26.yaml index 698c42f..684f024 100644 --- a/.github/workflows/e2e-cloneset-1.26.yaml +++ b/.github/workflows/e2e-cloneset-1.26.yaml @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-cloneset-1.23.yaml b/.github/workflows/e2e-cloneset-1.28.yaml similarity index 87% rename from .github/workflows/e2e-cloneset-1.23.yaml rename to .github/workflows/e2e-cloneset-1.28.yaml index da5dbad..d97dd22 100644 --- a/.github/workflows/e2e-cloneset-1.23.yaml +++ b/.github/workflows/e2e-cloneset-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-CloneSet-1.23 +name: E2E-CloneSet-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-custom.yaml b/.github/workflows/e2e-custom.yaml index 08fcb81..3200860 100644 --- a/.github/workflows/e2e-custom.yaml +++ b/.github/workflows/e2e-custom.yaml @@ -8,9 +8,12 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_VERSION: 'v0.18.0' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' @@ -18,17 +21,17 @@ env: jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: version: ${{ env.KIND_VERSION }} node_image: ${{ env.KIND_IMAGE }} diff --git a/.github/workflows/e2e-daemonset-1.19.yaml b/.github/workflows/e2e-daemonset-1.24.yaml similarity index 87% rename from .github/workflows/e2e-daemonset-1.19.yaml rename to .github/workflows/e2e-daemonset-1.24.yaml index af99653..844b9af 100644 --- a/.github/workflows/e2e-daemonset-1.19.yaml +++ b/.github/workflows/e2e-daemonset-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-DaemonSet-1.19 +name: E2E-DaemonSet-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-daemonset-1.26.yaml b/.github/workflows/e2e-daemonset-1.26.yaml index a465898..b9e14d4 100644 --- a/.github/workflows/e2e-daemonset-1.26.yaml +++ b/.github/workflows/e2e-daemonset-1.26.yaml @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-daemonset-1.23.yaml b/.github/workflows/e2e-daemonset-1.28.yaml similarity index 87% rename from .github/workflows/e2e-daemonset-1.23.yaml rename to .github/workflows/e2e-daemonset-1.28.yaml index b8ff0fb..2a829ee 100644 --- a/.github/workflows/e2e-daemonset-1.23.yaml +++ b/.github/workflows/e2e-daemonset-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-DaemonSet-1.23 +name: E2E-DaemonSet-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-deployment-1.19.yaml b/.github/workflows/e2e-deployment-1.24.yaml similarity index 87% rename from .github/workflows/e2e-deployment-1.19.yaml rename to .github/workflows/e2e-deployment-1.24.yaml index 5f23fd6..cebb461 100644 --- a/.github/workflows/e2e-deployment-1.19.yaml +++ b/.github/workflows/e2e-deployment-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-Deployment-1.19 +name: E2E-Deployment-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-deployment-1.26.yaml b/.github/workflows/e2e-deployment-1.26.yaml index 8485182..4369bd9 100644 --- a/.github/workflows/e2e-deployment-1.26.yaml +++ b/.github/workflows/e2e-deployment-1.26.yaml @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-deployment-1.23.yaml b/.github/workflows/e2e-deployment-1.28.yaml similarity index 87% rename from .github/workflows/e2e-deployment-1.23.yaml rename to .github/workflows/e2e-deployment-1.28.yaml index d496445..5a43405 100644 --- a/.github/workflows/e2e-deployment-1.23.yaml +++ b/.github/workflows/e2e-deployment-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-Deployment-1.23 +name: E2E-Deployment-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-gateway.yaml b/.github/workflows/e2e-gateway.yaml index ab69bf6..efbbc9f 100644 --- a/.github/workflows/e2e-gateway.yaml +++ b/.github/workflows/e2e-gateway.yaml @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-multi-network-provider.yaml b/.github/workflows/e2e-multi-network-provider.yaml index 2167ec9..99706b8 100644 --- a/.github/workflows/e2e-multi-network-provider.yaml +++ b/.github/workflows/e2e-multi-network-provider.yaml @@ -8,9 +8,12 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_VERSION: 'v0.18.0' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' @@ -18,17 +21,17 @@ env: jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: version: ${{ env.KIND_VERSION }} node_image: ${{ env.KIND_IMAGE }} diff --git a/.github/workflows/e2e-others-1.19.yaml b/.github/workflows/e2e-others-1.24.yaml similarity index 87% rename from .github/workflows/e2e-others-1.19.yaml rename to .github/workflows/e2e-others-1.24.yaml index 3fa2c22..ce70858 100644 --- a/.github/workflows/e2e-others-1.19.yaml +++ b/.github/workflows/e2e-others-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-Others-1.19 +name: E2E-Others-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-others-1.26.yaml b/.github/workflows/e2e-others-1.26.yaml index 1bc709c..958e369 100644 --- a/.github/workflows/e2e-others-1.26.yaml +++ b/.github/workflows/e2e-others-1.26.yaml @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-others-1.23.yaml b/.github/workflows/e2e-others-1.28.yaml similarity index 87% rename from .github/workflows/e2e-others-1.23.yaml rename to .github/workflows/e2e-others-1.28.yaml index 1e0db4a..d4b6f88 100644 --- a/.github/workflows/e2e-others-1.23.yaml +++ b/.github/workflows/e2e-others-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-Others-1.23 +name: E2E-Others-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-statefulset-1.19.yaml b/.github/workflows/e2e-statefulset-1.24.yaml similarity index 87% rename from .github/workflows/e2e-statefulset-1.19.yaml rename to .github/workflows/e2e-statefulset-1.24.yaml index f6d6cb0..5b7f428 100644 --- a/.github/workflows/e2e-statefulset-1.19.yaml +++ b/.github/workflows/e2e-statefulset-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-StatefulSet-1.19 +name: E2E-StatefulSet-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-statefulset-1.26.yaml b/.github/workflows/e2e-statefulset-1.26.yaml index fd65844..dc18c5e 100644 --- a/.github/workflows/e2e-statefulset-1.26.yaml +++ b/.github/workflows/e2e-statefulset-1.26.yaml @@ -1,4 +1,4 @@ -name: E2E-StatefulSet-1.26 +name: E2E-StatefulSet-1.28 on: push: @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-statefulset-1.23.yaml b/.github/workflows/e2e-statefulset-1.28.yaml similarity index 87% rename from .github/workflows/e2e-statefulset-1.23.yaml rename to .github/workflows/e2e-statefulset-1.28.yaml index 1ee0901..c18c1a2 100644 --- a/.github/workflows/e2e-statefulset-1.23.yaml +++ b/.github/workflows/e2e-statefulset-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-StatefulSet-1.23 +name: E2E-StatefulSet-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-v1beta1-bluegreen-1.23.yaml b/.github/workflows/e2e-v1beta1-bluegreen-1.24.yaml similarity index 91% rename from .github/workflows/e2e-v1beta1-bluegreen-1.23.yaml rename to .github/workflows/e2e-v1beta1-bluegreen-1.24.yaml index 8fa0753..5eedf5f 100644 --- a/.github/workflows/e2e-v1beta1-bluegreen-1.23.yaml +++ b/.github/workflows/e2e-v1beta1-bluegreen-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-V1Beta1-BlueGreen-1.23 +name: E2E-V1Beta1-BlueGreen-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-v1beta1-bluegreen-1.26.yaml b/.github/workflows/e2e-v1beta1-bluegreen-1.26.yaml index 3a45d0d..70e7149 100644 --- a/.github/workflows/e2e-v1beta1-bluegreen-1.26.yaml +++ b/.github/workflows/e2e-v1beta1-bluegreen-1.26.yaml @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-v1beta1-bluegreen-1.19.yaml b/.github/workflows/e2e-v1beta1-bluegreen-1.28.yaml similarity index 90% rename from .github/workflows/e2e-v1beta1-bluegreen-1.19.yaml rename to .github/workflows/e2e-v1beta1-bluegreen-1.28.yaml index e798c51..e05929d 100644 --- a/.github/workflows/e2e-v1beta1-bluegreen-1.19.yaml +++ b/.github/workflows/e2e-v1beta1-bluegreen-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-V1Beta1-BlueGreen-1.19 +name: E2E-V1Beta1-BlueGreen-1.28 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" @@ -95,7 +100,7 @@ jobs: export KUBECONFIG=/home/runner/.kube/config make ginkgo set +e - ./bin/ginkgo -timeout 60m -v --focus='bluegreen disable hpa test case - autoscaling/v1 for v1.19' test/e2e + ./bin/ginkgo -timeout 60m -v --focus='bluegreen disable hpa test case - autoscaling/v2 for v1.26' test/e2e retVal=$? kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}') @@ -143,4 +148,4 @@ jobs: kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout exit 1 fi - exit $retVal + exit $retVal \ No newline at end of file diff --git a/.github/workflows/e2e-v1beta1-jump-1.23.yaml b/.github/workflows/e2e-v1beta1-jump-1.24.yaml similarity index 87% rename from .github/workflows/e2e-v1beta1-jump-1.23.yaml rename to .github/workflows/e2e-v1beta1-jump-1.24.yaml index aef4de3..23d5942 100644 --- a/.github/workflows/e2e-v1beta1-jump-1.23.yaml +++ b/.github/workflows/e2e-v1beta1-jump-1.24.yaml @@ -1,4 +1,4 @@ -name: E2E-V1Beta1-JUMP-1.23 +name: E2E-V1Beta1-JUMP-1.24 on: push: @@ -8,30 +8,35 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.23.3' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.14.0' + KIND_IMAGE: 'kindest/node:v1.24.6' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-v1beta1-jump-1.26.yaml b/.github/workflows/e2e-v1beta1-jump-1.26.yaml index b3001af..4236035 100644 --- a/.github/workflows/e2e-v1beta1-jump-1.26.yaml +++ b/.github/workflows/e2e-v1beta1-jump-1.26.yaml @@ -8,30 +8,34 @@ on: pull_request: {} workflow_dispatch: {} +# Declare default permissions as read only. +permissions: read-all + env: # Common versions - GO_VERSION: '1.19' + GO_VERSION: '1.20' KIND_IMAGE: 'kindest/node:v1.26.3' KIND_CLUSTER_NAME: 'ci-testing' jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.6.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/e2e-v1beta1-jump-1.19.yaml b/.github/workflows/e2e-v1beta1-jump-1.28.yaml similarity index 87% rename from .github/workflows/e2e-v1beta1-jump-1.19.yaml rename to .github/workflows/e2e-v1beta1-jump-1.28.yaml index e282c9f..a287901 100644 --- a/.github/workflows/e2e-v1beta1-jump-1.19.yaml +++ b/.github/workflows/e2e-v1beta1-jump-1.28.yaml @@ -1,4 +1,4 @@ -name: E2E-V1Beta1-JUMP-1.19 +name: E2E-V1Beta1-JUMP-1.28 on: push: @@ -10,28 +10,32 @@ on: env: # Common versions - GO_VERSION: '1.19' - KIND_IMAGE: 'kindest/node:v1.19.16' + GO_VERSION: '1.20' + KIND_VERSION: 'v0.22.0' + KIND_IMAGE: 'kindest/node:v1.28.7' KIND_CLUSTER_NAME: 'ci-testing' -jobs: +# Declare default permissions as read only. +permissions: read-all +jobs: rollout: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} config: ./test/kind-conf.yaml + version: ${{ env.KIND_VERSION }} - name: Build image run: | export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 210c710..7569592 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -10,12 +10,15 @@ on: - master - release-* +# Declare default permissions as read only. +permissions: read-all + jobs: license_check: runs-on: ubuntu-latest name: Check for unapproved licenses steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.golangci.yml b/.golangci.yml index a4eac5e..c45a32c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,79 +1,73 @@ -# options for analysis running +version: "2" run: - # default concurrency is a available CPU number concurrency: 4 - - # timeout for analysis, e.g. 30s, 5m, default is 1m - deadline: 5m - - # exit code when at least one issue was found, default is 1 issues-exit-code: 1 - - # include test files or not, default is true tests: true - # list of build tags, all linters use it. Default is empty list. - #build-tags: - # - mytag - - # which dirs to skip: they won't be analyzed; - # can use regexp here: generated.*, regexp is applied on full path; - # default value is empty list, but next dirs are always skipped independently - # from this option's value: - # third_party$, testdata$, examples$, Godeps$, builtin$ - skip-dirs: - - vendor - - # which files to skip: they will be analyzed, but issues from them - # won't be reported. Default value is empty list, but there is - # no need to include all autogenerated files, we confidently recognize - # autogenerated files. If it's not please let us know. - skip-files: - # - ".*\\.my\\.go$" - # - lib/bad.go # output configuration options output: - # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" - format: colored-line-number - - # print lines of code with issue, default is true - print-issued-lines: true - - # print linter name in the end of issue text, default is true - print-linter-name: true - - -# all available settings of specific linters -linters-settings: - golint: - # minimal confidence for issues, default is 0.8 - min-confidence: 0.8 - gofmt: - # simplify code: gofmt with `-s` option, true by default - simplify: true - goimports: - # put imports beginning with prefix after 3rd-party packages; - # it's a comma-separated list of prefixes - #local-prefixes: github.com/openkruise/rollouts - misspell: - # Correct spellings using locale preferences for US or UK. - # Default is to use a neutral variety of English. - # Setting locale to US will correct the British spelling of 'colour' to 'color'. - locale: default - #ignore-words: - # - someword - + formats: + text: + path: stdout + colors: true linters: - fast: false - disable-all: true + default: none enable: - # TODO Enforce the below linters later - - gofmt - - goimports + - depguard + - govet - ineffassign - misspell -issues: - exclude: - # staticcheck - - 'SA1019: package github.com/golang/protobuf/proto is deprecated: Use the "google.golang.org/protobuf/proto" package instead' + - unconvert + - unused + settings: + misspell: + # Correct spellings using locale preferences for US or UK. + # Default is to use a neutral variety of English. + # Setting locale to US will correct the British spelling of 'colour' to 'color'. + locale: US + depguard: + rules: + forbid-pkg-errors: + deny: + - pkg: "github.com/pkg/errors" + desc: Should be replaced with standard lib errors or fmt.Errorf + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + rules: + - path: (.+)\.go$ + text: 'SA1019: package github.com/golang/protobuf/proto is deprecated: Use the "google.golang.org/protobuf/proto" package instead' + paths: + - third_party$ + - builtin$ + - examples$ + - apis + - pkg/client + - vendor + - test +formatters: + enable: + - gofmt + - goimports + settings: + gofmt: + simplify: true + goimports: + # put imports beginning with prefix after 3rd-party packages; + local-prefixes: + - github.com/openkruise/rollouts + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ + - apis + - pkg/client + - vendor + - test diff --git a/Dockerfile b/Dockerfile index 9476d50..0059a24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# Build the manager binary -FROM golang:1.19-alpine3.17 AS builder +FROM golang:1.20.14-alpine3.19 as builder WORKDIR /workspace diff --git a/Makefile b/Makefile index f7f488d..0b08f5a 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,24 @@ SHELL = /usr/bin/env bash -o pipefail all: build +## Location to install dependencies to +TESTBIN ?= $(shell pwd)/testbin +$(TESTBIN): + mkdir -p $(TESTBIN) + +# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. +# Run `setup-envtest list` to list available versions. +ENVTEST_K8S_VERSION ?= 1.28.0 + +ENVTEST ?= $(TESTBIN)/setup-envtest + +.PHONY: envtest +envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. +$(ENVTEST): $(TESTBIN) +ifeq (, $(shell ls $(TESTBIN)/setup-envtest 2>/dev/null)) + GOBIN=$(TESTBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b5302d649d5531e19168dd7ea0013736d +endif + ##@ General # The help target prints out all targets with their descriptions organized @@ -51,10 +69,10 @@ vet: ## Run go vet against code. go vet ./... ENVTEST_ASSETS_DIR=$(shell pwd)/testbin -test: manifests generate fmt vet ## Run tests. - mkdir -p ${ENVTEST_ASSETS_DIR} - test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.8.3/hack/setup-envtest.sh - source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./pkg/... -coverprofile cover.out +test: manifests generate fmt vet envtest ## Run tests. + echo $(ENVTEST) + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -race ./pkg/... -coverprofile raw-cover.out + grep -v "pkg/client" raw-cover.out > cover.out ##@ Build @@ -91,7 +109,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi CONTROLLER_GEN = $(shell pwd)/bin/controller-gen -CONTROLLER_GEN_VERSION = v0.11.0 +CONTROLLER_GEN_VERSION = v0.14.0 controller-gen: ## Download controller-gen locally if necessary. ifeq ("$(shell $(CONTROLLER_GEN) --version)", "Version: ${CONTROLLER_GEN_VERSION}") else diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index b999a5b..07856ed 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2023 The Kruise Authors. diff --git a/api/v1beta1/rollout_types.go b/api/v1beta1/rollout_types.go index d432910..7b27dcc 100644 --- a/api/v1beta1/rollout_types.go +++ b/api/v1beta1/rollout_types.go @@ -172,6 +172,7 @@ func (r *RolloutStrategy) DisableGenerateCanaryService() bool { // BlueGreenStrategy defines parameters for Blue Green Release type BlueGreenStrategy struct { // Steps define the order of phases to execute release in batches(20%, 40%, 60%, 80%, 100%) + // +kubebuilder:validation:MaxItems=50 // +optional Steps []CanaryStep `json:"steps,omitempty"` // TrafficRoutings support ingress, gateway api and custom network resource(e.g. istio, apisix) to enable more fine-grained traffic routing @@ -192,6 +193,7 @@ type BlueGreenStrategy struct { // CanaryStrategy defines parameters for a Replica Based Canary type CanaryStrategy struct { // Steps define the order of phases to execute release in batches(20%, 40%, 60%, 80%, 100%) + // +kubebuilder:validation:MaxItems=50 // +optional Steps []CanaryStep `json:"steps,omitempty"` // TrafficRoutings support ingress, gateway api and custom network resource(e.g. istio, apisix) to enable more fine-grained traffic routing @@ -263,6 +265,7 @@ type TrafficRoutingStrategy struct { // // It cannot support Traffic (weight-based routing) and Matches simultaneously, if both are configured. // In such cases, Matches takes precedence. + // +kubebuilder:validation:MaxItems=16 Matches []HttpRouteMatch `json:"matches,omitempty"` } diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index 0cbeea3..bd373be 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2023 The Kruise Authors. diff --git a/config/crd/bases/rollouts.kruise.io_batchreleases.yaml b/config/crd/bases/rollouts.kruise.io_batchreleases.yaml index 34d8a03..fef0369 100644 --- a/config/crd/bases/rollouts.kruise.io_batchreleases.yaml +++ b/config/crd/bases/rollouts.kruise.io_batchreleases.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: batchreleases.rollouts.kruise.io spec: group: rollouts.kruise.io @@ -36,14 +35,19 @@ spec: openAPIV3Schema: properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -55,20 +59,23 @@ spec: description: ReleasePlan is the details on how to rollout the resources properties: batchPartition: - description: All pods in the batches up to the batchPartition - (included) will have the target resource specification while - the rest still is the stable revision. This is designed for - the operators to manually rollout. Default is nil, which means - no partition and will release all batches. BatchPartition start - from 0. + description: |- + All pods in the batches up to the batchPartition (included) will have + the target resource specification while the rest still is the stable revision. + This is designed for the operators to manually rollout. + Default is nil, which means no partition and will release all batches. + BatchPartition start from 0. format: int32 type: integer batches: - description: 'Batches is the details on each batch of the ReleasePlan. - Users can specify their batch plan in this field, such as: batches: - - canaryReplicas: 1 # batches 0 - canaryReplicas: 2 # batches - 1 - canaryReplicas: 5 # batches 2 Not that these canaryReplicas - should be a non-decreasing sequence.' + description: |- + Batches is the details on each batch of the ReleasePlan. + Users can specify their batch plan in this field, such as: + batches: + - canaryReplicas: 1 # batches 0 + - canaryReplicas: 2 # batches 1 + - canaryReplicas: 5 # batches 2 + Not that these canaryReplicas should be a non-decreasing sequence. items: description: ReleaseBatch is used to describe how each batch release should be @@ -77,41 +84,44 @@ spec: anyOf: - type: integer - type: string - description: 'CanaryReplicas is the number of upgraded pods - that should have in this batch. it can be an absolute - number (ex: 5) or a percentage of workload replicas. batches[i].canaryReplicas - should less than or equal to batches[j].canaryReplicas - if i < j.' + description: |- + CanaryReplicas is the number of upgraded pods that should have in this batch. + it can be an absolute number (ex: 5) or a percentage of workload replicas. + batches[i].canaryReplicas should less than or equal to batches[j].canaryReplicas if i < j. x-kubernetes-int-or-string: true required: - canaryReplicas type: object type: array enableExtraWorkloadForCanary: - description: EnableExtraWorkloadForCanary indicates whether to - create extra workload for canary True corresponds to RollingStyle - "Canary". False corresponds to RollingStyle "Partiton". Ignored - in BlueGreen-style. This field is about to deprecate, use RollingStyle - instead. If both of them are set, controller will only consider - this filed when RollingStyle is empty + description: |- + EnableExtraWorkloadForCanary indicates whether to create extra workload for canary + True corresponds to RollingStyle "Canary". + False corresponds to RollingStyle "Partiton". + Ignored in BlueGreen-style. + This field is about to deprecate, use RollingStyle instead. + If both of them are set, controller will only consider this + filed when RollingStyle is empty type: boolean failureThreshold: anyOf: - type: integer - type: string - description: FailureThreshold indicates how many failed pods can - be tolerated in all upgraded pods. Only when FailureThreshold - are satisfied, Rollout can enter ready state. If FailureThreshold - is nil, Rollout will use the MaxUnavailable of workload as its - FailureThreshold. Defaults to nil. + description: |- + FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods. + Only when FailureThreshold are satisfied, Rollout can enter ready state. + If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its + FailureThreshold. + Defaults to nil. x-kubernetes-int-or-string: true finalizingPolicy: - description: FinalizingPolicy define the behavior of controller - when phase enter Finalizing Defaults to "Immediate" + description: |- + FinalizingPolicy define the behavior of controller when phase enter Finalizing + Defaults to "Immediate" type: string patchPodTemplateMetadata: - description: PatchPodTemplateMetadata indicates patch configuration(e.g. - labels, annotations) to the canary deployment podTemplateSpec.metadata + description: |- + PatchPodTemplateMetadata indicates patch configuration(e.g. labels, annotations) to the canary deployment podTemplateSpec.metadata only support for canary deployment properties: annotations: @@ -139,8 +149,9 @@ spec: we need to upgrade to. properties: workloadRef: - description: WorkloadRef contains enough information to let you - identify a workload for Rollout Batch release of the bypass + description: |- + WorkloadRef contains enough information to let you identify a workload for Rollout + Batch release of the bypass properties: apiVersion: description: API Version of the referent @@ -169,10 +180,10 @@ spec: description: CanaryStatus describes the state of the canary rollout. properties: batchReadyTime: - description: BatchReadyTime is the ready timestamp of the current - batch or the last batch. This field is updated once a batch - ready, and the batches[x].pausedSeconds relies on this field - to calculate the real-time duration. + description: |- + BatchReadyTime is the ready timestamp of the current batch or the last batch. + This field is updated once a batch ready, and the batches[x].pausedSeconds + relies on this field to calculate the real-time duration. format: date-time type: string batchState: @@ -202,9 +213,10 @@ spec: - currentBatch type: object collisionCount: - description: Count of hash collisions for creating canary Deployment. - The controller uses this field as a collision avoidance mechanism - when it needs to create the name for the newest canary Deployment. + description: |- + Count of hash collisions for creating canary Deployment. The controller uses this + field as a collision avoidance mechanism when it needs to create the name for the + newest canary Deployment. format: int32 type: integer conditions: @@ -244,10 +256,10 @@ spec: type: object type: array observedGeneration: - description: ObservedGeneration is the most recent generation observed - for this BatchRelease. It corresponds to this BatchRelease's generation, - which is updated on mutation by the API Server, and only if BatchRelease - Spec was changed, its generation will increase 1. + description: |- + ObservedGeneration is the most recent generation observed for this BatchRelease. + It corresponds to this BatchRelease's generation, which is updated on mutation + by the API Server, and only if BatchRelease Spec was changed, its generation will increase 1. format: int64 type: integer observedReleasePlanHash: @@ -255,21 +267,22 @@ spec: spec.releasePlan. type: string observedRolloutID: - description: ObservedRolloutID is the most recent rollout-id observed - for this BatchRelease. If RolloutID was changed, we will restart - to roll out from batch 0, to ensure the batch-id and rollout-id - labels of Pods are correct. + description: |- + ObservedRolloutID is the most recent rollout-id observed for this BatchRelease. + If RolloutID was changed, we will restart to roll out from batch 0, + to ensure the batch-id and rollout-id labels of Pods are correct. type: string observedWorkloadReplicas: - description: ObservedWorkloadReplicas is observed replicas of target - referenced workload. This field is designed to deal with scaling - event during rollout, if this field changed, it means that the workload - is scaling during rollout. + description: |- + ObservedWorkloadReplicas is observed replicas of target referenced workload. + This field is designed to deal with scaling event during rollout, if this field changed, + it means that the workload is scaling during rollout. format: int32 type: integer phase: - description: Phase is the release plan phase, which indicates the - current state of release plan state machine in BatchRelease controller. + description: |- + Phase is the release plan phase, which indicates the current state of release + plan state machine in BatchRelease controller. type: string stableRevision: description: StableRevision is the pod-template-hash of stable revision @@ -306,14 +319,19 @@ spec: openAPIV3Schema: properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -325,20 +343,23 @@ spec: description: ReleasePlan is the details on how to rollout the resources properties: batchPartition: - description: All pods in the batches up to the batchPartition - (included) will have the target resource specification while - the rest still is the stable revision. This is designed for - the operators to manually rollout. Default is nil, which means - no partition and will release all batches. BatchPartition start - from 0. + description: |- + All pods in the batches up to the batchPartition (included) will have + the target resource specification while the rest still is the stable revision. + This is designed for the operators to manually rollout. + Default is nil, which means no partition and will release all batches. + BatchPartition start from 0. format: int32 type: integer batches: - description: 'Batches is the details on each batch of the ReleasePlan. - Users can specify their batch plan in this field, such as: batches: - - canaryReplicas: 1 # batches 0 - canaryReplicas: 2 # batches - 1 - canaryReplicas: 5 # batches 2 Not that these canaryReplicas - should be a non-decreasing sequence.' + description: |- + Batches is the details on each batch of the ReleasePlan. + Users can specify their batch plan in this field, such as: + batches: + - canaryReplicas: 1 # batches 0 + - canaryReplicas: 2 # batches 1 + - canaryReplicas: 5 # batches 2 + Not that these canaryReplicas should be a non-decreasing sequence. items: description: ReleaseBatch is used to describe how each batch release should be @@ -347,41 +368,44 @@ spec: anyOf: - type: integer - type: string - description: 'CanaryReplicas is the number of upgraded pods - that should have in this batch. it can be an absolute - number (ex: 5) or a percentage of workload replicas. batches[i].canaryReplicas - should less than or equal to batches[j].canaryReplicas - if i < j.' + description: |- + CanaryReplicas is the number of upgraded pods that should have in this batch. + it can be an absolute number (ex: 5) or a percentage of workload replicas. + batches[i].canaryReplicas should less than or equal to batches[j].canaryReplicas if i < j. x-kubernetes-int-or-string: true required: - canaryReplicas type: object type: array enableExtraWorkloadForCanary: - description: EnableExtraWorkloadForCanary indicates whether to - create extra workload for canary True corresponds to RollingStyle - "Canary". False corresponds to RollingStyle "Partiton". Ignored - in BlueGreen-style. This field is about to deprecate, use RollingStyle - instead. If both of them are set, controller will only consider - this filed when RollingStyle is empty + description: |- + EnableExtraWorkloadForCanary indicates whether to create extra workload for canary + True corresponds to RollingStyle "Canary". + False corresponds to RollingStyle "Partiton". + Ignored in BlueGreen-style. + This field is about to deprecate, use RollingStyle instead. + If both of them are set, controller will only consider this + filed when RollingStyle is empty type: boolean failureThreshold: anyOf: - type: integer - type: string - description: FailureThreshold indicates how many failed pods can - be tolerated in all upgraded pods. Only when FailureThreshold - are satisfied, Rollout can enter ready state. If FailureThreshold - is nil, Rollout will use the MaxUnavailable of workload as its - FailureThreshold. Defaults to nil. + description: |- + FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods. + Only when FailureThreshold are satisfied, Rollout can enter ready state. + If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its + FailureThreshold. + Defaults to nil. x-kubernetes-int-or-string: true finalizingPolicy: - description: FinalizingPolicy define the behavior of controller - when phase enter Finalizing Defaults to "Immediate" + description: |- + FinalizingPolicy define the behavior of controller when phase enter Finalizing + Defaults to "Immediate" type: string patchPodTemplateMetadata: - description: PatchPodTemplateMetadata indicates patch configuration(e.g. - labels, annotations) to the canary deployment podTemplateSpec.metadata + description: |- + PatchPodTemplateMetadata indicates patch configuration(e.g. labels, annotations) to the canary deployment podTemplateSpec.metadata only support for canary deployment properties: annotations: @@ -405,8 +429,9 @@ spec: - enableExtraWorkloadForCanary type: object workloadRef: - description: WorkloadRef contains enough information to let you identify - a workload for Rollout Batch release of the bypass + description: |- + WorkloadRef contains enough information to let you identify a workload for Rollout + Batch release of the bypass properties: apiVersion: description: API Version of the referent @@ -433,10 +458,10 @@ spec: description: CanaryStatus describes the state of the canary rollout. properties: batchReadyTime: - description: BatchReadyTime is the ready timestamp of the current - batch or the last batch. This field is updated once a batch - ready, and the batches[x].pausedSeconds relies on this field - to calculate the real-time duration. + description: |- + BatchReadyTime is the ready timestamp of the current batch or the last batch. + This field is updated once a batch ready, and the batches[x].pausedSeconds + relies on this field to calculate the real-time duration. format: date-time type: string batchState: @@ -466,9 +491,10 @@ spec: - currentBatch type: object collisionCount: - description: Count of hash collisions for creating canary Deployment. - The controller uses this field as a collision avoidance mechanism - when it needs to create the name for the newest canary Deployment. + description: |- + Count of hash collisions for creating canary Deployment. The controller uses this + field as a collision avoidance mechanism when it needs to create the name for the + newest canary Deployment. format: int32 type: integer conditions: @@ -512,10 +538,10 @@ spec: current phase type: string observedGeneration: - description: ObservedGeneration is the most recent generation observed - for this BatchRelease. It corresponds to this BatchRelease's generation, - which is updated on mutation by the API Server, and only if BatchRelease - Spec was changed, its generation will increase 1. + description: |- + ObservedGeneration is the most recent generation observed for this BatchRelease. + It corresponds to this BatchRelease's generation, which is updated on mutation + by the API Server, and only if BatchRelease Spec was changed, its generation will increase 1. format: int64 type: integer observedReleasePlanHash: @@ -523,21 +549,22 @@ spec: spec.releasePlan. type: string observedRolloutID: - description: ObservedRolloutID is the most recent rollout-id observed - for this BatchRelease. If RolloutID was changed, we will restart - to roll out from batch 0, to ensure the batch-id and rollout-id - labels of Pods are correct. + description: |- + ObservedRolloutID is the most recent rollout-id observed for this BatchRelease. + If RolloutID was changed, we will restart to roll out from batch 0, + to ensure the batch-id and rollout-id labels of Pods are correct. type: string observedWorkloadReplicas: - description: ObservedWorkloadReplicas is observed replicas of target - referenced workload. This field is designed to deal with scaling - event during rollout, if this field changed, it means that the workload - is scaling during rollout. + description: |- + ObservedWorkloadReplicas is observed replicas of target referenced workload. + This field is designed to deal with scaling event during rollout, if this field changed, + it means that the workload is scaling during rollout. format: int32 type: integer phase: - description: Phase is the release plan phase, which indicates the - current state of release plan state machine in BatchRelease controller. + description: |- + Phase is the release plan phase, which indicates the current state of release + plan state machine in BatchRelease controller. type: string stableRevision: description: StableRevision is the pod-template-hash of stable revision diff --git a/config/crd/bases/rollouts.kruise.io_rollouthistories.yaml b/config/crd/bases/rollouts.kruise.io_rollouthistories.yaml index ae20457..7ca5ac4 100644 --- a/config/crd/bases/rollouts.kruise.io_rollouthistories.yaml +++ b/config/crd/bases/rollouts.kruise.io_rollouthistories.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: rollouthistories.rollouts.kruise.io spec: group: rollouts.kruise.io @@ -21,14 +20,19 @@ spec: description: RolloutHistory is the Schema for the rollouthistories API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -47,8 +51,9 @@ spec: name, workload name, ingress name, etc. type: string rolloutID: - description: RolloutID indicates the new rollout if there is no - new RolloutID this time, ignore it and not execute RolloutHistory + description: |- + RolloutID indicates the new rollout + if there is no new RolloutID this time, ignore it and not execute RolloutHistory type: string required: - name @@ -104,19 +109,22 @@ spec: as cloneset, deployment, advanced statefulset properties: apiVersion: - description: 'APIVersion defines the versioned schema of this - representation of an object. Servers should convert recognized - schemas to the latest internal value, and may reject unrecognized - values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string data: description: Data indecates the spec of object ref x-kubernetes-preserve-unknown-fields: true kind: - description: 'Kind is a string value representing the REST resource - this object represents. Servers may infer this from the endpoint - the client submits requests to. Cannot be updated. In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: description: Name indicates the name of object ref, such as rollout diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml index 31c371c..d0dd7d0 100644 --- a/config/crd/bases/rollouts.kruise.io_rollouts.yaml +++ b/config/crd/bases/rollouts.kruise.io_rollouts.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: rollouts.rollouts.kruise.io spec: group: rollouts.kruise.io @@ -41,14 +40,19 @@ spec: description: Rollout is the Schema for the rollouts API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -61,13 +65,15 @@ spec: changes of workload type: boolean objectRef: - description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster + description: |- + INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "make" to regenerate code after modifying this file - ObjectRef indicates workload' + ObjectRef indicates workload properties: workloadRef: - description: WorkloadRef contains enough information to let you - identify a workload for Rollout Batch release of the bypass + description: |- + WorkloadRef contains enough information to let you identify a workload for Rollout + Batch release of the bypass properties: apiVersion: description: API Version of the referent @@ -85,11 +91,11 @@ spec: type: object type: object rolloutID: - description: DeprecatedRolloutID is the deprecated field. It is recommended - that configure RolloutId in workload.annotations[rollouts.kruise.io/rollout-id]. + description: |- + DeprecatedRolloutID is the deprecated field. + It is recommended that configure RolloutId in workload.annotations[rollouts.kruise.io/rollout-id]. RolloutID should be changed before each workload revision publication. - It is to distinguish consecutive multiple workload publications - and rollout progress. + It is to distinguish consecutive multiple workload publications and rollout progress. type: string strategy: description: rollout strategy @@ -106,15 +112,16 @@ spec: anyOf: - type: integer - type: string - description: FailureThreshold indicates how many failed pods - can be tolerated in all upgraded pods. Only when FailureThreshold - are satisfied, Rollout can enter ready state. If FailureThreshold - is nil, Rollout will use the MaxUnavailable of workload - as its FailureThreshold. Defaults to nil. + description: |- + FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods. + Only when FailureThreshold are satisfied, Rollout can enter ready state. + If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its + FailureThreshold. + Defaults to nil. x-kubernetes-int-or-string: true patchPodTemplateMetadata: - description: PatchPodTemplateMetadata indicates patch configuration(e.g. - labels, annotations) to the canary deployment podTemplateSpec.metadata + description: |- + PatchPodTemplateMetadata indicates patch configuration(e.g. labels, annotations) to the canary deployment podTemplateSpec.metadata only support for canary deployment properties: annotations: @@ -135,59 +142,61 @@ spec: description: CanaryStep defines a step of a canary workload. properties: matches: - description: Matches define conditions used for matching - the incoming HTTP requests to canary service. Each - match is independent, i.e. this rule will be matched - if **any** one of the matches is satisfied. If Gateway - API, current only support one match. And cannot support - both weight and matches, if both are configured, then - matches takes precedence. + description: |- + Matches define conditions used for matching the incoming HTTP requests to canary service. + Each match is independent, i.e. this rule will be matched if **any** one of the matches is satisfied. + If Gateway API, current only support one match. + And cannot support both weight and matches, if both are configured, then matches takes precedence. items: properties: headers: - description: Headers specifies HTTP request header - matchers. Multiple match values are ANDed together, - meaning, a request must match all the specified - headers to select the route. + description: |- + Headers specifies HTTP request header matchers. Multiple match values are + ANDed together, meaning, a request must match all the specified headers + to select the route. items: - description: HTTPHeaderMatch describes how to - select a HTTP route by matching HTTP request + description: |- + HTTPHeaderMatch describes how to select a HTTP route by matching HTTP request headers. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, only the first entry with - an equivalent name MUST be considered - for a match. Subsequent entries with an - equivalent header name MUST be ignored. - Due to the case-insensitivity of header - names, \"foo\" and \"Foo\" are considered - equivalent. \n When a header is repeated - in an HTTP request, it is implementation-specific - behavior as to how this is represented. - Generally, proxies should follow the guidance - from the RFC: https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 - regarding processing a repeated header, - with special handling for \"Set-Cookie\"." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, only the first + entry with an equivalent name MUST be considered for a match. Subsequent + entries with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. + + + When a header is repeated in an HTTP request, it is + implementation-specific behavior as to how this is represented. + Generally, proxies should follow the guidance from the RFC: + https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 regarding + processing a repeated header, with special handling for "Set-Cookie". maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ type: string type: default: Exact - description: "Type specifies how to match - against the value of the header. \n Support: - Core (Exact) \n Support: Implementation-specific - (RegularExpression) \n Since RegularExpression - HeaderMatchType has implementation-specific - conformance, implementations can support - POSIX, PCRE or any other dialects of regular - expressions. Please read the implementation's - documentation to determine the supported - dialect." + description: |- + Type specifies how to match against the value of the header. + + + Support: Core (Exact) + + + Support: Implementation-specific (RegularExpression) + + + Since RegularExpression HeaderMatchType has implementation-specific + conformance, implementations can support POSIX, PCRE or any other dialects + of regular expressions. Please read the implementation's documentation to + determine the supported dialect. enum: - Exact - RegularExpression @@ -220,39 +229,67 @@ spec: anyOf: - type: integer - type: string - description: 'Replicas is the number of expected canary - pods in this batch it can be an absolute number (ex: - 5) or a percentage of total pods.' + description: |- + Replicas is the number of expected canary pods in this batch + it can be an absolute number (ex: 5) or a percentage of total pods. x-kubernetes-int-or-string: true requestHeaderModifier: - description: "Set overwrites the request with the given - header (name, value) before the action. \n Input: - GET /foo HTTP/1.1 my-header: foo \n requestHeaderModifier: - set: - name: \"my-header\" value: \"bar\" \n Output: - GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + requestHeaderModifier: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar properties: add: - description: "Add adds the given header(s) (name, - value) to the request before the action. It appends - to any existing values associated with the header - name. \n Input: GET /foo HTTP/1.1 my-header: foo - \n Config: add: - name: \"my-header\" value: \"bar,baz\" - \n Output: GET /foo HTTP/1.1 my-header: foo,bar,baz" + description: |- + Add adds the given header(s) (name, value) to the request + before the action. It appends to any existing values associated + with the header name. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + add: + - name: "my-header" + value: "bar,baz" + + + Output: + GET /foo HTTP/1.1 + my-header: foo,bar,baz items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, the first entry with an equivalent - name MUST be considered for a match. Subsequent - entries with an equivalent header name MUST - be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are - considered equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -273,39 +310,67 @@ spec: - name x-kubernetes-list-type: map remove: - description: "Remove the given header(s) from the - HTTP request before the action. The value of Remove - is a list of HTTP header names. Note that the - header names are case-insensitive (see https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). - \n Input: GET /foo HTTP/1.1 my-header1: foo my-header2: - bar my-header3: baz \n Config: remove: [\"my-header1\", - \"my-header3\"] \n Output: GET /foo HTTP/1.1 my-header2: - bar" + description: |- + Remove the given header(s) from the HTTP request before the action. The + value of Remove is a list of HTTP header names. Note that the header + names are case-insensitive (see + https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). + + + Input: + GET /foo HTTP/1.1 + my-header1: foo + my-header2: bar + my-header3: baz + + + Config: + remove: ["my-header1", "my-header3"] + + + Output: + GET /foo HTTP/1.1 + my-header2: bar items: type: string maxItems: 16 type: array + x-kubernetes-list-type: set set: - description: "Set overwrites the request with the - given header (name, value) before the action. - \n Input: GET /foo HTTP/1.1 my-header: foo \n - Config: set: - name: \"my-header\" value: \"bar\" - \n Output: GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, the first entry with an equivalent - name MUST be considered for a match. Subsequent - entries with an equivalent header name MUST - be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are - considered equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -334,8 +399,8 @@ spec: type: object type: array trafficRoutings: - description: TrafficRoutings hosts all the supported service - meshes supported to enable more fine-grained traffic routing + description: |- + TrafficRoutings hosts all the supported service meshes supported to enable more fine-grained traffic routing and current only support one TrafficRouting items: description: TrafficRoutingRef hosts all the different configuration @@ -360,9 +425,9 @@ spec: type: object type: array gateway: - description: Gateway holds Gateway specific configuration - to route traffic Gateway configuration only supports - >= v0.4.0 (v1alpha2). + description: |- + Gateway holds Gateway specific configuration to route traffic + Gateway configuration only supports >= v0.4.0 (v1alpha2). properties: httpRouteName: description: HTTPRouteName refers to the name of @@ -382,9 +447,9 @@ spec: to route traffic, e.g. Nginx, Alb. properties: classType: - description: ClassType refers to the type of `Ingress`. - current support nginx, aliyun-alb. default is - nginx. + description: |- + ClassType refers to the type of `Ingress`. + current support nginx, aliyun-alb. default is nginx. type: string name: description: Name refers to the name of an `Ingress` @@ -404,8 +469,9 @@ spec: type: array type: object paused: - description: Paused indicates that the Rollout is paused. Default - value is false + description: |- + Paused indicates that the Rollout is paused. + Default value is false type: boolean type: object required: @@ -428,10 +494,9 @@ spec: format: int32 type: integer canaryRevision: - description: CanaryRevision is calculated by rollout based on - podTemplateHash, and the internal logic flow uses It may be - different from rs podTemplateHash in different k8s versions, - so it cannot be used as service selector label + description: |- + CanaryRevision is calculated by rollout based on podTemplateHash, and the internal logic flow uses + It may be different from rs podTemplateHash in different k8s versions, so it cannot be used as service selector label type: string currentStepIndex: format: int32 @@ -446,18 +511,18 @@ spec: message: type: string nextStepIndex: - description: NextStepIndex defines the next step of the rollout - is on. In normal case, NextStepIndex is equal to CurrentStepIndex - + 1 If the current step is the last step, NextStepIndex is equal - to -1 Before the release, NextStepIndex is also equal to -1 - 0 is not used and won't appear in any case It is allowed to - patch NextStepIndex by design, e.g. if CurrentStepIndex is 2, - user can patch NextStepIndex to 3 (if exists) to achieve batch - jump, or patch NextStepIndex to 1 to implement a re-execution - of step 1 Patching it with a non-positive value is meaningless, - which will be corrected in the next reconciliation achieve batch - jump, or patch NextStepIndex to 1 to implement a re-execution - of step 1 + description: |- + NextStepIndex defines the next step of the rollout is on. + In normal case, NextStepIndex is equal to CurrentStepIndex + 1 + If the current step is the last step, NextStepIndex is equal to -1 + Before the release, NextStepIndex is also equal to -1 + 0 is not used and won't appear in any case + It is allowed to patch NextStepIndex by design, + e.g. if CurrentStepIndex is 2, user can patch NextStepIndex to 3 (if exists) to + achieve batch jump, or patch NextStepIndex to 1 to implement a re-execution of step 1 + Patching it with a non-positive value is meaningless, which will be corrected + in the next reconciliation + achieve batch jump, or patch NextStepIndex to 1 to implement a re-execution of step 1 format: int32 type: integer observedRolloutID: @@ -566,14 +631,19 @@ spec: description: Rollout is the Schema for the rollouts API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -600,11 +670,12 @@ spec: anyOf: - type: integer - type: string - description: FailureThreshold indicates how many failed pods - can be tolerated in all upgraded pods. Only when FailureThreshold - are satisfied, Rollout can enter ready state. If FailureThreshold - is nil, Rollout will use the MaxUnavailable of workload - as its FailureThreshold. Defaults to nil. + description: |- + FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods. + Only when FailureThreshold are satisfied, Rollout can enter ready state. + If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its + FailureThreshold. + Defaults to nil. x-kubernetes-int-or-string: true steps: description: Steps define the order of phases to execute release @@ -613,59 +684,63 @@ spec: description: CanaryStep defines a step of a canary workload. properties: matches: - description: "Matches define conditions used for matching - incoming HTTP requests to the canary service. Each - match is independent, i.e. this rule will be matched - as long as **any** one of the matches is satisfied. - \n It cannot support Traffic (weight-based routing) - and Matches simultaneously, if both are configured. - In such cases, Matches takes precedence." + description: |- + Matches define conditions used for matching incoming HTTP requests to the canary service. + Each match is independent, i.e. this rule will be matched as long as **any** one of the matches is satisfied. + + + It cannot support Traffic (weight-based routing) and Matches simultaneously, if both are configured. + In such cases, Matches takes precedence. items: properties: headers: - description: Headers specifies HTTP request header - matchers. Multiple match values are ANDed together, - meaning, a request must match all the specified - headers to select the route. + description: |- + Headers specifies HTTP request header matchers. Multiple match values are + ANDed together, meaning, a request must match all the specified headers + to select the route. items: - description: HTTPHeaderMatch describes how to - select a HTTP route by matching HTTP request + description: |- + HTTPHeaderMatch describes how to select a HTTP route by matching HTTP request headers. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, only the first entry with - an equivalent name MUST be considered - for a match. Subsequent entries with an - equivalent header name MUST be ignored. - Due to the case-insensitivity of header - names, \"foo\" and \"Foo\" are considered - equivalent. \n When a header is repeated - in an HTTP request, it is implementation-specific - behavior as to how this is represented. - Generally, proxies should follow the guidance - from the RFC: https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 - regarding processing a repeated header, - with special handling for \"Set-Cookie\"." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, only the first + entry with an equivalent name MUST be considered for a match. Subsequent + entries with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. + + + When a header is repeated in an HTTP request, it is + implementation-specific behavior as to how this is represented. + Generally, proxies should follow the guidance from the RFC: + https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 regarding + processing a repeated header, with special handling for "Set-Cookie". maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ type: string type: default: Exact - description: "Type specifies how to match - against the value of the header. \n Support: - Core (Exact) \n Support: Implementation-specific - (RegularExpression) \n Since RegularExpression - HeaderMatchType has implementation-specific - conformance, implementations can support - POSIX, PCRE or any other dialects of regular - expressions. Please read the implementation's - documentation to determine the supported - dialect." + description: |- + Type specifies how to match against the value of the header. + + + Support: Core (Exact) + + + Support: Implementation-specific (RegularExpression) + + + Since RegularExpression HeaderMatchType has implementation-specific + conformance, implementations can support POSIX, PCRE or any other dialects + of regular expressions. Please read the implementation's documentation to + determine the supported dialect. enum: - Exact - RegularExpression @@ -686,18 +761,22 @@ spec: - name x-kubernetes-list-type: map path: - description: 'Path specifies a HTTP request path - matcher. Supported list: - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest - - GatewayAPI: If path is defined, the whole - HttpRouteMatch will be used as a standalone - matcher' + description: |- + Path specifies a HTTP request path matcher. + Supported list: + - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest + - GatewayAPI: If path is defined, the whole HttpRouteMatch will be used as a standalone matcher properties: type: default: PathPrefix - description: "Type specifies how to match - against the path Value. \n Support: Core - (Exact, PathPrefix) \n Support: Implementation-specific - (RegularExpression)" + description: |- + Type specifies how to match against the path Value. + + + Support: Core (Exact, PathPrefix) + + + Support: Implementation-specific (RegularExpression) enum: - Exact - PathPrefix @@ -710,57 +789,111 @@ spec: maxLength: 1024 type: string type: object + x-kubernetes-validations: + - message: value must be an absolute path and + start with '/' when type one of ['Exact', + 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? self.value.startsWith(''/'') : true' + - message: must not contain '//' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''//'') : true' + - message: must not contain '/./' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''/./'') : true' + - message: must not contain '/../' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''/../'') : true' + - message: must not contain '%2f' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''%2f'') : true' + - message: must not contain '%2F' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''%2F'') : true' + - message: must not contain '#' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''#'') : true' + - message: must not end with '/..' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.endsWith(''/..'') : true' + - message: must not end with '/.' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.endsWith(''/.'') : true' + - message: type must be one of ['Exact', 'PathPrefix', + 'RegularExpression'] + rule: self.type in ['Exact','PathPrefix'] || + self.type == 'RegularExpression' + - message: must only contain valid characters + (matching ^(?:[-A-Za-z0-9/._~!$&'()*+,;=:@]|[%][0-9a-fA-F]{2})+$) + for types ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? self.value.matches(r"""^(?:[-A-Za-z0-9/._~!$&''()*+,;=:@]|[%][0-9a-fA-F]{2})+$""") + : true' queryParams: - description: 'QueryParams specifies HTTP query - parameter matchers. Multiple match values are - ANDed together, meaning, a request must match - all the specified query parameters to select - the route. Supported list: - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest + description: |- + QueryParams specifies HTTP query parameter matchers. Multiple match + values are ANDed together, meaning, a request must match all the + specified query parameters to select the route. + Supported list: + - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest - MSE Ingress: https://help.aliyun.com/zh/ack/ack-managed-and-ack-dedicated/user-guide/annotations-supported-by-mse-ingress-gateways-1 - Header/Cookie > QueryParams - Gateway API' + Header/Cookie > QueryParams + - Gateway API items: - description: HTTPQueryParamMatch describes how - to select a HTTP route by matching HTTP query - parameters. + description: |- + HTTPQueryParamMatch describes how to select a HTTP route by matching HTTP + query parameters. properties: name: - description: "Name is the name of the HTTP - query param to be matched. This must be - an exact string match. (See https://tools.ietf.org/html/rfc7230#section-2.7.3). - \n If multiple entries specify equivalent - query param names, only the first entry - with an equivalent name MUST be considered - for a match. Subsequent entries with an - equivalent query param name MUST be ignored. - \n If a query param is repeated in an - HTTP request, the behavior is purposely - left undefined, since different data planes - have different capabilities. However, - it is *recommended* that implementations - should match against the first value of - the param if the data plane supports it, - as this behavior is expected in other - load balancing contexts outside of the - Gateway API. \n Users SHOULD NOT route - traffic based on repeated query params - to guard themselves against potential - differences in the implementations." + description: |- + Name is the name of the HTTP query param to be matched. This must be an + exact string match. (See + https://tools.ietf.org/html/rfc7230#section-2.7.3). + + + If multiple entries specify equivalent query param names, only the first + entry with an equivalent name MUST be considered for a match. Subsequent + entries with an equivalent query param name MUST be ignored. + + + If a query param is repeated in an HTTP request, the behavior is + purposely left undefined, since different data planes have different + capabilities. However, it is *recommended* that implementations should + match against the first value of the param if the data plane supports it, + as this behavior is expected in other load balancing contexts outside of + the Gateway API. + + + Users SHOULD NOT route traffic based on repeated query params to guard + themselves against potential differences in the implementations. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ type: string type: default: Exact - description: "Type specifies how to match - against the value of the query parameter. - \n Support: Extended (Exact) \n Support: - Implementation-specific (RegularExpression) - \n Since RegularExpression QueryParamMatchType - has Implementation-specific conformance, - implementations can support POSIX, PCRE - or any other dialects of regular expressions. - Please read the implementation's documentation - to determine the supported dialect." + description: |- + Type specifies how to match against the value of the query parameter. + + + Support: Extended (Exact) + + + Support: Implementation-specific (RegularExpression) + + + Since RegularExpression QueryParamMatchType has Implementation-specific + conformance, implementations can support POSIX, PCRE or any other + dialects of regular expressions. Please read the implementation's + documentation to determine the supported dialect. enum: - Exact - RegularExpression @@ -781,6 +914,7 @@ spec: - name x-kubernetes-list-type: map type: object + maxItems: 16 type: array pause: description: Pause defines a pause stage for a rollout, @@ -796,39 +930,67 @@ spec: anyOf: - type: integer - type: string - description: 'Replicas is the number of expected canary - pods in this batch it can be an absolute number (ex: - 5) or a percentage of total pods.' + description: |- + Replicas is the number of expected canary pods in this batch + it can be an absolute number (ex: 5) or a percentage of total pods. x-kubernetes-int-or-string: true requestHeaderModifier: - description: "Set overwrites the request with the given - header (name, value) before the action. \n Input: - GET /foo HTTP/1.1 my-header: foo \n requestHeaderModifier: - set: - name: \"my-header\" value: \"bar\" \n Output: - GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + requestHeaderModifier: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar properties: add: - description: "Add adds the given header(s) (name, - value) to the request before the action. It appends - to any existing values associated with the header - name. \n Input: GET /foo HTTP/1.1 my-header: foo - \n Config: add: - name: \"my-header\" value: \"bar,baz\" - \n Output: GET /foo HTTP/1.1 my-header: foo,bar,baz" + description: |- + Add adds the given header(s) (name, value) to the request + before the action. It appends to any existing values associated + with the header name. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + add: + - name: "my-header" + value: "bar,baz" + + + Output: + GET /foo HTTP/1.1 + my-header: foo,bar,baz items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, the first entry with an equivalent - name MUST be considered for a match. Subsequent - entries with an equivalent header name MUST - be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are - considered equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -849,39 +1011,67 @@ spec: - name x-kubernetes-list-type: map remove: - description: "Remove the given header(s) from the - HTTP request before the action. The value of Remove - is a list of HTTP header names. Note that the - header names are case-insensitive (see https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). - \n Input: GET /foo HTTP/1.1 my-header1: foo my-header2: - bar my-header3: baz \n Config: remove: [\"my-header1\", - \"my-header3\"] \n Output: GET /foo HTTP/1.1 my-header2: - bar" + description: |- + Remove the given header(s) from the HTTP request before the action. The + value of Remove is a list of HTTP header names. Note that the header + names are case-insensitive (see + https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). + + + Input: + GET /foo HTTP/1.1 + my-header1: foo + my-header2: bar + my-header3: baz + + + Config: + remove: ["my-header1", "my-header3"] + + + Output: + GET /foo HTTP/1.1 + my-header2: bar items: type: string maxItems: 16 type: array + x-kubernetes-list-type: set set: - description: "Set overwrites the request with the - given header (name, value) before the action. - \n Input: GET /foo HTTP/1.1 my-header: foo \n - Config: set: - name: \"my-header\" value: \"bar\" - \n Output: GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, the first entry with an equivalent - name MUST be considered for a match. Subsequent - entries with an equivalent header name MUST - be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are - considered equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -903,20 +1093,20 @@ spec: x-kubernetes-list-type: map type: object traffic: - description: Traffic indicate how many percentage of - traffic the canary pods should receive Value is of - string type and is a percentage, e.g. 5%. + description: |- + Traffic indicate how many percentage of traffic the canary pods should receive + Value is of string type and is a percentage, e.g. 5%. type: string type: object + maxItems: 50 type: array trafficRoutingRef: description: TrafficRoutingRef is TrafficRouting's Name type: string trafficRoutings: - description: TrafficRoutings support ingress, gateway api - and custom network resource(e.g. istio, apisix) to enable - more fine-grained traffic routing and current only support - one TrafficRouting + description: |- + TrafficRoutings support ingress, gateway api and custom network resource(e.g. istio, apisix) to enable more fine-grained traffic routing + and current only support one TrafficRouting items: description: TrafficRoutingRef hosts all the different configuration for supported service meshes to enable more fine-grained @@ -945,9 +1135,9 @@ spec: type: object type: array gateway: - description: Gateway holds Gateway specific configuration - to route traffic Gateway configuration only supports - >= v0.4.0 (v1alpha2). + description: |- + Gateway holds Gateway specific configuration to route traffic + Gateway configuration only supports >= v0.4.0 (v1alpha2). properties: httpRouteName: description: HTTPRouteName refers to the name of @@ -967,9 +1157,9 @@ spec: to route traffic, e.g. Nginx, Alb. properties: classType: - description: ClassType refers to the type of `Ingress`. - current support nginx, aliyun-alb. default is - nginx. + description: |- + ClassType refers to the type of `Ingress`. + current support nginx, aliyun-alb. default is nginx. type: string name: description: Name refers to the name of an `Ingress` @@ -997,25 +1187,25 @@ spec: is true type: boolean enableExtraWorkloadForCanary: - description: 'If true, then it will create new deployment - for canary, such as: workload-demo-canary. When user verifies - that the canary version is ready, we will remove the canary - deployment and release the deployment workload-demo in full. - Current only support k8s native deployment' + description: |- + If true, then it will create new deployment for canary, such as: workload-demo-canary. + When user verifies that the canary version is ready, we will remove the canary deployment and release the deployment workload-demo in full. + Current only support k8s native deployment type: boolean failureThreshold: anyOf: - type: integer - type: string - description: FailureThreshold indicates how many failed pods - can be tolerated in all upgraded pods. Only when FailureThreshold - are satisfied, Rollout can enter ready state. If FailureThreshold - is nil, Rollout will use the MaxUnavailable of workload - as its FailureThreshold. Defaults to nil. + description: |- + FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods. + Only when FailureThreshold are satisfied, Rollout can enter ready state. + If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its + FailureThreshold. + Defaults to nil. x-kubernetes-int-or-string: true patchPodTemplateMetadata: - description: PatchPodTemplateMetadata indicates patch configuration(e.g. - labels, annotations) to the canary deployment podTemplateSpec.metadata + description: |- + PatchPodTemplateMetadata indicates patch configuration(e.g. labels, annotations) to the canary deployment podTemplateSpec.metadata only support for canary deployment properties: annotations: @@ -1036,59 +1226,63 @@ spec: description: CanaryStep defines a step of a canary workload. properties: matches: - description: "Matches define conditions used for matching - incoming HTTP requests to the canary service. Each - match is independent, i.e. this rule will be matched - as long as **any** one of the matches is satisfied. - \n It cannot support Traffic (weight-based routing) - and Matches simultaneously, if both are configured. - In such cases, Matches takes precedence." + description: |- + Matches define conditions used for matching incoming HTTP requests to the canary service. + Each match is independent, i.e. this rule will be matched as long as **any** one of the matches is satisfied. + + + It cannot support Traffic (weight-based routing) and Matches simultaneously, if both are configured. + In such cases, Matches takes precedence. items: properties: headers: - description: Headers specifies HTTP request header - matchers. Multiple match values are ANDed together, - meaning, a request must match all the specified - headers to select the route. + description: |- + Headers specifies HTTP request header matchers. Multiple match values are + ANDed together, meaning, a request must match all the specified headers + to select the route. items: - description: HTTPHeaderMatch describes how to - select a HTTP route by matching HTTP request + description: |- + HTTPHeaderMatch describes how to select a HTTP route by matching HTTP request headers. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, only the first entry with - an equivalent name MUST be considered - for a match. Subsequent entries with an - equivalent header name MUST be ignored. - Due to the case-insensitivity of header - names, \"foo\" and \"Foo\" are considered - equivalent. \n When a header is repeated - in an HTTP request, it is implementation-specific - behavior as to how this is represented. - Generally, proxies should follow the guidance - from the RFC: https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 - regarding processing a repeated header, - with special handling for \"Set-Cookie\"." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, only the first + entry with an equivalent name MUST be considered for a match. Subsequent + entries with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. + + + When a header is repeated in an HTTP request, it is + implementation-specific behavior as to how this is represented. + Generally, proxies should follow the guidance from the RFC: + https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 regarding + processing a repeated header, with special handling for "Set-Cookie". maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ type: string type: default: Exact - description: "Type specifies how to match - against the value of the header. \n Support: - Core (Exact) \n Support: Implementation-specific - (RegularExpression) \n Since RegularExpression - HeaderMatchType has implementation-specific - conformance, implementations can support - POSIX, PCRE or any other dialects of regular - expressions. Please read the implementation's - documentation to determine the supported - dialect." + description: |- + Type specifies how to match against the value of the header. + + + Support: Core (Exact) + + + Support: Implementation-specific (RegularExpression) + + + Since RegularExpression HeaderMatchType has implementation-specific + conformance, implementations can support POSIX, PCRE or any other dialects + of regular expressions. Please read the implementation's documentation to + determine the supported dialect. enum: - Exact - RegularExpression @@ -1109,18 +1303,22 @@ spec: - name x-kubernetes-list-type: map path: - description: 'Path specifies a HTTP request path - matcher. Supported list: - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest - - GatewayAPI: If path is defined, the whole - HttpRouteMatch will be used as a standalone - matcher' + description: |- + Path specifies a HTTP request path matcher. + Supported list: + - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest + - GatewayAPI: If path is defined, the whole HttpRouteMatch will be used as a standalone matcher properties: type: default: PathPrefix - description: "Type specifies how to match - against the path Value. \n Support: Core - (Exact, PathPrefix) \n Support: Implementation-specific - (RegularExpression)" + description: |- + Type specifies how to match against the path Value. + + + Support: Core (Exact, PathPrefix) + + + Support: Implementation-specific (RegularExpression) enum: - Exact - PathPrefix @@ -1133,57 +1331,111 @@ spec: maxLength: 1024 type: string type: object + x-kubernetes-validations: + - message: value must be an absolute path and + start with '/' when type one of ['Exact', + 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? self.value.startsWith(''/'') : true' + - message: must not contain '//' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''//'') : true' + - message: must not contain '/./' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''/./'') : true' + - message: must not contain '/../' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''/../'') : true' + - message: must not contain '%2f' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''%2f'') : true' + - message: must not contain '%2F' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''%2F'') : true' + - message: must not contain '#' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.contains(''#'') : true' + - message: must not end with '/..' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.endsWith(''/..'') : true' + - message: must not end with '/.' when type one + of ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? !self.value.endsWith(''/.'') : true' + - message: type must be one of ['Exact', 'PathPrefix', + 'RegularExpression'] + rule: self.type in ['Exact','PathPrefix'] || + self.type == 'RegularExpression' + - message: must only contain valid characters + (matching ^(?:[-A-Za-z0-9/._~!$&'()*+,;=:@]|[%][0-9a-fA-F]{2})+$) + for types ['Exact', 'PathPrefix'] + rule: '(self.type in [''Exact'',''PathPrefix'']) + ? self.value.matches(r"""^(?:[-A-Za-z0-9/._~!$&''()*+,;=:@]|[%][0-9a-fA-F]{2})+$""") + : true' queryParams: - description: 'QueryParams specifies HTTP query - parameter matchers. Multiple match values are - ANDed together, meaning, a request must match - all the specified query parameters to select - the route. Supported list: - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest + description: |- + QueryParams specifies HTTP query parameter matchers. Multiple match + values are ANDed together, meaning, a request must match all the + specified query parameters to select the route. + Supported list: + - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest - MSE Ingress: https://help.aliyun.com/zh/ack/ack-managed-and-ack-dedicated/user-guide/annotations-supported-by-mse-ingress-gateways-1 - Header/Cookie > QueryParams - Gateway API' + Header/Cookie > QueryParams + - Gateway API items: - description: HTTPQueryParamMatch describes how - to select a HTTP route by matching HTTP query - parameters. + description: |- + HTTPQueryParamMatch describes how to select a HTTP route by matching HTTP + query parameters. properties: name: - description: "Name is the name of the HTTP - query param to be matched. This must be - an exact string match. (See https://tools.ietf.org/html/rfc7230#section-2.7.3). - \n If multiple entries specify equivalent - query param names, only the first entry - with an equivalent name MUST be considered - for a match. Subsequent entries with an - equivalent query param name MUST be ignored. - \n If a query param is repeated in an - HTTP request, the behavior is purposely - left undefined, since different data planes - have different capabilities. However, - it is *recommended* that implementations - should match against the first value of - the param if the data plane supports it, - as this behavior is expected in other - load balancing contexts outside of the - Gateway API. \n Users SHOULD NOT route - traffic based on repeated query params - to guard themselves against potential - differences in the implementations." + description: |- + Name is the name of the HTTP query param to be matched. This must be an + exact string match. (See + https://tools.ietf.org/html/rfc7230#section-2.7.3). + + + If multiple entries specify equivalent query param names, only the first + entry with an equivalent name MUST be considered for a match. Subsequent + entries with an equivalent query param name MUST be ignored. + + + If a query param is repeated in an HTTP request, the behavior is + purposely left undefined, since different data planes have different + capabilities. However, it is *recommended* that implementations should + match against the first value of the param if the data plane supports it, + as this behavior is expected in other load balancing contexts outside of + the Gateway API. + + + Users SHOULD NOT route traffic based on repeated query params to guard + themselves against potential differences in the implementations. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ type: string type: default: Exact - description: "Type specifies how to match - against the value of the query parameter. - \n Support: Extended (Exact) \n Support: - Implementation-specific (RegularExpression) - \n Since RegularExpression QueryParamMatchType - has Implementation-specific conformance, - implementations can support POSIX, PCRE - or any other dialects of regular expressions. - Please read the implementation's documentation - to determine the supported dialect." + description: |- + Type specifies how to match against the value of the query parameter. + + + Support: Extended (Exact) + + + Support: Implementation-specific (RegularExpression) + + + Since RegularExpression QueryParamMatchType has Implementation-specific + conformance, implementations can support POSIX, PCRE or any other + dialects of regular expressions. Please read the implementation's + documentation to determine the supported dialect. enum: - Exact - RegularExpression @@ -1204,6 +1456,7 @@ spec: - name x-kubernetes-list-type: map type: object + maxItems: 16 type: array pause: description: Pause defines a pause stage for a rollout, @@ -1219,39 +1472,67 @@ spec: anyOf: - type: integer - type: string - description: 'Replicas is the number of expected canary - pods in this batch it can be an absolute number (ex: - 5) or a percentage of total pods.' + description: |- + Replicas is the number of expected canary pods in this batch + it can be an absolute number (ex: 5) or a percentage of total pods. x-kubernetes-int-or-string: true requestHeaderModifier: - description: "Set overwrites the request with the given - header (name, value) before the action. \n Input: - GET /foo HTTP/1.1 my-header: foo \n requestHeaderModifier: - set: - name: \"my-header\" value: \"bar\" \n Output: - GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + requestHeaderModifier: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar properties: add: - description: "Add adds the given header(s) (name, - value) to the request before the action. It appends - to any existing values associated with the header - name. \n Input: GET /foo HTTP/1.1 my-header: foo - \n Config: add: - name: \"my-header\" value: \"bar,baz\" - \n Output: GET /foo HTTP/1.1 my-header: foo,bar,baz" + description: |- + Add adds the given header(s) (name, value) to the request + before the action. It appends to any existing values associated + with the header name. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + add: + - name: "my-header" + value: "bar,baz" + + + Output: + GET /foo HTTP/1.1 + my-header: foo,bar,baz items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, the first entry with an equivalent - name MUST be considered for a match. Subsequent - entries with an equivalent header name MUST - be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are - considered equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -1272,39 +1553,67 @@ spec: - name x-kubernetes-list-type: map remove: - description: "Remove the given header(s) from the - HTTP request before the action. The value of Remove - is a list of HTTP header names. Note that the - header names are case-insensitive (see https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). - \n Input: GET /foo HTTP/1.1 my-header1: foo my-header2: - bar my-header3: baz \n Config: remove: [\"my-header1\", - \"my-header3\"] \n Output: GET /foo HTTP/1.1 my-header2: - bar" + description: |- + Remove the given header(s) from the HTTP request before the action. The + value of Remove is a list of HTTP header names. Note that the header + names are case-insensitive (see + https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). + + + Input: + GET /foo HTTP/1.1 + my-header1: foo + my-header2: bar + my-header3: baz + + + Config: + remove: ["my-header1", "my-header3"] + + + Output: + GET /foo HTTP/1.1 + my-header2: bar items: type: string maxItems: 16 type: array + x-kubernetes-list-type: set set: - description: "Set overwrites the request with the - given header (name, value) before the action. - \n Input: GET /foo HTTP/1.1 my-header: foo \n - Config: set: - name: \"my-header\" value: \"bar\" - \n Output: GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP - Header to be matched. Name matching MUST - be case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent - header names, the first entry with an equivalent - name MUST be considered for a match. Subsequent - entries with an equivalent header name MUST - be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are - considered equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -1326,20 +1635,20 @@ spec: x-kubernetes-list-type: map type: object traffic: - description: Traffic indicate how many percentage of - traffic the canary pods should receive Value is of - string type and is a percentage, e.g. 5%. + description: |- + Traffic indicate how many percentage of traffic the canary pods should receive + Value is of string type and is a percentage, e.g. 5%. type: string type: object + maxItems: 50 type: array trafficRoutingRef: description: TrafficRoutingRef is TrafficRouting's Name type: string trafficRoutings: - description: TrafficRoutings support ingress, gateway api - and custom network resource(e.g. istio, apisix) to enable - more fine-grained traffic routing and current only support - one TrafficRouting + description: |- + TrafficRoutings support ingress, gateway api and custom network resource(e.g. istio, apisix) to enable more fine-grained traffic routing + and current only support one TrafficRouting items: description: TrafficRoutingRef hosts all the different configuration for supported service meshes to enable more fine-grained @@ -1368,9 +1677,9 @@ spec: type: object type: array gateway: - description: Gateway holds Gateway specific configuration - to route traffic Gateway configuration only supports - >= v0.4.0 (v1alpha2). + description: |- + Gateway holds Gateway specific configuration to route traffic + Gateway configuration only supports >= v0.4.0 (v1alpha2). properties: httpRouteName: description: HTTPRouteName refers to the name of @@ -1390,9 +1699,9 @@ spec: to route traffic, e.g. Nginx, Alb. properties: classType: - description: ClassType refers to the type of `Ingress`. - current support nginx, aliyun-alb. default is - nginx. + description: |- + ClassType refers to the type of `Ingress`. + current support nginx, aliyun-alb. default is nginx. type: string name: description: Name refers to the name of an `Ingress` @@ -1412,15 +1721,17 @@ spec: type: array type: object paused: - description: Paused indicates that the Rollout is paused. Default - value is false + description: |- + Paused indicates that the Rollout is paused. + Default value is false type: boolean type: object workloadRef: - description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster + description: |- + INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "make" to regenerate code after modifying this file - WorkloadRef contains enough information to let you identify a workload - for Rollout Batch release of the bypass' + WorkloadRef contains enough information to let you identify a workload for Rollout + Batch release of the bypass properties: apiVersion: description: API Version of the referent @@ -1462,16 +1773,17 @@ spec: message: type: string nextStepIndex: - description: NextStepIndex defines the next step of the rollout - is on. In normal case, NextStepIndex is equal to CurrentStepIndex - + 1 If the current step is the last step, NextStepIndex is equal - to -1 Before the release, NextStepIndex is also equal to -1 - 0 is not used and won't appear in any case It is allowed to - patch NextStepIndex by design, e.g. if CurrentStepIndex is 2, - user can patch NextStepIndex to 3 (if exists) to achieve batch - jump, or patch NextStepIndex to 1 to implement a re-execution - of step 1 Patching it with a non-positive value is useless and - meaningless, which will be corrected in the next reconciliation + description: |- + NextStepIndex defines the next step of the rollout is on. + In normal case, NextStepIndex is equal to CurrentStepIndex + 1 + If the current step is the last step, NextStepIndex is equal to -1 + Before the release, NextStepIndex is also equal to -1 + 0 is not used and won't appear in any case + It is allowed to patch NextStepIndex by design, + e.g. if CurrentStepIndex is 2, user can patch NextStepIndex to 3 (if exists) to + achieve batch jump, or patch NextStepIndex to 1 to implement a re-execution of step 1 + Patching it with a non-positive value is useless and meaningless, which will be corrected + in the next reconciliation format: int32 type: integer observedRolloutID: @@ -1502,10 +1814,9 @@ spec: format: int32 type: integer updatedRevision: - description: UpdatedRevision is calculated by rollout based on - podTemplateHash, and the internal logic flow uses It may be - different from rs podTemplateHash in different k8s versions, - so it cannot be used as service selector label + description: |- + UpdatedRevision is calculated by rollout based on podTemplateHash, and the internal logic flow uses + It may be different from rs podTemplateHash in different k8s versions, so it cannot be used as service selector label type: string required: - currentStepState @@ -1529,10 +1840,9 @@ spec: format: int32 type: integer canaryRevision: - description: CanaryRevision is calculated by rollout based on - podTemplateHash, and the internal logic flow uses It may be - different from rs podTemplateHash in different k8s versions, - so it cannot be used as service selector label + description: |- + CanaryRevision is calculated by rollout based on podTemplateHash, and the internal logic flow uses + It may be different from rs podTemplateHash in different k8s versions, so it cannot be used as service selector label type: string currentStepIndex: description: CurrentStepIndex defines the current step of the @@ -1550,16 +1860,17 @@ spec: message: type: string nextStepIndex: - description: NextStepIndex defines the next step of the rollout - is on. In normal case, NextStepIndex is equal to CurrentStepIndex - + 1 If the current step is the last step, NextStepIndex is equal - to -1 Before the release, NextStepIndex is also equal to -1 - 0 is not used and won't appear in any case It is allowed to - patch NextStepIndex by design, e.g. if CurrentStepIndex is 2, - user can patch NextStepIndex to 3 (if exists) to achieve batch - jump, or patch NextStepIndex to 1 to implement a re-execution - of step 1 Patching it with a non-positive value is useless and - meaningless, which will be corrected in the next reconciliation + description: |- + NextStepIndex defines the next step of the rollout is on. + In normal case, NextStepIndex is equal to CurrentStepIndex + 1 + If the current step is the last step, NextStepIndex is equal to -1 + Before the release, NextStepIndex is also equal to -1 + 0 is not used and won't appear in any case + It is allowed to patch NextStepIndex by design, + e.g. if CurrentStepIndex is 2, user can patch NextStepIndex to 3 (if exists) to + achieve batch jump, or patch NextStepIndex to 1 to implement a re-execution of step 1 + Patching it with a non-positive value is useless and meaningless, which will be corrected + in the next reconciliation format: int32 type: integer observedRolloutID: @@ -1625,9 +1936,9 @@ spec: type: object type: array currentStepIndex: - description: These two values will be synchronized with the same fileds - in CanaryStatus or BlueGreeenStatus mainly used to provide info - for kubectl get command + description: |- + These two values will be synchronized with the same fileds in CanaryStatus or BlueGreeenStatus + mainly used to provide info for kubectl get command format: int32 type: integer currentStepState: @@ -1642,7 +1953,8 @@ spec: format: int64 type: integer phase: - description: BlueGreenStatus *BlueGreenStatus `json:"blueGreenStatus,omitempty"` + description: |- + BlueGreenStatus *BlueGreenStatus `json:"blueGreenStatus,omitempty"` Phase is the rollout phase. type: string required: diff --git a/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml b/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml index cb11ab4..2ea4730 100644 --- a/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml +++ b/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: trafficroutings.rollouts.kruise.io spec: group: rollouts.kruise.io @@ -33,14 +32,19 @@ spec: description: TrafficRouting is the Schema for the TrafficRoutings API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -71,9 +75,9 @@ spec: type: object type: array gateway: - description: Gateway holds Gateway specific configuration to - route traffic Gateway configuration only supports >= v0.4.0 - (v1alpha2). + description: |- + Gateway holds Gateway specific configuration to route traffic + Gateway configuration only supports >= v0.4.0 (v1alpha2). properties: httpRouteName: description: HTTPRouteName refers to the name of an `HTTPRoute` @@ -92,7 +96,8 @@ spec: route traffic, e.g. Nginx, Alb. properties: classType: - description: ClassType refers to the type of `Ingress`. + description: |- + ClassType refers to the type of `Ingress`. current support nginx, aliyun-alb. default is nginx. type: string name: @@ -115,52 +120,61 @@ spec: description: trafficrouting strategy properties: matches: - description: Matches define conditions used for matching the incoming - HTTP requests to canary service. Each match is independent, - i.e. this rule will be matched if **any** one of the matches - is satisfied. If Gateway API, current only support one match. - And cannot support both weight and matches, if both are configured, - then matches takes precedence. + description: |- + Matches define conditions used for matching the incoming HTTP requests to canary service. + Each match is independent, i.e. this rule will be matched if **any** one of the matches is satisfied. + If Gateway API, current only support one match. + And cannot support both weight and matches, if both are configured, then matches takes precedence. items: properties: headers: - description: Headers specifies HTTP request header matchers. - Multiple match values are ANDed together, meaning, a request - must match all the specified headers to select the route. + description: |- + Headers specifies HTTP request header matchers. Multiple match values are + ANDed together, meaning, a request must match all the specified headers + to select the route. items: - description: HTTPHeaderMatch describes how to select a - HTTP route by matching HTTP request headers. + description: |- + HTTPHeaderMatch describes how to select a HTTP route by matching HTTP request + headers. properties: name: - description: "Name is the name of the HTTP Header - to be matched. Name matching MUST be case insensitive. - (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent header - names, only the first entry with an equivalent name - MUST be considered for a match. Subsequent entries - with an equivalent header name MUST be ignored. - Due to the case-insensitivity of header names, \"foo\" - and \"Foo\" are considered equivalent. \n When a - header is repeated in an HTTP request, it is implementation-specific - behavior as to how this is represented. Generally, - proxies should follow the guidance from the RFC: - https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 - regarding processing a repeated header, with special - handling for \"Set-Cookie\"." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, only the first + entry with an equivalent name MUST be considered for a match. Subsequent + entries with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. + + + When a header is repeated in an HTTP request, it is + implementation-specific behavior as to how this is represented. + Generally, proxies should follow the guidance from the RFC: + https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 regarding + processing a repeated header, with special handling for "Set-Cookie". maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ type: string type: default: Exact - description: "Type specifies how to match against - the value of the header. \n Support: Core (Exact) - \n Support: Implementation-specific (RegularExpression) - \n Since RegularExpression HeaderMatchType has implementation-specific - conformance, implementations can support POSIX, - PCRE or any other dialects of regular expressions. - Please read the implementation's documentation to - determine the supported dialect." + description: |- + Type specifies how to match against the value of the header. + + + Support: Core (Exact) + + + Support: Implementation-specific (RegularExpression) + + + Since RegularExpression HeaderMatchType has implementation-specific + conformance, implementations can support POSIX, PCRE or any other dialects + of regular expressions. Please read the implementation's documentation to + determine the supported dialect. enum: - Exact - RegularExpression @@ -180,32 +194,62 @@ spec: type: object type: array requestHeaderModifier: - description: "Set overwrites the request with the given header - (name, value) before the action. \n Input: GET /foo HTTP/1.1 - my-header: foo \n requestHeaderModifier: set: - name: \"my-header\" - value: \"bar\" \n Output: GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + requestHeaderModifier: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar properties: add: - description: "Add adds the given header(s) (name, value) to - the request before the action. It appends to any existing - values associated with the header name. \n Input: GET /foo - HTTP/1.1 my-header: foo \n Config: add: - name: \"my-header\" - value: \"bar,baz\" \n Output: GET /foo HTTP/1.1 my-header: - foo,bar,baz" + description: |- + Add adds the given header(s) (name, value) to the request + before the action. It appends to any existing values associated + with the header name. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + add: + - name: "my-header" + value: "bar,baz" + + + Output: + GET /foo HTTP/1.1 + my-header: foo,bar,baz items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP Header to - be matched. Name matching MUST be case insensitive. - (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent header names, - the first entry with an equivalent name MUST be considered - for a match. Subsequent entries with an equivalent - header name MUST be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are considered - equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ @@ -226,37 +270,67 @@ spec: - name x-kubernetes-list-type: map remove: - description: "Remove the given header(s) from the HTTP request - before the action. The value of Remove is a list of HTTP - header names. Note that the header names are case-insensitive - (see https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). - \n Input: GET /foo HTTP/1.1 my-header1: foo my-header2: - bar my-header3: baz \n Config: remove: [\"my-header1\", - \"my-header3\"] \n Output: GET /foo HTTP/1.1 my-header2: - bar" + description: |- + Remove the given header(s) from the HTTP request before the action. The + value of Remove is a list of HTTP header names. Note that the header + names are case-insensitive (see + https://datatracker.ietf.org/doc/html/rfc2616#section-4.2). + + + Input: + GET /foo HTTP/1.1 + my-header1: foo + my-header2: bar + my-header3: baz + + + Config: + remove: ["my-header1", "my-header3"] + + + Output: + GET /foo HTTP/1.1 + my-header2: bar items: type: string maxItems: 16 type: array + x-kubernetes-list-type: set set: - description: "Set overwrites the request with the given header - (name, value) before the action. \n Input: GET /foo HTTP/1.1 - my-header: foo \n Config: set: - name: \"my-header\" value: - \"bar\" \n Output: GET /foo HTTP/1.1 my-header: bar" + description: |- + Set overwrites the request with the given header (name, value) + before the action. + + + Input: + GET /foo HTTP/1.1 + my-header: foo + + + Config: + set: + - name: "my-header" + value: "bar" + + + Output: + GET /foo HTTP/1.1 + my-header: bar items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. properties: name: - description: "Name is the name of the HTTP Header to - be matched. Name matching MUST be case insensitive. - (See https://tools.ietf.org/html/rfc7230#section-3.2). - \n If multiple entries specify equivalent header names, - the first entry with an equivalent name MUST be considered - for a match. Subsequent entries with an equivalent - header name MUST be ignored. Due to the case-insensitivity - of header names, \"foo\" and \"Foo\" are considered - equivalent." + description: |- + Name is the name of the HTTP Header to be matched. Name matching MUST be + case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2). + + + If multiple entries specify equivalent header names, the first entry with + an equivalent name MUST be considered for a match. Subsequent entries + with an equivalent header name MUST be ignored. Due to the + case-insensitivity of header names, "foo" and "Foo" are considered + equivalent. maxLength: 256 minLength: 1 pattern: ^[A-Za-z0-9!#$%&'*+\-.^_\x60|~]+$ diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 343d31c..7bcdfad 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: @@ -377,7 +376,6 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - creationTimestamp: null name: manager-role namespace: system rules: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 9d2ec03..e213848 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - creationTimestamp: null name: mutating-webhook-configuration webhooks: - admissionReviewVersions: @@ -90,7 +89,6 @@ webhooks: apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: diff --git a/go.mod b/go.mod index 604c499..77ff1ce 100644 --- a/go.mod +++ b/go.mod @@ -1,81 +1,81 @@ module github.com/openkruise/rollouts -go 1.19 +go 1.20 require ( github.com/davecgh/go-spew v1.1.1 - github.com/evanphx/json-patch v4.12.0+incompatible + github.com/evanphx/json-patch v5.6.0+incompatible github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.24.1 - github.com/openkruise/kruise-api v1.3.0 + github.com/onsi/gomega v1.27.10 + github.com/openkruise/kruise-api v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.9.0 github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 golang.org/x/time v0.3.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.26.3 - k8s.io/apiextensions-apiserver v0.26.3 - k8s.io/apimachinery v0.26.3 - k8s.io/apiserver v0.26.3 - k8s.io/client-go v0.26.3 - k8s.io/component-base v0.26.3 - k8s.io/klog/v2 v2.100.1 - k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 + k8s.io/api v0.28.9 + k8s.io/apiextensions-apiserver v0.28.9 + k8s.io/apimachinery v0.28.9 + k8s.io/apiserver v0.28.9 + k8s.io/client-go v0.28.9 + k8s.io/component-base v0.28.9 + k8s.io/klog/v2 v2.120.1 + k8s.io/utils v0.0.0-20230726121419-3b25d923346b layeh.com/gopher-json v0.0.0-20201124131017-552bb3c4c3bf - sigs.k8s.io/controller-runtime v0.14.6 - sigs.k8s.io/gateway-api v0.7.1 - sigs.k8s.io/yaml v1.3.0 + sigs.k8s.io/controller-runtime v0.16.6 + sigs.k8s.io/gateway-api v0.8.1 + sigs.k8s.io/yaml v1.4.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/emicklei/go-restful/v3 v3.9.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/logr v1.2.3 // indirect - github.com/go-logr/zapr v1.2.3 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/zapr v1.2.4 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/google/gnostic v0.5.7-v3refs // indirect - github.com/google/go-cmp v0.5.9 // indirect - github.com/google/gofuzz v1.1.0 // indirect - github.com/google/uuid v1.1.2 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/mailru/easyjson v0.7.6 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.24.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.28.1 // indirect + github.com/prometheus/client_golang v1.16.0 // indirect + github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.25.0 // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect - sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index 109dcbe..964bc93 100644 --- a/go.sum +++ b/go.sum @@ -1,222 +1,96 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= -github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= -github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= -github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= +github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= -github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -224,433 +98,189 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= +github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= -github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= -github.com/openkruise/kruise-api v1.3.0 h1:yfEy64uXgSuX/5RwePLbwUK/uX8RRM8fHJkccel5ZIQ= -github.com/openkruise/kruise-api v1.3.0/go.mod h1:9ZX+ycdHKNzcA5ezAf35xOa2Mwfa2BYagWr0lKgi5dU= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/openkruise/kruise-api v1.7.0 h1:Mg13oePPZZ1XfOEXqXTFgg4wNC07CnPK6fcPePLkv/U= +github.com/openkruise/kruise-api v1.7.0/go.mod h1:BXZAyzIPmaF0JEI0YT1fWEYTAcOCJRCzOdCg4BpXbXQ= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= -gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU= -k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE= -k8s.io/apiextensions-apiserver v0.26.3 h1:5PGMm3oEzdB1W/FTMgGIDmm100vn7IaUP5er36dB+YE= -k8s.io/apiextensions-apiserver v0.26.3/go.mod h1:jdA5MdjNWGP+njw1EKMZc64xAT5fIhN6VJrElV3sfpQ= -k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k= -k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= -k8s.io/apiserver v0.26.3 h1:blBpv+yOiozkPH2aqClhJmJY+rp53Tgfac4SKPDJnU4= -k8s.io/apiserver v0.26.3/go.mod h1:CJe/VoQNcXdhm67EvaVjYXxR3QyfwpceKPuPaeLibTA= -k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s= -k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ= -k8s.io/component-base v0.26.3 h1:oC0WMK/ggcbGDTkdcqefI4wIZRYdK3JySx9/HADpV0g= -k8s.io/component-base v0.26.3/go.mod h1:5kj1kZYwSC6ZstHJN7oHBqcJC6yyn41eR+Sqa/mQc8E= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= -k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/api v0.28.9 h1:E7VEXXCAlSrp+08zq4zgd+ko6Ttu0Mw+XoXlIkDTVW0= +k8s.io/api v0.28.9/go.mod h1:AnCsDYf3SHjfa8mPG5LGYf+iF4mie+3peLQR51MMCgw= +k8s.io/apiextensions-apiserver v0.28.9 h1:yzPHp+4IASHeu7XIPkAKJrY4UjWdjiAjOcQMd6oNKj0= +k8s.io/apiextensions-apiserver v0.28.9/go.mod h1:Rjhvq5y3JESdZgV2UOByldyefCfRrUguVpBLYOAIbVs= +k8s.io/apimachinery v0.28.9 h1:aXz4Zxsw+Pk4KhBerAtKRxNN1uSMWKfciL/iOdBfXvA= +k8s.io/apimachinery v0.28.9/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/apiserver v0.28.9 h1:koPXvgSXRBDxKJQjJGdZNgPsT9lQv6scJJFipd1m86E= +k8s.io/apiserver v0.28.9/go.mod h1:D51I37WBZojJhmLcjNVE4GSVrjiUHP+yq+N5KvKn2wY= +k8s.io/client-go v0.28.9 h1:mmMvejwc/KDjMLmDpyaxkWNzlWRCJ6ht7Qsbsnwn39Y= +k8s.io/client-go v0.28.9/go.mod h1:GFDy3rUNId++WGrr0hRaBrs+y1eZz5JtVZODEalhRMo= +k8s.io/component-base v0.28.9 h1:ySM2PR8Z/xaUSG1Akd3yM6dqUezTltI7S5aV41MMuuc= +k8s.io/component-base v0.28.9/go.mod h1:QtWzscEhCKRfHV24/S+11BwWjVxhC6fd3RYoEgZcWFU= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= layeh.com/gopher-json v0.0.0-20201124131017-552bb3c4c3bf h1:rRz0YsF7VXj9fXRF6yQgFI7DzST+hsI3TeFSGupntu0= layeh.com/gopher-json v0.0.0-20201124131017-552bb3c4c3bf/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA= -sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= -sigs.k8s.io/gateway-api v0.7.1 h1:Tts2jeepVkPA5rVG/iO+S43s9n7Vp7jCDhZDQYtPigQ= -sigs.k8s.io/gateway-api v0.7.1/go.mod h1:Xv0+ZMxX0lu1nSSDIIPEfbVztgNZ+3cfiYrJsa2Ooso= -sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= -sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/controller-runtime v0.16.6 h1:FiXwTuFF5ZJKmozfP2Z0j7dh6kmxP4Ou1KLfxgKKC3I= +sigs.k8s.io/controller-runtime v0.16.6/go.mod h1:+dQzkZxnylD0u49e0a+7AR+vlibEBaThmPca7lTyUsI= +sigs.k8s.io/gateway-api v0.8.1 h1:Bo4NMAQFYkQZnHXOfufbYwbPW7b3Ic5NjpbeW6EJxuU= +sigs.k8s.io/gateway-api v0.8.1/go.mod h1:0PteDrsrgkRmr13nDqFWnev8tOysAVrwnvfFM55tSVg= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/main.go b/main.go index cb5a409..aa14617 100644 --- a/main.go +++ b/main.go @@ -18,6 +18,7 @@ package main import ( "flag" + webhookutil "github.com/openkruise/rollouts/pkg/webhook/util" "os" kruisev1aplphal1 "github.com/openkruise/kruise-api/apps/v1alpha1" @@ -40,6 +41,8 @@ import ( "k8s.io/klog/v2/klogr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" + metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) @@ -89,13 +92,19 @@ func main() { } mgr, err := ctrl.NewManager(cfg, ctrl.Options{ - Scheme: scheme, - MetricsBindAddress: metricsAddr, - Port: 9443, + Scheme: scheme, + Metrics: metricsserver.Options{ + BindAddress: metricsAddr, + }, + WebhookServer: ctrlwebhook.NewServer(ctrlwebhook.Options{ + Host: "0.0.0.0", + Port: webhookutil.GetPort(), + CertDir: webhookutil.GetCertDir(), + }), HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, LeaderElectionID: "71ddec2c.kruise.io", - NewClient: utilclient.NewClient, + NewCache: utilclient.NewCache, }) if err != nil { setupLog.Error(err, "unable to start manager") diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go new file mode 100644 index 0000000..8c79667 --- /dev/null +++ b/pkg/client/clientset/versioned/clientset.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package versioned diff --git a/pkg/client/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go new file mode 100644 index 0000000..eeed3de --- /dev/null +++ b/pkg/client/clientset/versioned/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +// This package has the automatically generated clientset. +package versioned diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go new file mode 100644 index 0000000..8e9f4a9 --- /dev/null +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package fake diff --git a/pkg/client/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go new file mode 100644 index 0000000..f23f9f0 --- /dev/null +++ b/pkg/client/clientset/versioned/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +// This package has the automatically generated fake clientset. +package fake diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go new file mode 100644 index 0000000..8e9f4a9 --- /dev/null +++ b/pkg/client/clientset/versioned/fake/register.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package fake diff --git a/pkg/client/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go new file mode 100644 index 0000000..da9671c --- /dev/null +++ b/pkg/client/clientset/versioned/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go new file mode 100644 index 0000000..c6374cf --- /dev/null +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package scheme diff --git a/pkg/client/clientset/versioned/typed/rollouts/v1beta1/doc.go b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/doc.go new file mode 100644 index 0000000..86b7a29 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +// This package has the automatically generated typed clients. +package v1beta1 diff --git a/pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/doc.go b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/doc.go new file mode 100644 index 0000000..5e1ae11 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/fake_rollouts_client.go b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/fake_rollouts_client.go new file mode 100644 index 0000000..8e9f4a9 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/fake/fake_rollouts_client.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package fake diff --git a/pkg/client/clientset/versioned/typed/rollouts/v1beta1/generated_expansion.go b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/generated_expansion.go new file mode 100644 index 0000000..21860a8 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/generated_expansion.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package v1beta1 diff --git a/pkg/client/clientset/versioned/typed/rollouts/v1beta1/rollouts_client.go b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/rollouts_client.go new file mode 100644 index 0000000..21860a8 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/rollouts/v1beta1/rollouts_client.go @@ -0,0 +1,19 @@ +/* +Copyright 2024 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package v1beta1 diff --git a/pkg/controller/batchrelease/batchrelease_controller.go b/pkg/controller/batchrelease/batchrelease_controller.go index 709c270..75b37ce 100644 --- a/pkg/controller/batchrelease/batchrelease_controller.go +++ b/pkg/controller/batchrelease/batchrelease_controller.go @@ -21,6 +21,7 @@ import ( "encoding/json" "flag" "reflect" + "sigs.k8s.io/controller-runtime/pkg/cache" "sync" "time" @@ -80,6 +81,7 @@ func newReconciler(mgr manager.Manager) reconcile.Reconciler { Client: cli, Scheme: mgr.GetScheme(), recorder: recorder, + cache: mgr.GetCache(), executor: NewReleasePlanExecutor(cli, recorder), } } @@ -94,7 +96,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { } // Watch for changes to BatchRelease - err = c.Watch(&source.Kind{Type: &v1beta1.BatchRelease{}}, &handler.EnqueueRequestForObject{}, predicate.Funcs{ + err = c.Watch(source.Kind(mgr.GetCache(), &v1beta1.BatchRelease{}), &handler.EnqueueRequestForObject{}, predicate.Funcs{ UpdateFunc: func(e event.UpdateEvent) bool { oldObject := e.ObjectOld.(*v1beta1.BatchRelease) newObject := e.ObjectNew.(*v1beta1.BatchRelease) @@ -113,14 +115,14 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { return err } - err = c.Watch(&source.Kind{Type: &corev1.Pod{}}, &podEventHandler{Reader: mgr.GetCache()}) + err = c.Watch(source.Kind(mgr.GetCache(), &corev1.Pod{}), &podEventHandler{Reader: mgr.GetCache()}) if err != nil { return err } runtimeController = c workloadHandler = &workloadEventHandler{Reader: mgr.GetCache()} - return util.AddWorkloadWatcher(c, workloadHandler) + return util.AddWorkloadWatcher(mgr.GetCache(), c, workloadHandler) } var _ reconcile.Reconciler = &BatchReleaseReconciler{} @@ -128,6 +130,7 @@ var _ reconcile.Reconciler = &BatchReleaseReconciler{} // BatchReleaseReconciler reconciles a BatchRelease object type BatchReleaseReconciler struct { client.Client + cache cache.Cache Scheme *runtime.Scheme recorder record.EventRecorder executor *Executor @@ -172,7 +175,7 @@ func (r *BatchReleaseReconciler) Reconcile(ctx context.Context, req ctrl.Request workloadGVK := util.GetGVKFrom(&workloadRef) _, exists := watchedWorkload.Load(workloadGVK.String()) if !exists { - succeeded, err := util.AddWatcherDynamically(runtimeController, workloadHandler, workloadGVK) + succeeded, err := util.AddWatcherDynamically(r.cache, runtimeController, workloadHandler, workloadGVK) if err != nil { return ctrl.Result{}, err } else if succeeded { diff --git a/pkg/controller/batchrelease/batchrelease_controller_test.go b/pkg/controller/batchrelease/batchrelease_controller_test.go index 20fda12..8fa17bf 100644 --- a/pkg/controller/batchrelease/batchrelease_controller_test.go +++ b/pkg/controller/batchrelease/batchrelease_controller_test.go @@ -530,7 +530,11 @@ func TestReconcile_CloneSet(t *testing.T) { release := cs.GetRelease() clonesets := cs.GetCloneSet() rec := record.NewFakeRecorder(100) - cli := fake.NewClientBuilder().WithScheme(scheme).WithObjects(release).WithObjects(clonesets...).Build() + cli := fake.NewClientBuilder().WithScheme(scheme). + WithObjects(release). + WithObjects(clonesets...). + WithStatusSubresource(&v1beta1.BatchRelease{}). + Build() reconciler := &BatchReleaseReconciler{ Client: cli, recorder: rec, @@ -794,6 +798,8 @@ func TestReconcile_Deployment(t *testing.T) { cliBuilder = cliBuilder.WithObjects(makeCanaryReplicaSets(deployments[1:]...)...) } + cliBuilder.WithStatusSubresource(&v1beta1.BatchRelease{}) + cli := cliBuilder.Build() reconciler := &BatchReleaseReconciler{ Client: cli, diff --git a/pkg/controller/batchrelease/batchrelease_event_handler.go b/pkg/controller/batchrelease/batchrelease_event_handler.go index c5b599a..9a8968d 100644 --- a/pkg/controller/batchrelease/batchrelease_event_handler.go +++ b/pkg/controller/batchrelease/batchrelease_event_handler.go @@ -55,7 +55,7 @@ type podEventHandler struct { client.Reader } -func (p podEventHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (p podEventHandler) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { pod, ok := evt.Object.(*corev1.Pod) if !ok { return @@ -63,13 +63,13 @@ func (p podEventHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingI p.enqueue(pod, q) } -func (p podEventHandler) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (p podEventHandler) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { } -func (p podEventHandler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (p podEventHandler) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { } -func (p podEventHandler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (p podEventHandler) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { oldPod, oldOK := evt.ObjectOld.(*corev1.Pod) newPod, newOK := evt.ObjectNew.(*corev1.Pod) if !oldOK || !newOK { @@ -121,12 +121,12 @@ type workloadEventHandler struct { client.Reader } -func (w workloadEventHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (w workloadEventHandler) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { expectationObserved(evt.Object) w.handleWorkload(q, evt.Object, CreateEventAction) } -func (w workloadEventHandler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (w workloadEventHandler) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { var gvk schema.GroupVersionKind switch obj := evt.ObjectNew.(type) { case *kruiseappsv1alpha1.CloneSet: @@ -172,11 +172,11 @@ func (w workloadEventHandler) Update(evt event.UpdateEvent, q workqueue.RateLimi } } -func (w workloadEventHandler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (w workloadEventHandler) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { w.handleWorkload(q, evt.Object, DeleteEventAction) } -func (w workloadEventHandler) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (w workloadEventHandler) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { } func (w *workloadEventHandler) handleWorkload(q workqueue.RateLimitingInterface, obj client.Object, action EventAction) { diff --git a/pkg/controller/batchrelease/batchrelease_event_handler_test.go b/pkg/controller/batchrelease/batchrelease_event_handler_test.go index 8357d06..962c7b1 100644 --- a/pkg/controller/batchrelease/batchrelease_event_handler_test.go +++ b/pkg/controller/batchrelease/batchrelease_event_handler_test.go @@ -17,6 +17,7 @@ limitations under the License. package batchrelease import ( + "context" "encoding/json" "fmt" "testing" @@ -137,7 +138,7 @@ func TestWorkloadEventHandler_Update(t *testing.T) { ObjectOld: oldObject, ObjectNew: newObject, } - handler.Update(updateEvt, updateQ) + handler.Update(context.TODO(), updateEvt, updateQ) Expect(updateQ.Len()).Should(Equal(cs.ExpectedQueueLen)) }) } @@ -193,7 +194,7 @@ func TestWorkloadEventHandler_Create(t *testing.T) { createEvt := event.CreateEvent{ Object: newObject, } - handler.Create(createEvt, createQ) + handler.Create(context.TODO(), createEvt, createQ) Expect(createQ.Len()).Should(Equal(cs.ExpectedQueueLen)) }) } @@ -249,7 +250,7 @@ func TestWorkloadEventHandler_Delete(t *testing.T) { deleteEvt := event.DeleteEvent{ Object: newObject, } - handler.Delete(deleteEvt, deleteQ) + handler.Delete(context.TODO(), deleteEvt, deleteQ) Expect(deleteQ.Len()).Should(Equal(cs.ExpectedQueueLen)) }) } @@ -399,7 +400,7 @@ func TestPodEventHandler_Update(t *testing.T) { ObjectOld: oldObject, ObjectNew: newObject, } - handler.Update(updateEvt, updateQ) + handler.Update(context.TODO(), updateEvt, updateQ) Expect(updateQ.Len()).Should(Equal(cs.ExpectedQueueLen)) }) } @@ -466,7 +467,7 @@ func TestPodEventHandler_Create(t *testing.T) { createEvt := event.CreateEvent{ Object: newObject, } - handler.Create(createEvt, createQ) + handler.Create(context.TODO(), createEvt, createQ) Expect(createQ.Len()).Should(Equal(cs.ExpectedQueueLen)) }) } diff --git a/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go b/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go index 891ee7b..198280d 100644 --- a/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go +++ b/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go @@ -192,6 +192,7 @@ var _ = Describe("CloneSet Control", func() { c = fake.NewClientBuilder(). WithScheme(scheme). WithObjects(cloneset, release, hpa). + WithStatusSubresource(&kruiseappsv1alpha1.CloneSet{}). Build() rc = &realController{ key: types.NamespacedName{Namespace: cloneset.Namespace, Name: cloneset.Name}, diff --git a/pkg/controller/batchrelease/control/partitionstyle/control_plane.go b/pkg/controller/batchrelease/control/partitionstyle/control_plane.go index 89799fb..c958b1a 100644 --- a/pkg/controller/batchrelease/control/partitionstyle/control_plane.go +++ b/pkg/controller/batchrelease/control/partitionstyle/control_plane.go @@ -248,7 +248,7 @@ func (rc *realBatchControlPlane) markNoNeedUpdatePodsIfNeeds() (*int32, error) { klog.Errorf("Failed to patch no-need-update label(%v) to pod %v, err: %v", rolloutID, klog.KObj(pod), err) return &noNeedUpdateReplicas, err } else { - klog.Info("Succeeded to patch no-need-update label(%v) to pod %v", rolloutID, klog.KObj(pod)) + klog.Infof("Succeeded to patch no-need-update label(%v) to pod %v", rolloutID, klog.KObj(pod)) } noNeedUpdateReplicas++ } diff --git a/pkg/controller/batchrelease/control/util.go b/pkg/controller/batchrelease/control/util.go index b9928fc..a593ef2 100644 --- a/pkg/controller/batchrelease/control/util.go +++ b/pkg/controller/batchrelease/control/util.go @@ -40,7 +40,7 @@ func CalculateBatchReplicas(release *v1beta1.BatchRelease, workloadReplicas, cur klog.Warningf("releasePlan has wrong batch replicas, batches[%d].replicas %v is more than workload.replicas %v", currentBatch, batchSize, workloadReplicas) batchSize = workloadReplicas } else if batchSize < 0 { - klog.Warningf("releasePlan has wrong batch replicas, batches[%d].replicas %v is less than 0 %v", currentBatch, batchSize) + klog.Warningf("releasePlan has wrong batch replicas, batches[%d].replicas %v is less than 0", currentBatch, batchSize) batchSize = 0 } diff --git a/pkg/controller/batchrelease/labelpatch/patcher.go b/pkg/controller/batchrelease/labelpatch/patcher.go index 7737a06..01af29c 100644 --- a/pkg/controller/batchrelease/labelpatch/patcher.go +++ b/pkg/controller/batchrelease/labelpatch/patcher.go @@ -197,7 +197,7 @@ func calculateBatchReplicas(batches []v1beta1.ReleaseBatch, workloadReplicas, cu klog.Warningf("releasePlan has wrong batch replicas, batches[%d].replicas %v is more than workload.replicas %v", currentBatch, batchSize, workloadReplicas) batchSize = workloadReplicas } else if batchSize < 0 { - klog.Warningf("releasePlan has wrong batch replicas, batches[%d].replicas %v is less than 0 %v", currentBatch, batchSize) + klog.Warningf("releasePlan has wrong batch replicas, batches[%d].replicas %v is less than 0", currentBatch, batchSize) batchSize = 0 } return batchSize diff --git a/pkg/controller/batchrelease/labelpatch/patcher_test.go b/pkg/controller/batchrelease/labelpatch/patcher_test.go index 4e4ec9c..4fdbef9 100644 --- a/pkg/controller/batchrelease/labelpatch/patcher_test.go +++ b/pkg/controller/batchrelease/labelpatch/patcher_test.go @@ -490,6 +490,8 @@ func TestDeploymentPatch(t *testing.T) { ctx.Pods = append(ctx.Pods, &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ DeletionTimestamp: &now, + // fake client will reject pods with deletiontimestamp if no finalizer is given + Finalizers: []string{"finalizers.sigs.k8s.io/test"}, Labels: map[string]string{ appsv1.ControllerRevisionHashLabelKey: skippedRevision, }, diff --git a/pkg/controller/deployment/controller.go b/pkg/controller/deployment/controller.go index 48ec250..a15d7c3 100644 --- a/pkg/controller/deployment/controller.go +++ b/pkg/controller/deployment/controller.go @@ -25,11 +25,9 @@ import ( admissionregistrationv1 "k8s.io/api/admissionregistration/v1" appsv1 "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" @@ -87,8 +85,7 @@ func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(klog.Infof) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: genericClient.KubeClient.CoreV1().Events("")}) - recorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "advanced-deployment-controller"}) - + recorder := mgr.GetEventRecorderFor("advanced-deployment-controller") // Deployment controller factory factory := &controllerFactory{ runtimeClient: mgr.GetClient(), @@ -117,13 +114,13 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { } // Watch for changes to ReplicaSet - if err = c.Watch(&source.Kind{Type: &appsv1.ReplicaSet{}}, &handler.EnqueueRequestForOwner{ - IsController: true, OwnerType: &appsv1.Deployment{}}, predicate.Funcs{}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &appsv1.ReplicaSet{}), handler.EnqueueRequestForOwner( + mgr.GetScheme(), mgr.GetRESTMapper(), &appsv1.Deployment{}, handler.OnlyControllerOwner())); err != nil { return err } // Watch for changes to MutatingWebhookConfigurations of kruise-rollout operator - if err = c.Watch(&source.Kind{Type: &admissionregistrationv1.MutatingWebhookConfiguration{}}, &MutatingWebhookEventHandler{mgr.GetCache()}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &admissionregistrationv1.MutatingWebhookConfiguration{}), &MutatingWebhookEventHandler{mgr.GetCache()}); err != nil { return err } @@ -146,7 +143,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { } // Watch for changes to Deployment - return c.Watch(&source.Kind{Type: &appsv1.Deployment{}}, &handler.EnqueueRequestForObject{}, predicate.Funcs{UpdateFunc: updateHandler}) + return c.Watch(source.Kind(mgr.GetCache(), &appsv1.Deployment{}), &handler.EnqueueRequestForObject{}, predicate.Funcs{UpdateFunc: updateHandler}) } // Reconcile reads that state of the cluster for a Deployment object and makes changes based on the state read diff --git a/pkg/controller/deployment/deployment_event_handler.go b/pkg/controller/deployment/deployment_event_handler.go index 23e98d4..404c835 100644 --- a/pkg/controller/deployment/deployment_event_handler.go +++ b/pkg/controller/deployment/deployment_event_handler.go @@ -19,7 +19,7 @@ type MutatingWebhookEventHandler struct { client.Reader } -func (m MutatingWebhookEventHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (m MutatingWebhookEventHandler) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { config, ok := evt.Object.(*admissionregistrationv1.MutatingWebhookConfiguration) if !ok || config == nil || !isKruiseRolloutMutatingConfiguration(config) || config.DeletionTimestamp.IsZero() { return @@ -27,7 +27,7 @@ func (m MutatingWebhookEventHandler) Create(evt event.CreateEvent, q workqueue.R m.enqueue(q) } -func (m MutatingWebhookEventHandler) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (m MutatingWebhookEventHandler) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { config, ok := evt.Object.(*admissionregistrationv1.MutatingWebhookConfiguration) if !ok || config == nil || !isKruiseRolloutMutatingConfiguration(config) || config.DeletionTimestamp.IsZero() { return @@ -35,7 +35,7 @@ func (m MutatingWebhookEventHandler) Generic(evt event.GenericEvent, q workqueue m.enqueue(q) } -func (m MutatingWebhookEventHandler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (m MutatingWebhookEventHandler) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { config, ok := evt.ObjectNew.(*admissionregistrationv1.MutatingWebhookConfiguration) if !ok || config == nil || !isKruiseRolloutMutatingConfiguration(config) || config.DeletionTimestamp.IsZero() { return @@ -43,7 +43,7 @@ func (m MutatingWebhookEventHandler) Update(evt event.UpdateEvent, q workqueue.R m.enqueue(q) } -func (m MutatingWebhookEventHandler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (m MutatingWebhookEventHandler) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { config, ok := evt.Object.(*admissionregistrationv1.MutatingWebhookConfiguration) if !ok || config == nil || !isKruiseRolloutMutatingConfiguration(config) { return diff --git a/pkg/controller/rollout/rollout_controller.go b/pkg/controller/rollout/rollout_controller.go index 8232ba0..3da4f0f 100755 --- a/pkg/controller/rollout/rollout_controller.go +++ b/pkg/controller/rollout/rollout_controller.go @@ -19,6 +19,7 @@ package rollout import ( "context" "flag" + "sigs.k8s.io/controller-runtime/pkg/cache" "sync" "time" @@ -62,6 +63,7 @@ type RolloutReconciler struct { client.Client Scheme *runtime.Scheme Recorder record.EventRecorder + cache cache.Cache finder *util.ControllerFinder trafficRoutingManager *trafficrouting.Manager @@ -107,7 +109,7 @@ func (r *RolloutReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct workloadGVK := util.GetGVKFrom(&workloadRef) _, exists := watchedWorkload.Load(workloadGVK.String()) if !exists { - succeeded, err := util.AddWatcherDynamically(runtimeController, workloadHandler, workloadGVK) + succeeded, err := util.AddWatcherDynamically(r.cache, runtimeController, workloadHandler, workloadGVK) if err != nil { return ctrl.Result{}, err } else if succeeded { @@ -171,18 +173,19 @@ func (r *RolloutReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } // Watch for changes to rollout - if err = c.Watch(&source.Kind{Type: &v1beta1.Rollout{}}, &handler.EnqueueRequestForObject{}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &v1beta1.Rollout{}), &handler.EnqueueRequestForObject{}); err != nil { return err } // Watch for changes to batchRelease - if err = c.Watch(&source.Kind{Type: &v1beta1.BatchRelease{}}, &enqueueRequestForBatchRelease{reader: mgr.GetCache()}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &v1beta1.BatchRelease{}), &enqueueRequestForBatchRelease{reader: mgr.GetCache()}); err != nil { return err } runtimeController = c workloadHandler = &enqueueRequestForWorkload{reader: mgr.GetCache(), scheme: r.Scheme} - if err = util.AddWorkloadWatcher(c, workloadHandler); err != nil { + if err = util.AddWorkloadWatcher(mgr.GetCache(), c, workloadHandler); err != nil { return err } + r.cache = mgr.GetCache() r.finder = util.NewControllerFinder(mgr.GetClient()) r.trafficRoutingManager = trafficrouting.NewTrafficRoutingManager(mgr.GetClient()) r.canaryManager = &canaryReleaseManager{ diff --git a/pkg/controller/rollout/rollout_event_handler.go b/pkg/controller/rollout/rollout_event_handler.go index 355d7d6..f88ffd9 100644 --- a/pkg/controller/rollout/rollout_event_handler.go +++ b/pkg/controller/rollout/rollout_event_handler.go @@ -39,18 +39,18 @@ type enqueueRequestForWorkload struct { scheme *runtime.Scheme } -func (w *enqueueRequestForWorkload) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForWorkload) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.Object) } -func (w *enqueueRequestForWorkload) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForWorkload) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.Object) } -func (w *enqueueRequestForWorkload) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForWorkload) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForWorkload) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForWorkload) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.ObjectNew) } @@ -106,16 +106,16 @@ type enqueueRequestForBatchRelease struct { reader client.Reader } -func (w *enqueueRequestForBatchRelease) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForBatchRelease) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForBatchRelease) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForBatchRelease) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForBatchRelease) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForBatchRelease) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForBatchRelease) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForBatchRelease) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.ObjectNew) } diff --git a/pkg/controller/rollout/rollout_event_handler_test.go b/pkg/controller/rollout/rollout_event_handler_test.go index 06881f2..49a8e5a 100644 --- a/pkg/controller/rollout/rollout_event_handler_test.go +++ b/pkg/controller/rollout/rollout_event_handler_test.go @@ -39,7 +39,7 @@ func TestPodEventHandler(t *testing.T) { createEvt := event.CreateEvent{ Object: deploymentDemo, } - handler.Create(createEvt, createQ) + handler.Create(context.TODO(), createEvt, createQ) if createQ.Len() != 1 { t.Errorf("unexpected create event handle queue size, expected 1 actual %d", createQ.Len()) } @@ -50,7 +50,7 @@ func TestPodEventHandler(t *testing.T) { createEvt = event.CreateEvent{ Object: demo1, } - handler.Create(createEvt, createQ) + handler.Create(context.TODO(), createEvt, createQ) if createQ.Len() != 1 { t.Errorf("unexpected create event handle queue size, expected 1 actual %d", createQ.Len()) } diff --git a/pkg/controller/rollout/rollout_progressing_test.go b/pkg/controller/rollout/rollout_progressing_test.go index d32e035..7f0b4d1 100644 --- a/pkg/controller/rollout/rollout_progressing_test.go +++ b/pkg/controller/rollout/rollout_progressing_test.go @@ -810,7 +810,10 @@ func TestReconcileRolloutProgressing(t *testing.T) { t.Run(cs.name, func(t *testing.T) { deps, rss := cs.getObj() rollout, br, tr := cs.getRollout() - fc := fake.NewClientBuilder().WithScheme(scheme).WithObjects(rollout, demoConf.DeepCopy()).Build() + fc := fake.NewClientBuilder().WithScheme(scheme). + WithObjects(rollout, demoConf.DeepCopy()). + WithStatusSubresource(&v1beta1.Rollout{}). + Build() for _, rs := range rss { _ = fc.Create(context.TODO(), rs) } diff --git a/pkg/controller/rollout/rollout_releaseManager.go b/pkg/controller/rollout/rollout_releaseManager.go index 9fceb3e..39de4ed 100644 --- a/pkg/controller/rollout/rollout_releaseManager.go +++ b/pkg/controller/rollout/rollout_releaseManager.go @@ -78,7 +78,7 @@ func removeBatchRelease(cli client.Client, c *RolloutContext) (bool, error) { if err != nil && errors.IsNotFound(err) { return false, nil } else if err != nil { - klog.Errorf("rollout(%s/%s) fetch BatchRelease failed: %s", c.Rollout.Namespace, c.Rollout.Name) + klog.Errorf("rollout(%s/%s) fetch BatchRelease failed: %s", c.Rollout.Namespace, c.Rollout.Name, err.Error()) return true, err } if !batch.DeletionTimestamp.IsZero() { diff --git a/pkg/controller/rollout/rollout_releaseManager_test.go b/pkg/controller/rollout/rollout_releaseManager_test.go index d67a38b..6f8e134 100644 --- a/pkg/controller/rollout/rollout_releaseManager_test.go +++ b/pkg/controller/rollout/rollout_releaseManager_test.go @@ -169,6 +169,7 @@ func TestRemoveBatchRelease(t *testing.T) { Name: "my-rollout", Namespace: "default", DeletionTimestamp: &now, + Finalizers: []string{"rollouts.kruise.io/batch-release-finalizer"}, }, } fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(br).Build() diff --git a/pkg/controller/rollout/rollout_status_test.go b/pkg/controller/rollout/rollout_status_test.go index 4a7ca1e..8f5e117 100755 --- a/pkg/controller/rollout/rollout_status_test.go +++ b/pkg/controller/rollout/rollout_status_test.go @@ -148,7 +148,9 @@ func TestCalculateRolloutStatus(t *testing.T) { } t.Run("RolloutStatus test", func(t *testing.T) { - fc := fake.NewClientBuilder().WithScheme(scheme).Build() + fc := fake.NewClientBuilder().WithScheme(scheme). + WithStatusSubresource(&v1beta1.Rollout{}). + Build() r := &RolloutReconciler{ Client: fc, Scheme: scheme, diff --git a/pkg/controller/rollouthistory/rollouthistory_controller.go b/pkg/controller/rollouthistory/rollouthistory_controller.go index 8655800..2086cae 100644 --- a/pkg/controller/rollouthistory/rollouthistory_controller.go +++ b/pkg/controller/rollouthistory/rollouthistory_controller.go @@ -79,11 +79,11 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { return err } // Watch for changes to rollout - if err = c.Watch(&source.Kind{Type: &rolloutv1alpha1.Rollout{}}, &enqueueRequestForRollout{}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &rolloutv1alpha1.Rollout{}), &enqueueRequestForRollout{}); err != nil { return err } // watch for changes to rolloutHistory - if err = c.Watch(&source.Kind{Type: &rolloutv1alpha1.RolloutHistory{}}, &enqueueRequestForRolloutHistory{}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &rolloutv1alpha1.RolloutHistory{}), &enqueueRequestForRolloutHistory{}); err != nil { return err } return nil diff --git a/pkg/controller/rollouthistory/rollouthistory_controller_test.go b/pkg/controller/rollouthistory/rollouthistory_controller_test.go index d8faa26..4ff56a3 100644 --- a/pkg/controller/rollouthistory/rollouthistory_controller_test.go +++ b/pkg/controller/rollouthistory/rollouthistory_controller_test.go @@ -896,7 +896,7 @@ func TestReconcile(t *testing.T) { for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { - fakeClient := fake.NewClientBuilder().WithScheme(scheme).Build() + fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(&rolloutv1alpha1.RolloutHistory{}).Build() for _, obj := range cs.getPods() { err := fakeClient.Create(context.TODO(), obj.DeepCopy(), &client.CreateOptions{}) if err != nil { diff --git a/pkg/controller/rollouthistory/rollouthistory_event_handler.go b/pkg/controller/rollouthistory/rollouthistory_event_handler.go index b8e8549..2998ecb 100644 --- a/pkg/controller/rollouthistory/rollouthistory_event_handler.go +++ b/pkg/controller/rollouthistory/rollouthistory_event_handler.go @@ -17,6 +17,8 @@ limitations under the License. package rollouthistory import ( + "context" + rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" @@ -31,17 +33,17 @@ var _ handler.EventHandler = &enqueueRequestForRolloutHistory{} type enqueueRequestForRolloutHistory struct { } -func (w *enqueueRequestForRolloutHistory) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRolloutHistory) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.Object) } -func (w *enqueueRequestForRolloutHistory) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRolloutHistory) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForRolloutHistory) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRolloutHistory) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForRolloutHistory) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRolloutHistory) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.ObjectNew) } @@ -62,17 +64,17 @@ var _ handler.EventHandler = &enqueueRequestForRollout{} type enqueueRequestForRollout struct { } -func (w *enqueueRequestForRollout) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRollout) Create(ctx context.Context, evt event.CreateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.Object) } -func (w *enqueueRequestForRollout) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRollout) Delete(ctx context.Context, evt event.DeleteEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForRollout) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRollout) Generic(ctx context.Context, evt event.GenericEvent, q workqueue.RateLimitingInterface) { } -func (w *enqueueRequestForRollout) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +func (w *enqueueRequestForRollout) Update(ctx context.Context, evt event.UpdateEvent, q workqueue.RateLimitingInterface) { w.handleEvent(q, evt.ObjectNew) } diff --git a/pkg/controller/trafficrouting/trafficrouting_controller.go b/pkg/controller/trafficrouting/trafficrouting_controller.go index 6d0928b..7c5472f 100644 --- a/pkg/controller/trafficrouting/trafficrouting_controller.go +++ b/pkg/controller/trafficrouting/trafficrouting_controller.go @@ -207,7 +207,7 @@ func (r *TrafficRoutingReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } // Watch for changes to trafficrouting - if err = c.Watch(&source.Kind{Type: &v1alpha1.TrafficRouting{}}, &handler.EnqueueRequestForObject{}); err != nil { + if err = c.Watch(source.Kind(mgr.GetCache(), &v1alpha1.TrafficRouting{}), &handler.EnqueueRequestForObject{}); err != nil { return err } r.trafficRoutingManager = trafficrouting.NewTrafficRoutingManager(mgr.GetClient()) diff --git a/pkg/controller/trafficrouting/trafficrouting_controller_test.go b/pkg/controller/trafficrouting/trafficrouting_controller_test.go index df5432c..1ab71e3 100644 --- a/pkg/controller/trafficrouting/trafficrouting_controller_test.go +++ b/pkg/controller/trafficrouting/trafficrouting_controller_test.go @@ -344,7 +344,10 @@ func TestTrafficRoutingTest(t *testing.T) { for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { ss, ig := cs.getObj() - client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(ig[0], ss[0], demoConf.DeepCopy()).Build() + client := fake.NewClientBuilder().WithScheme(scheme). + WithObjects(ig[0], ss[0], demoConf.DeepCopy()). + WithStatusSubresource(&v1alpha1.TrafficRouting{}). + Build() if len(ss) == 2 { _ = client.Create(context.TODO(), ss[1]) } diff --git a/pkg/util/client/cache.go b/pkg/util/client/cache.go new file mode 100644 index 0000000..3665e85 --- /dev/null +++ b/pkg/util/client/cache.go @@ -0,0 +1,77 @@ +/* +Copyright 2022 The Kruise Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package client + +import ( + "context" + "flag" + + clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/cache" + "sigs.k8s.io/controller-runtime/pkg/client" +) + +var ( + disableNoDeepCopy bool +) + +func init() { + flag.BoolVar(&disableNoDeepCopy, "disable-no-deepcopy", false, "If you are going to disable NoDeepCopy List in some controllers and webhooks.") +} + +type internalCache struct { + cache.Cache + noDeepCopyLister *noDeepCopyLister +} + +func NewCache(config *rest.Config, opts cache.Options) (cache.Cache, error) { + if opts.Scheme == nil { + opts.Scheme = clientgoscheme.Scheme + } + c, err := cache.New(config, opts) + if err != nil { + return nil, err + } + return &internalCache{ + Cache: c, + noDeepCopyLister: &noDeepCopyLister{cache: c, scheme: opts.Scheme}, + }, nil +} + +func (ic *internalCache) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error { + if !disableNoDeepCopy && isDisableDeepCopy(opts) { + return ic.noDeepCopyLister.List(ctx, list, opts...) + } + return ic.Cache.List(ctx, list, opts...) +} + +var DisableDeepCopy = disableDeepCopy{} + +type disableDeepCopy struct{} + +func (disableDeepCopy) ApplyToList(*client.ListOptions) { +} + +func isDisableDeepCopy(opts []client.ListOption) bool { + for _, opt := range opts { + if opt == DisableDeepCopy { + return true + } + } + return false +} diff --git a/pkg/util/client/client.go b/pkg/util/client/client.go deleted file mode 100644 index 8e68488..0000000 --- a/pkg/util/client/client.go +++ /dev/null @@ -1,90 +0,0 @@ -/* -Copyright 2022 The Kruise Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package client - -import ( - "fmt" - - kruiseclientset "github.com/openkruise/kruise-api/client/clientset/versioned" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/discovery" - kubeclientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" -) - -// GenericClientset defines a generic client -type GenericClientset struct { - DiscoveryClient discovery.DiscoveryInterface - KubeClient kubeclientset.Interface - KruiseClient kruiseclientset.Interface -} - -var ( - cfg *rest.Config - defaultGenericClient *GenericClientset -) - -// newForConfig creates a new Clientset for the given config. -func newForConfig(c *rest.Config) (*GenericClientset, error) { - cWithProtobuf := rest.CopyConfig(c) - cWithProtobuf.ContentType = runtime.ContentTypeProtobuf - discoveryClient, err := discovery.NewDiscoveryClientForConfig(cWithProtobuf) - if err != nil { - return nil, err - } - kubeClient, err := kubeclientset.NewForConfig(cWithProtobuf) - if err != nil { - return nil, err - } - kruiseClient, err := kruiseclientset.NewForConfig(c) - if err != nil { - return nil, err - } - return &GenericClientset{ - DiscoveryClient: discoveryClient, - KubeClient: kubeClient, - KruiseClient: kruiseClient, - }, nil -} - -// NewRegistry creates clientset by client-go -func NewRegistry(c *rest.Config) error { - var err error - defaultGenericClient, err = newForConfig(c) - if err != nil { - return err - } - cfgCopy := *c - cfg = &cfgCopy - return nil -} - -// GetGenericClient returns default clientset -func GetGenericClient() *GenericClientset { - return defaultGenericClient -} - -// GetGenericClientWithName returns clientset with given name as user-agent -func GetGenericClientWithName(name string) *GenericClientset { - if cfg == nil { - return nil - } - newCfg := *cfg - newCfg.UserAgent = fmt.Sprintf("%s/%s", cfg.UserAgent, name) - clientset, _ := newForConfig(cfg) - return clientset -} diff --git a/pkg/util/client/delegating_client.go b/pkg/util/client/delegating_client.go deleted file mode 100644 index 41bb074..0000000 --- a/pkg/util/client/delegating_client.go +++ /dev/null @@ -1,165 +0,0 @@ -/* -Copyright 2022 The Kruise Authors. -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package client - -import ( - "context" - "flag" - "strings" - - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/cache" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/client/apiutil" -) - -var ( - disableNoDeepCopy bool -) - -func init() { - flag.BoolVar(&disableNoDeepCopy, "disable-no-deepcopy", false, "If you are going to disable NoDeepCopy List in some controllers and webhooks.") -} - -// NewClient creates the default caching client with disable deepcopy list from cache. -func NewClient(cache cache.Cache, config *rest.Config, options client.Options, uncachedObjects ...client.Object) (client.Client, error) { - c, err := client.New(config, options) - if err != nil { - return nil, err - } - - uncachedGVKs := map[schema.GroupVersionKind]struct{}{} - for _, obj := range uncachedObjects { - gvk, err := apiutil.GVKForObject(obj, c.Scheme()) - if err != nil { - return nil, err - } - uncachedGVKs[gvk] = struct{}{} - } - - return &delegatingClient{ - scheme: c.Scheme(), - mapper: c.RESTMapper(), - Reader: &delegatingReader{ - CacheReader: cache, - ClientReader: c, - noDeepCopyLister: &noDeepCopyLister{cache: cache, scheme: c.Scheme()}, - scheme: c.Scheme(), - uncachedGVKs: uncachedGVKs, - cacheUnstructured: true, - }, - Writer: c, - StatusClient: c, - SubResourceClientConstructor: c, - }, nil -} - -type delegatingClient struct { - client.Reader - client.Writer - client.StatusClient - client.SubResourceClientConstructor - - scheme *runtime.Scheme - mapper meta.RESTMapper -} - -// Scheme returns the scheme this client is using. -func (d *delegatingClient) Scheme() *runtime.Scheme { - return d.scheme -} - -// RESTMapper returns the rest mapper this client is using. -func (d *delegatingClient) RESTMapper() meta.RESTMapper { - return d.mapper -} - -// delegatingReader forms a Reader that will cause Get and List requests for -// unstructured types to use the ClientReader while requests for any other type -// of object with use the CacheReader. This avoids accidentally caching the -// entire cluster in the common case of loading arbitrary unstructured objects -// (e.g. from OwnerReferences). -type delegatingReader struct { - CacheReader client.Reader - ClientReader client.Reader - - noDeepCopyLister *noDeepCopyLister - - uncachedGVKs map[schema.GroupVersionKind]struct{} - scheme *runtime.Scheme - cacheUnstructured bool -} - -func (d *delegatingReader) shouldBypassCache(obj runtime.Object) (bool, error) { - gvk, err := apiutil.GVKForObject(obj, d.scheme) - if err != nil { - return false, err - } - // TODO: this is producing unsafe guesses that don't actually work, - // but it matches ~99% of the cases out there. - if meta.IsListType(obj) { - gvk.Kind = strings.TrimSuffix(gvk.Kind, "List") - } - if _, isUncached := d.uncachedGVKs[gvk]; isUncached { - return true, nil - } - if !d.cacheUnstructured { - _, isUnstructured := obj.(*unstructured.Unstructured) - _, isUnstructuredList := obj.(*unstructured.UnstructuredList) - return isUnstructured || isUnstructuredList, nil - } - return false, nil -} - -// Get retrieves an obj for a given object key from the Kubernetes Cluster. -func (d *delegatingReader) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error { - if isUncached, err := d.shouldBypassCache(obj); err != nil { - return err - } else if isUncached { - return d.ClientReader.Get(ctx, key, obj, opts...) - } - return d.CacheReader.Get(ctx, key, obj, opts...) -} - -// List retrieves list of objects for a given namespace and list options. -func (d *delegatingReader) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error { - if isUncached, err := d.shouldBypassCache(list); err != nil { - return err - } else if isUncached { - return d.ClientReader.List(ctx, list, opts...) - } - if !disableNoDeepCopy && isDisableDeepCopy(opts) { - return d.noDeepCopyLister.List(ctx, list, opts...) - } - return d.CacheReader.List(ctx, list, opts...) -} - -var DisableDeepCopy = client.UnsafeDisableDeepCopy - -func isDisableDeepCopy(opts []client.ListOption) bool { - for _, opt := range opts { - if opt == DisableDeepCopy { - return true - } - } - return false -} diff --git a/pkg/util/client/generic_client.go b/pkg/util/client/generic_client.go new file mode 100644 index 0000000..425c509 --- /dev/null +++ b/pkg/util/client/generic_client.go @@ -0,0 +1,41 @@ +package client + +import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/discovery" + kubeclientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" +) + +// GenericClientset defines a generic client +type GenericClientset struct { + DiscoveryClient discovery.DiscoveryInterface + KubeClient kubeclientset.Interface +} + +// newForConfig creates a new Clientset for the given config. +func newForConfig(c *rest.Config) (*GenericClientset, error) { + cWithProtobuf := rest.CopyConfig(c) + cWithProtobuf.ContentType = runtime.ContentTypeProtobuf + discoveryClient, err := discovery.NewDiscoveryClientForConfig(cWithProtobuf) + if err != nil { + return nil, err + } + kubeClient, err := kubeclientset.NewForConfig(cWithProtobuf) + if err != nil { + return nil, err + } + return &GenericClientset{ + DiscoveryClient: discoveryClient, + KubeClient: kubeClient, + }, nil +} + +// newForConfig creates a new Clientset for the given config. +func newForConfigOrDie(c *rest.Config) *GenericClientset { + gc, err := newForConfig(c) + if err != nil { + panic(err) + } + return gc +} diff --git a/pkg/util/client/no_deepcopy_lister.go b/pkg/util/client/no_deepcopy_lister.go index 3272f57..5733c2b 100644 --- a/pkg/util/client/no_deepcopy_lister.go +++ b/pkg/util/client/no_deepcopy_lister.go @@ -107,7 +107,7 @@ func (r *noDeepCopyLister) List(ctx context.Context, out client.ObjectList, opts runtimeObjs = append(runtimeObjs, obj) } defer func() { - klog.V(6).Infof("Listed %v %v objects %v without DeepCopy, cost %v", gvk.GroupVersion(), gvk.Kind, len(runtimeObjs), time.Since(startTime)) + klog.V(6).InfoS("Objects listed without DeepCopy", "groupVersion", gvk.GroupVersion(), "kind", gvk.Kind, "objects", len(runtimeObjs), "cost", time.Since(startTime)) }() return apimeta.SetList(out, runtimeObjs) } diff --git a/pkg/util/client/registry.go b/pkg/util/client/registry.go new file mode 100644 index 0000000..dae8d8b --- /dev/null +++ b/pkg/util/client/registry.go @@ -0,0 +1,40 @@ +package client + +import ( + "fmt" + + "k8s.io/client-go/rest" +) + +var ( + cfg *rest.Config + + defaultGenericClient *GenericClientset +) + +// NewRegistry creates clientset by client-go +func NewRegistry(c *rest.Config) error { + var err error + defaultGenericClient, err = newForConfig(c) + if err != nil { + return err + } + cfgCopy := *c + cfg = &cfgCopy + return nil +} + +// GetGenericClient returns default clientset +func GetGenericClient() *GenericClientset { + return defaultGenericClient +} + +// GetGenericClientWithName returns clientset with given name as user-agent +func GetGenericClientWithName(name string) *GenericClientset { + if cfg == nil { + return nil + } + newCfg := *cfg + newCfg.UserAgent = fmt.Sprintf("%s/%s", cfg.UserAgent, name) + return newForConfigOrDie(&newCfg) +} diff --git a/pkg/util/controller_finder_test.go b/pkg/util/controller_finder_test.go index 161de34..579adf7 100644 --- a/pkg/util/controller_finder_test.go +++ b/pkg/util/controller_finder_test.go @@ -89,7 +89,7 @@ func TestGetWorkloadForRef(t *testing.T) { }, }, { - name: "cloneset,in rollout progress", + name: "cloneset in rollout progress", getRollout: func() *rolloutv1beta1.Rollout { rollout := demoRollout.DeepCopy() rollout.Spec.WorkloadRef = rolloutv1beta1.ObjectRef{ @@ -132,7 +132,7 @@ func TestGetWorkloadForRef(t *testing.T) { }, }, { - name: "in rollback progress", + name: "cloneset in rollback progress", getRollout: func() *rolloutv1beta1.Rollout { rollout := demoRollout.DeepCopy() rollout.Spec.WorkloadRef = rolloutv1beta1.ObjectRef{ @@ -179,7 +179,7 @@ func TestGetWorkloadForRef(t *testing.T) { }, }, { - name: "deployment: not in rollout progress", + name: "deployment not in rollout progress", getRollout: func() *rolloutv1beta1.Rollout { rollout := demoRollout.DeepCopy() rollout.Spec.WorkloadRef = rolloutv1beta1.ObjectRef{ @@ -225,7 +225,7 @@ func TestGetWorkloadForRef(t *testing.T) { }, }, { - name: "in rollout progress", + name: "deployment in rollout progress", getRollout: func() *rolloutv1beta1.Rollout { rollout := demoRollout.DeepCopy() rollout.Spec.WorkloadRef = rolloutv1beta1.ObjectRef{ @@ -266,7 +266,7 @@ func TestGetWorkloadForRef(t *testing.T) { }, }, { - name: "in rollback", + name: "deployment in rollback", getRollout: func() *rolloutv1beta1.Rollout { rollout := demoRollout.DeepCopy() rollout.Spec.WorkloadRef = rolloutv1beta1.ObjectRef{ @@ -309,7 +309,7 @@ func TestGetWorkloadForRef(t *testing.T) { }, }, { - name: "not consistent", + name: "deployment not consistent", getRollout: func() *rolloutv1beta1.Rollout { rollout := demoRollout.DeepCopy() rollout.Spec.WorkloadRef = rolloutv1beta1.ObjectRef{ diff --git a/pkg/util/grace/grace_expectations_test.go b/pkg/util/grace/grace_expectations_test.go index 6efbb8f..d2dffbf 100644 --- a/pkg/util/grace/grace_expectations_test.go +++ b/pkg/util/grace/grace_expectations_test.go @@ -198,6 +198,9 @@ func TestStartCleaner(t *testing.T) { // Wait for the cleaner to run time.Sleep(testInterval * 3) + r.Lock() + defer r.Unlock() + // Verify the outdated items have been cleaned and recent ones remain if len(r.controllerCache["testController1"]) != 1 || r.controllerCache["testController1"][Update] != &recent { t.Errorf("expected only recent Update action for testController1 to remain, found %d", len(r.controllerCache["testController1"])) diff --git a/pkg/util/rollout_utils.go b/pkg/util/rollout_utils.go index 33a2b0d..3a7576d 100644 --- a/pkg/util/rollout_utils.go +++ b/pkg/util/rollout_utils.go @@ -21,6 +21,7 @@ import ( "encoding/hex" "encoding/json" "fmt" + "sigs.k8s.io/controller-runtime/pkg/cache" "strings" "time" @@ -62,34 +63,34 @@ func IsRollbackInBatchPolicy(rollout *rolloutv1beta1.Rollout, labels map[string] return false } -func AddWorkloadWatcher(c controller.Controller, handler handler.EventHandler) error { +func AddWorkloadWatcher(cs cache.Cache, c controller.Controller, handler handler.EventHandler) error { // Watch changes to Deployment - err := c.Watch(&source.Kind{Type: &apps.Deployment{}}, handler) + err := c.Watch(source.Kind(cs, &apps.Deployment{}), handler) if err != nil { return err } // Watch changes to Native StatefulSet, use unstructured informer - err = c.Watch(&source.Kind{Type: &apps.StatefulSet{}}, handler) + err = c.Watch(source.Kind(cs, &apps.StatefulSet{}), handler) if err != nil { return err } // Watch changes to CloneSet if it has the CRD if DiscoverGVK(ControllerKruiseKindCS) { - err := c.Watch(&source.Kind{Type: &kruiseappsv1alpha1.CloneSet{}}, handler) + err := c.Watch(source.Kind(cs, &kruiseappsv1alpha1.CloneSet{}), handler) if err != nil { return err } } // Watch changes to DaemonSet if it has the CRD if DiscoverGVK(ControllerKruiseKindDS) { - err := c.Watch(&source.Kind{Type: &kruiseappsv1alpha1.DaemonSet{}}, handler) + err := c.Watch(source.Kind(cs, &kruiseappsv1alpha1.DaemonSet{}), handler) if err != nil { return err } } // Watch changes to Advanced StatefulSet if it has the CRD if DiscoverGVK(ControllerKruiseKindSts) { - err := c.Watch(&source.Kind{Type: &kruiseappsv1beta1.StatefulSet{}}, handler) + err := c.Watch(source.Kind(cs, &kruiseappsv1beta1.StatefulSet{}), handler) if err != nil { return err } @@ -138,7 +139,7 @@ func GetGVKFrom(workloadRef *rolloutv1beta1.ObjectRef) schema.GroupVersionKind { return schema.FromAPIVersionAndKind(workloadRef.APIVersion, workloadRef.Kind) } -func AddWatcherDynamically(c controller.Controller, h handler.EventHandler, gvk schema.GroupVersionKind) (bool, error) { +func AddWatcherDynamically(cs cache.Cache, c controller.Controller, h handler.EventHandler, gvk schema.GroupVersionKind) (bool, error) { if !DiscoverGVK(gvk) { klog.Errorf("Failed to find GVK(%v) in cluster", gvk.String()) return false, nil @@ -146,7 +147,7 @@ func AddWatcherDynamically(c controller.Controller, h handler.EventHandler, gvk object := &unstructured.Unstructured{} object.SetGroupVersionKind(gvk) - return true, c.Watch(&source.Kind{Type: object}, h) + return true, c.Watch(source.Kind(cs, object), h) } func HashReleasePlanBatches(releasePlan *rolloutv1beta1.ReleasePlan) string { diff --git a/pkg/webhook/rollout/validating/rollout_create_update_handler.go b/pkg/webhook/rollout/validating/rollout_create_update_handler.go index 6ed46b0..d510781 100644 --- a/pkg/webhook/rollout/validating/rollout_create_update_handler.go +++ b/pkg/webhook/rollout/validating/rollout_create_update_handler.go @@ -32,7 +32,6 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) @@ -375,22 +374,6 @@ func IsSameWorkloadRefGVKName(a, b *appsv1beta1.ObjectRef) bool { return reflect.DeepEqual(a, b) } -var _ inject.Client = &RolloutCreateUpdateHandler{} - -// InjectClient injects the client into the RolloutCreateUpdateHandler -func (h *RolloutCreateUpdateHandler) InjectClient(c client.Client) error { - h.Client = c - return nil -} - -var _ admission.DecoderInjector = &RolloutCreateUpdateHandler{} - -// InjectDecoder injects the decoder into the RolloutCreateUpdateHandler -func (h *RolloutCreateUpdateHandler) InjectDecoder(d *admission.Decoder) error { - h.Decoder = d - return nil -} - func GetContextFromv1beta1Rollout(rollout *appsv1beta1.Rollout) *validateContext { if rollout.Spec.Strategy.Canary == nil && rollout.Spec.Strategy.BlueGreen == nil { return &validateContext{} diff --git a/pkg/webhook/rollout/validating/webhooks.go b/pkg/webhook/rollout/validating/webhooks.go index 8eb1146..2c61238 100644 --- a/pkg/webhook/rollout/validating/webhooks.go +++ b/pkg/webhook/rollout/validating/webhooks.go @@ -28,7 +28,7 @@ var ( // HandlerMap contains admission webhook handlers HandlerMap = map[string]types.HandlerGetter{ "validate-rollouts-kruise-io-rollout": func(mgr manager.Manager) admission.Handler { - decoder, _ := admission.NewDecoder(mgr.GetScheme()) + decoder := admission.NewDecoder(mgr.GetScheme()) return &RolloutCreateUpdateHandler{Decoder: decoder, Client: mgr.GetClient()} }, } diff --git a/pkg/webhook/server.go b/pkg/webhook/server.go index e489db3..f6d4e40 100644 --- a/pkg/webhook/server.go +++ b/pkg/webhook/server.go @@ -22,7 +22,6 @@ import ( "github.com/openkruise/rollouts/pkg/webhook/types" "time" - webhookutil "github.com/openkruise/rollouts/pkg/webhook/util" webhookcontroller "github.com/openkruise/rollouts/pkg/webhook/util/controller" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/rest" @@ -81,9 +80,6 @@ func filterActiveHandlers() { func SetupWithManager(mgr manager.Manager) error { server := mgr.GetWebhookServer() - server.Host = "0.0.0.0" - server.Port = webhookutil.GetPort() - server.CertDir = webhookutil.GetCertDir() // register admission handlers filterActiveHandlers() @@ -96,7 +92,8 @@ func SetupWithManager(mgr manager.Manager) error { return err } // register conversion webhook - server.Register("/convert", &conversion.Webhook{}) + server.Register("/convert", conversion.NewWebhookHandler(mgr.GetScheme())) + klog.Infof("webhook init done") return nil } diff --git a/pkg/webhook/workload/mutating/unified_update_handler_test.go b/pkg/webhook/workload/mutating/unified_update_handler_test.go index 3e70c28..d6fb97d 100644 --- a/pkg/webhook/workload/mutating/unified_update_handler_test.go +++ b/pkg/webhook/workload/mutating/unified_update_handler_test.go @@ -68,7 +68,7 @@ func TestHandleStatefulSet(t *testing.T) { }, } - decoder, _ := admission.NewDecoder(scheme) + decoder := admission.NewDecoder(scheme) for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { client := fake.NewClientBuilder().WithScheme(scheme).Build() diff --git a/pkg/webhook/workload/mutating/webhooks.go b/pkg/webhook/workload/mutating/webhooks.go index 490e032..52af285 100644 --- a/pkg/webhook/workload/mutating/webhooks.go +++ b/pkg/webhook/workload/mutating/webhooks.go @@ -32,20 +32,20 @@ var ( // HandlerMap contains admission webhook handlers HandlerMap = map[string]types.HandlerGetter{ "mutate-apps-kruise-io-v1alpha1-cloneset": func(mgr manager.Manager) admission.Handler { - decoder, _ := admission.NewDecoder(mgr.GetScheme()) + decoder := admission.NewDecoder(mgr.GetScheme()) return &WorkloadHandler{Decoder: decoder, Client: mgr.GetClient(), Finder: util.NewControllerFinder(mgr.GetClient())} }, "mutate-apps-v1-deployment": func(mgr manager.Manager) admission.Handler { - decoder, _ := admission.NewDecoder(mgr.GetScheme()) + decoder := admission.NewDecoder(mgr.GetScheme()) return &WorkloadHandler{Decoder: decoder, Client: mgr.GetClient(), Finder: util.NewControllerFinder(mgr.GetClient())} }, "mutate-apps-kruise-io-v1alpha1-daemonset": func(mgr manager.Manager) admission.Handler { - decoder, _ := admission.NewDecoder(mgr.GetScheme()) + decoder := admission.NewDecoder(mgr.GetScheme()) return &WorkloadHandler{Decoder: decoder, Client: mgr.GetClient(), Finder: util.NewControllerFinder(mgr.GetClient())} }, "mutate-unified-workload": func(mgr manager.Manager) admission.Handler { - decoder, _ := admission.NewDecoder(mgr.GetScheme()) + decoder := admission.NewDecoder(mgr.GetScheme()) return &UnifiedWorkloadHandler{Decoder: decoder, Client: mgr.GetClient(), Finder: util.NewControllerFinder(mgr.GetClient())} }, } diff --git a/pkg/webhook/workload/mutating/workload_update_handler_test.go b/pkg/webhook/workload/mutating/workload_update_handler_test.go index 17aaafb..2fccfac 100644 --- a/pkg/webhook/workload/mutating/workload_update_handler_test.go +++ b/pkg/webhook/workload/mutating/workload_update_handler_test.go @@ -690,7 +690,7 @@ func TestHandlerDeployment(t *testing.T) { }, } - decoder, _ := admission.NewDecoder(scheme) + decoder := admission.NewDecoder(scheme) for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { client := fake.NewClientBuilder().WithScheme(scheme).Build() @@ -762,7 +762,7 @@ func TestHandlerCloneSet(t *testing.T) { }, } - decoder, _ := admission.NewDecoder(scheme) + decoder := admission.NewDecoder(scheme) for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { client := fake.NewClientBuilder().WithScheme(scheme).Build() @@ -826,7 +826,7 @@ func TestHandlerDaemonSet(t *testing.T) { }, } - decoder, _ := admission.NewDecoder(scheme) + decoder := admission.NewDecoder(scheme) for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { client := fake.NewClientBuilder().WithScheme(scheme).Build() @@ -892,7 +892,7 @@ func TestCheckWorkloadRule(t *testing.T) { d2, err := json.Marshal(deploy2) assert.NoError(t, err) - decoder, _ := admission.NewDecoder(scheme) + decoder := admission.NewDecoder(scheme) client := fake.NewClientBuilder().WithScheme(scheme).Build() h := WorkloadHandler{ Client: client, diff --git a/test/kind-conf.yaml b/test/kind-conf.yaml index bb854bf..ae8cd30 100644 --- a/test/kind-conf.yaml +++ b/test/kind-conf.yaml @@ -4,5 +4,3 @@ nodes: - role: control-plane - role: worker - role: worker -featureGates: - EphemeralContainers: true