From e56f18849fe55eaa988cd2c712d1aeb5b37e95e1 Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Tue, 15 Jun 2021 15:31:43 +0800 Subject: [PATCH] Change deps and enable action Signed-off-by: Jian Qiu --- .github/workflows/dco.yml | 22 +++ .github/workflows/go-postsubmit.yml | 36 +++++ .github/workflows/go-presubmit.yml | 128 ++++++++++++++++++ Makefile | 1 + cmd/work/main.go | 6 +- go.mod | 10 +- go.sum | 20 ++- pkg/cmd/spoke/agent.go | 4 +- pkg/cmd/webhook/webhook.go | 2 +- pkg/helper/helper_test.go | 4 +- pkg/helper/helpers.go | 4 +- .../appliedmanifestwork_controller.go | 10 +- .../appliedmanifestwork_controller_test.go | 8 +- .../add_finalizer_controller.go | 10 +- .../add_finalizer_controller_test.go | 8 +- ...appliedmanifestwork_finalize_controller.go | 12 +- ...edmanifestwork_finalize_controller_test.go | 8 +- .../manifestwork_finalize_controller.go | 10 +- .../manifestwork_finalize_controller_test.go | 10 +- .../manifestwork_controller.go | 12 +- .../manifestwork_controller_test.go | 10 +- .../availablestatus_controller.go | 10 +- .../availablestatus_controller_test.go | 6 +- pkg/spoke/spokeagent.go | 14 +- .../spoketesting/manifestwork_helpers.go | 2 +- pkg/webhook/manifestwork_webhook.go | 2 +- pkg/webhook/manifestwork_webhook_test.go | 2 +- sonar-project.properties | 10 -- test/e2e/deployer.go | 4 +- test/e2e/suite_test.go | 2 +- test/e2e/webhook_test.go | 2 +- test/e2e/work_agent_test.go | 2 +- test/integration/suite_test.go | 8 +- test/integration/util/assertion.go | 4 +- test/integration/util/util.go | 2 +- test/integration/work_test.go | 8 +- .../api/core/v1/annotation_key_constants.go | 4 +- .../pkg/api/resource/quantity_proto.go | 2 +- vendor/modules.txt | 32 ++--- .../api/LICENSE | 0 .../work/clientset/versioned/clientset.go | 2 +- .../client/work/clientset/versioned/doc.go | 0 .../versioned/fake/clientset_generated.go | 6 +- .../work/clientset/versioned/fake/doc.go | 0 .../work/clientset/versioned/fake/register.go | 2 +- .../work/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 2 +- .../typed/work/v1/appliedmanifestwork.go | 4 +- .../clientset/versioned/typed/work/v1/doc.go | 0 .../versioned/typed/work/v1/fake/doc.go | 0 .../work/v1/fake/fake_appliedmanifestwork.go | 2 +- .../typed/work/v1/fake/fake_manifestwork.go | 2 +- .../typed/work/v1/fake/fake_work_client.go | 2 +- .../typed/work/v1/generated_expansion.go | 0 .../versioned/typed/work/v1/manifestwork.go | 4 +- .../versioned/typed/work/v1/work_client.go | 4 +- .../informers/externalversions/factory.go | 6 +- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/work/interface.go | 4 +- .../work/v1/appliedmanifestwork.go | 8 +- .../externalversions/work/v1/interface.go | 2 +- .../externalversions/work/v1/manifestwork.go | 8 +- .../listers/work/v1/appliedmanifestwork.go | 2 +- .../listers/work/v1/expansion_generated.go | 0 .../work/listers/work/v1/manifestwork.go | 2 +- ...uster-management.io_manifestworks.crd.yaml | 0 ...anagement.io_appliedmanifestworks.crd.yaml | 0 ...anagement.io_appliedmanifestworks.crd.yaml | 0 .../api/work/v1/doc.go | 2 +- .../api/work/v1/register.go | 0 .../api/work/v1/types.go | 2 +- .../api/work/v1/zz_generated.deepcopy.go | 0 .../v1/zz_generated.swagger_doc_generated.go | 0 74 files changed, 347 insertions(+), 174 deletions(-) create mode 100644 .github/workflows/dco.yml create mode 100644 .github/workflows/go-postsubmit.yml create mode 100644 .github/workflows/go-presubmit.yml delete mode 100644 sonar-project.properties rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/LICENSE (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/clientset.go (95%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/doc.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/fake/clientset_generated.go (86%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/fake/doc.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/fake/register.go (95%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/scheme/doc.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/scheme/register.go (95%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go (97%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/doc.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/fake/doc.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go (98%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go (98%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go (87%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/generated_expansion.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go (97%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/clientset/versioned/typed/work/v1/work_client.go (93%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/factory.go (94%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/generic.go (96%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go (90%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/work/interface.go (79%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go (89%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/work/v1/interface.go (91%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/informers/externalversions/work/v1/manifestwork.go (89%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/listers/work/v1/appliedmanifestwork.go (97%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/listers/work/v1/expansion_generated.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/client/work/listers/work/v1/manifestwork.go (98%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/0001_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/doc.go (79%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/register.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/types.go (99%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/zz_generated.deepcopy.go (100%) rename vendor/{github.com/open-cluster-management => open-cluster-management.io}/api/work/v1/zz_generated.swagger_doc_generated.go (100%) diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml new file mode 100644 index 000000000..1734a8aad --- /dev/null +++ b/.github/workflows/dco.yml @@ -0,0 +1,22 @@ +name: DCO +on: + workflow_dispatch: {} + pull_request: + branches: + - main + - release-* + +jobs: + dco_check: + runs-on: ubuntu-latest + name: DCO Check + steps: + - name: Get PR Commits + id: 'get-pr-commits' + uses: tim-actions/get-pr-commits@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: DCO Check + uses: tim-actions/dco@master + with: + commits: ${{ steps.get-pr-commits.outputs.commits }} diff --git a/.github/workflows/go-postsubmit.yml b/.github/workflows/go-postsubmit.yml new file mode 100644 index 000000000..9ae063e2d --- /dev/null +++ b/.github/workflows/go-postsubmit.yml @@ -0,0 +1,36 @@ +name: GoPostSubmit + +on: + push: + branches: + - main + - release-* + workflow_dispatch: {} + +env: + # Common versions + GO_VERSION: '1.16' + GO_REQUIRED_MIN_VERSION: '' + GOPATH: '/home/runner/work/work/work/go' +defaults: + run: + working-directory: go/src/open-cluster-management.io/work + +jobs: + verify: + name: images + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: install imagebuilder + run: go install github.com/openshift/imagebuilder/cmd/imagebuilder@v1.2.1 + - name: images + run: make images diff --git a/.github/workflows/go-presubmit.yml b/.github/workflows/go-presubmit.yml new file mode 100644 index 000000000..415318b68 --- /dev/null +++ b/.github/workflows/go-presubmit.yml @@ -0,0 +1,128 @@ +name: Go + +on: + workflow_dispatch: {} + pull_request: + branches: + - main + - release-* + +env: + # Common versions + GO_VERSION: '1.16' + GO_REQUIRED_MIN_VERSION: '' + GOPATH: '/home/runner/work/work/work/go' +defaults: + run: + working-directory: go/src/open-cluster-management.io/work + +jobs: + verify: + name: verify + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: verify + run: make verify + + verify-deps: + name: verify-deps + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: verify-deps + run: make verify-deps + + build: + name: build + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: build + run: make build + + unit: + name: unit + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: unit + run: make test + + integration: + name: integration + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: integration + run: make test-integration + + e2e: + name: e2e + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + path: go/src/open-cluster-management.io/work + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: install imagebuilder + run: go install github.com/openshift/imagebuilder/cmd/imagebuilder@v1.2.1 + - name: images + run: make images + - name: setup kind + uses: engineerd/setup-kind@v0.5.0 + with: + version: v0.10.0 + - name: Load image on the nodes of the cluster + run: | + kind load docker-image --name=kind quay.io/open-cluster-management/work:latest + - name: Run e2e test + run: | + make test-e2e + env: + KUBECONFIG: /home/runner/.kube/config diff --git a/Makefile b/Makefile index d14000459..9fa24cc8c 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +SHELL :=/bin/bash all: build .PHONY: all diff --git a/cmd/work/main.go b/cmd/work/main.go index 946b00f9b..7c86ae89a 100644 --- a/cmd/work/main.go +++ b/cmd/work/main.go @@ -13,9 +13,9 @@ import ( utilflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" - "github.com/open-cluster-management/work/pkg/cmd/spoke" - "github.com/open-cluster-management/work/pkg/cmd/webhook" - "github.com/open-cluster-management/work/pkg/version" + "open-cluster-management.io/work/pkg/cmd/spoke" + "open-cluster-management.io/work/pkg/cmd/webhook" + "open-cluster-management.io/work/pkg/version" ) func main() { diff --git a/go.mod b/go.mod index f3e6a7b23..386ac2a6c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/open-cluster-management/work +module open-cluster-management.io/work go 1.16 @@ -9,20 +9,20 @@ require ( github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/onsi/ginkgo v1.14.0 github.com/onsi/gomega v1.10.1 - github.com/open-cluster-management/api v0.0.0-20210401125741-b719117321e2 github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359 github.com/openshift/generic-admission-server v1.14.1-0.20200903115324-4ddcdd976480 github.com/openshift/library-go v0.0.0-20210407140145-f831e911c638 github.com/spf13/cobra v1.1.1 github.com/spf13/pflag v1.0.5 - k8s.io/api v0.21.0-rc.0 + k8s.io/api v0.21.1 k8s.io/apiextensions-apiserver v0.21.0-rc.0 - k8s.io/apimachinery v0.21.0-rc.0 + k8s.io/apimachinery v0.21.1 k8s.io/apiserver v0.21.0-rc.0 - k8s.io/client-go v0.21.0-rc.0 + k8s.io/client-go v0.21.1 k8s.io/component-base v0.21.0-rc.0 k8s.io/klog/v2 v2.8.0 k8s.io/kube-aggregator v0.21.0-rc.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 + open-cluster-management.io/api v0.0.0-20210610125115-f57c747b84aa sigs.k8s.io/controller-runtime v0.6.1-0.20200829232221-efc74d056b24 ) diff --git a/go.sum b/go.sum index 743978938..924f10df1 100644 --- a/go.sum +++ b/go.sum @@ -27,11 +27,9 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= @@ -39,7 +37,6 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= @@ -418,8 +415,6 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/open-cluster-management/api v0.0.0-20210401125741-b719117321e2 h1:lGIdJHJFm8sF1LeCZ45b//+4OSYAavE6u7swYmCVSuo= -github.com/open-cluster-management/api v0.0.0-20210401125741-b719117321e2/go.mod h1:ot+A1DWq+v1IV+e1S7nhIteYAmNByFgtazvzpoeAfRQ= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/openshift/api v0.0.0-20210331162552-3e31249e6a55/go.mod h1:dZ4kytOo3svxJHNYd0J55hwe/6IQG5gAUHUE0F3Jkio= @@ -714,7 +709,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= @@ -902,9 +896,9 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= k8s.io/api v0.18.0-beta.2/go.mod h1:2oeNnWEqcSmaM/ibSh3t7xcIqbkGXhzZdn4ezV9T4m0= k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= -k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg= -k8s.io/api v0.21.0-rc.0 h1:t/kW96KdNJNamYNqxaxRirahK+FaWJQ6BJPbXm5Jb+o= k8s.io/api v0.21.0-rc.0/go.mod h1:Dkc/ZauWJrgZhjOjeBgW89xZQiTBJA2RaBKYHXPsi2Y= +k8s.io/api v0.21.1 h1:94bbZ5NTjdINJEdzOkpS4vdPhkb1VFpTYC9zh43f75c= +k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/apiextensions-apiserver v0.17.0/go.mod h1:XiIFUakZywkUl54fVXa7QTEHcqQz9HG55nHd1DCoHj8= k8s.io/apiextensions-apiserver v0.18.0-beta.2/go.mod h1:Hnrg5jx8/PbxRbUoqDGxtQkULjwx8FDW4WYJaKNK+fk= k8s.io/apiextensions-apiserver v0.19.0/go.mod h1:znfQxNpjqz/ZehvbfMg5N6fvBJW5Lqu5HVLTJQdP4Fs= @@ -913,9 +907,9 @@ k8s.io/apiextensions-apiserver v0.21.0-rc.0/go.mod h1:ItIoMBJU1gy93Qwr/B2699r4b0 k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.18.0-beta.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.21.0-rc.0 h1:m9dyzHb8QZAHOZKIz2SiabSif1oLsfgrnwiago/9xJA= k8s.io/apimachinery v0.21.0-rc.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= +k8s.io/apimachinery v0.21.1 h1:Q6XuHGlj2xc+hlMCvqyYfbv3H7SRGn2c8NycxJquDVs= +k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg= k8s.io/apiserver v0.18.0-beta.2/go.mod h1:bnblMkMoCFnIfVnVftd0SXJPzyvrk3RtaqSbblphF/A= k8s.io/apiserver v0.19.0/go.mod h1:XvzqavYj73931x7FLtyagh8WibHpePJ1QwWrSJs2CLk= @@ -924,9 +918,9 @@ k8s.io/apiserver v0.21.0-rc.0/go.mod h1:QlW7+1CZTZtAcKvJ34/n4DIb8sC93FeQpkd1KSU+ k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= k8s.io/client-go v0.18.0-beta.2/go.mod h1:UvuVxHjKWIcgy0iMvF+bwNDW7l0mskTNOaOW1Qv5BMA= k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU= -k8s.io/client-go v0.20.0/go.mod h1:4KWh/g+Ocd8KkCwKF8vUNnmqgv+EVnQDK4MBF4oB5tY= -k8s.io/client-go v0.21.0-rc.0 h1:lsPZHT1ZniXJcwg2udlaTOhAT8wf7BE0rn9Vj0+LWMA= k8s.io/client-go v0.21.0-rc.0/go.mod h1:zU5HY/bSOKH3YOqoge9nFvICgrpeSdJu8DQ4fkjKIZk= +k8s.io/client-go v0.21.1 h1:bhblWYLZKUu+pm50plvQF8WpY6TXdRRtcS/K9WauOj4= +k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/code-generator v0.18.0-beta.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.19.0/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= @@ -973,6 +967,8 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +open-cluster-management.io/api v0.0.0-20210610125115-f57c747b84aa h1:Jw/Jo3Om1xXgdcn6xDfyREkc48nUcW/DqhMHffLCCww= +open-cluster-management.io/api v0.0.0-20210610125115-f57c747b84aa/go.mod h1:9qiA5h/8kvPQnJEOlAPHVjRO9a1jCmDhGzvgMBvXEaE= 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= diff --git a/pkg/cmd/spoke/agent.go b/pkg/cmd/spoke/agent.go index 3d6517db0..1ea8a5b4e 100644 --- a/pkg/cmd/spoke/agent.go +++ b/pkg/cmd/spoke/agent.go @@ -5,8 +5,8 @@ import ( "github.com/openshift/library-go/pkg/controller/controllercmd" - "github.com/open-cluster-management/work/pkg/spoke" - "github.com/open-cluster-management/work/pkg/version" + "open-cluster-management.io/work/pkg/spoke" + "open-cluster-management.io/work/pkg/version" ) // NewWorkloadAgent generates a command to start workload agent diff --git a/pkg/cmd/webhook/webhook.go b/pkg/cmd/webhook/webhook.go index e20ba55ff..7ce104349 100644 --- a/pkg/cmd/webhook/webhook.go +++ b/pkg/cmd/webhook/webhook.go @@ -3,10 +3,10 @@ package webhook import ( "os" - "github.com/open-cluster-management/work/pkg/webhook" admissionserver "github.com/openshift/generic-admission-server/pkg/cmd/server" "github.com/spf13/cobra" genericapiserver "k8s.io/apiserver/pkg/server" + "open-cluster-management.io/work/pkg/webhook" ) func NewAdmissionHook() *cobra.Command { diff --git a/pkg/helper/helper_test.go b/pkg/helper/helper_test.go index 2d9cb4973..580450abe 100644 --- a/pkg/helper/helper_test.go +++ b/pkg/helper/helper_test.go @@ -5,8 +5,6 @@ import ( "testing" "time" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workapiv1 "github.com/open-cluster-management/api/work/v1" "github.com/openshift/library-go/pkg/operator/events/eventstesting" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" @@ -16,6 +14,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" fakedynamic "k8s.io/client-go/dynamic/fake" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workapiv1 "open-cluster-management.io/api/work/v1" ) func newCondition(name, status, reason, message string, lastTransition *metav1.Time) metav1.Condition { diff --git a/pkg/helper/helpers.go b/pkg/helper/helpers.go index f84efdea9..b3dc4f7e2 100644 --- a/pkg/helper/helpers.go +++ b/pkg/helper/helpers.go @@ -7,8 +7,6 @@ import ( "strings" "time" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workapiv1 "github.com/open-cluster-management/api/work/v1" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourcehelper" @@ -24,6 +22,8 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/util/retry" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" ) const ( diff --git a/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go b/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go index 2e613f261..f8a86466b 100644 --- a/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go +++ b/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go @@ -17,13 +17,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workinformer "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" - worklister "github.com/open-cluster-management/api/client/work/listers/work/v1" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/helper" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/helper" ) // AppliedManifestWorkController is to sync the applied resources of appliedmanifestwork with related diff --git a/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go b/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go index 43c525ad0..2f905e435 100644 --- a/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go +++ b/pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go @@ -7,16 +7,16 @@ import ( "time" "github.com/davecgh/go-spew/spew" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workinformers "github.com/open-cluster-management/api/client/work/informers/externalversions" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" "k8s.io/utils/diff" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workinformers "open-cluster-management.io/api/client/work/informers/externalversions" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke/spoketesting" ) func newManifest(group, version, resource, namespace, name string) workapiv1.ManifestCondition { diff --git a/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller.go b/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller.go index f1bf15f08..5ecf49ae9 100644 --- a/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller.go +++ b/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller.go @@ -3,7 +3,7 @@ package finalizercontroller import ( "context" - workapiv1 "github.com/open-cluster-management/api/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -11,12 +11,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workinformer "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" - worklister "github.com/open-cluster-management/api/client/work/listers/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/controllers" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + "open-cluster-management.io/work/pkg/spoke/controllers" ) // AddFinalizerController is to add the cluster.open-cluster-management.io/manifest-work-cleanup finalizer to manifestworks. diff --git a/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go b/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go index 82bc9c610..f16ad67b1 100644 --- a/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go +++ b/pkg/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/controllers" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clienttesting "k8s.io/client-go/testing" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke/controllers" + "open-cluster-management.io/work/pkg/spoke/spoketesting" ) func TestAddFinalizer(t *testing.T) { diff --git a/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go b/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go index 26f0e789c..fd921a5f8 100644 --- a/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go +++ b/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go @@ -5,12 +5,6 @@ import ( "fmt" "time" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workinformer "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" - worklister "github.com/open-cluster-management/api/client/work/listers/work/v1" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/helper" - "github.com/open-cluster-management/work/pkg/spoke/controllers" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" @@ -21,6 +15,12 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/helper" + "open-cluster-management.io/work/pkg/spoke/controllers" ) // AppliedManifestWorkFinalizeController handles cleanup of appliedmanifestwork resources before deletion is allowed. diff --git a/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go b/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go index 0626ea449..9990a3077 100644 --- a/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go +++ b/pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go @@ -7,16 +7,16 @@ import ( "time" "github.com/davecgh/go-spew/spew" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/controllers" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke/controllers" + "open-cluster-management.io/work/pkg/spoke/spoketesting" ) func TestFinalize(t *testing.T) { diff --git a/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go b/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go index 679f1fcfd..2b23caefe 100644 --- a/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go +++ b/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go @@ -5,11 +5,6 @@ import ( "fmt" "time" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workinformer "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" - worklister "github.com/open-cluster-management/api/client/work/listers/work/v1" - "github.com/open-cluster-management/work/pkg/helper" - "github.com/open-cluster-management/work/pkg/spoke/controllers" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" @@ -18,6 +13,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + "open-cluster-management.io/work/pkg/helper" + "open-cluster-management.io/work/pkg/spoke/controllers" ) // ManifestWorkFinalizeController handles cleanup of manifestwork resources before deletion is allowed. diff --git a/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go b/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go index 65cd5c5d1..7cd195d74 100644 --- a/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go +++ b/pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workinformers "github.com/open-cluster-management/api/client/work/informers/externalversions" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/controllers" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workinformers "open-cluster-management.io/api/client/work/informers/externalversions" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke/controllers" + "open-cluster-management.io/work/pkg/spoke/spoketesting" ) func TestSyncManifestWorkController(t *testing.T) { diff --git a/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go b/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go index ae4d9506e..c81502c49 100644 --- a/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go +++ b/pkg/spoke/controllers/manifestcontroller/manifestwork_controller.go @@ -21,16 +21,16 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workinformer "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" - worklister "github.com/open-cluster-management/api/client/work/listers/work/v1" - workapiv1 "github.com/open-cluster-management/api/work/v1" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" - "github.com/open-cluster-management/work/pkg/helper" - "github.com/open-cluster-management/work/pkg/spoke/controllers" + "open-cluster-management.io/work/pkg/helper" + "open-cluster-management.io/work/pkg/spoke/controllers" ) var ResyncInterval = 5 * time.Minute diff --git a/pkg/spoke/controllers/manifestcontroller/manifestwork_controller_test.go b/pkg/spoke/controllers/manifestcontroller/manifestwork_controller_test.go index 0a2dccd24..6f5139549 100644 --- a/pkg/spoke/controllers/manifestcontroller/manifestwork_controller_test.go +++ b/pkg/spoke/controllers/manifestcontroller/manifestwork_controller_test.go @@ -5,11 +5,6 @@ import ( "testing" "time" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workinformers "github.com/open-cluster-management/api/client/work/informers/externalversions" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/controllers" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/meta" @@ -20,6 +15,11 @@ import ( fakedynamic "k8s.io/client-go/dynamic/fake" fakekube "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workinformers "open-cluster-management.io/api/client/work/informers/externalversions" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke/controllers" + "open-cluster-management.io/work/pkg/spoke/spoketesting" ) type testController struct { diff --git a/pkg/spoke/controllers/statuscontroller/availablestatus_controller.go b/pkg/spoke/controllers/statuscontroller/availablestatus_controller.go index d47bbbad1..a2277057f 100644 --- a/pkg/spoke/controllers/statuscontroller/availablestatus_controller.go +++ b/pkg/spoke/controllers/statuscontroller/availablestatus_controller.go @@ -6,11 +6,6 @@ import ( "reflect" "time" - workv1client "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - workinformer "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" - worklister "github.com/open-cluster-management/api/client/work/listers/work/v1" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/helper" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" @@ -22,6 +17,11 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/dynamic" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/helper" ) // ControllerSyncInterval is exposed so that integration tests can crank up the controller resync speed. diff --git a/pkg/spoke/controllers/statuscontroller/availablestatus_controller_test.go b/pkg/spoke/controllers/statuscontroller/availablestatus_controller_test.go index 34057da77..80b5fef8c 100644 --- a/pkg/spoke/controllers/statuscontroller/availablestatus_controller_test.go +++ b/pkg/spoke/controllers/statuscontroller/availablestatus_controller_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - fakeworkclient "github.com/open-cluster-management/api/client/work/clientset/versioned/fake" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke/spoketesting" ) func TestSyncManifestWork(t *testing.T) { diff --git a/pkg/spoke/spokeagent.go b/pkg/spoke/spokeagent.go index 483246430..aaeda26ed 100644 --- a/pkg/spoke/spokeagent.go +++ b/pkg/spoke/spokeagent.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/open-cluster-management/work/pkg/helper" - "github.com/open-cluster-management/work/pkg/spoke/controllers/appliedmanifestcontroller" - "github.com/open-cluster-management/work/pkg/spoke/controllers/finalizercontroller" - "github.com/open-cluster-management/work/pkg/spoke/controllers/manifestcontroller" - "github.com/open-cluster-management/work/pkg/spoke/controllers/statuscontroller" + "open-cluster-management.io/work/pkg/helper" + "open-cluster-management.io/work/pkg/spoke/controllers/appliedmanifestcontroller" + "open-cluster-management.io/work/pkg/spoke/controllers/finalizercontroller" + "open-cluster-management.io/work/pkg/spoke/controllers/manifestcontroller" + "open-cluster-management.io/work/pkg/spoke/controllers/statuscontroller" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "github.com/openshift/library-go/pkg/controller/controllercmd" @@ -18,8 +18,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - workclientset "github.com/open-cluster-management/api/client/work/clientset/versioned" - workinformers "github.com/open-cluster-management/api/client/work/informers/externalversions" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + workinformers "open-cluster-management.io/api/client/work/informers/externalversions" ) // WorkloadAgentOptions defines the flags for workload agent diff --git a/pkg/spoke/spoketesting/manifestwork_helpers.go b/pkg/spoke/spoketesting/manifestwork_helpers.go index fa5f558d8..80b0e899c 100644 --- a/pkg/spoke/spoketesting/manifestwork_helpers.go +++ b/pkg/spoke/spoketesting/manifestwork_helpers.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - workapiv1 "github.com/open-cluster-management/api/work/v1" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/events/eventstesting" corev1 "k8s.io/api/core/v1" @@ -15,6 +14,7 @@ import ( "k8s.io/client-go/restmapper" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + workapiv1 "open-cluster-management.io/api/work/v1" ) type FakeSyncContext struct { diff --git a/pkg/webhook/manifestwork_webhook.go b/pkg/webhook/manifestwork_webhook.go index 786b465f5..b0910dd02 100644 --- a/pkg/webhook/manifestwork_webhook.go +++ b/pkg/webhook/manifestwork_webhook.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - workv1 "github.com/open-cluster-management/api/work/v1" + workv1 "open-cluster-management.io/api/work/v1" admissionv1beta1 "k8s.io/api/admission/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/webhook/manifestwork_webhook_test.go b/pkg/webhook/manifestwork_webhook_test.go index 6a8016f42..dc45c9884 100644 --- a/pkg/webhook/manifestwork_webhook_test.go +++ b/pkg/webhook/manifestwork_webhook_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/open-cluster-management/work/pkg/spoke/spoketesting" + "open-cluster-management.io/work/pkg/spoke/spoketesting" admissionv1beta1 "k8s.io/api/admission/v1beta1" authenticationv1 "k8s.io/api/authentication/v1" diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index ab23a5d4d..000000000 --- a/sonar-project.properties +++ /dev/null @@ -1,10 +0,0 @@ -sonar.projectKey=open-cluster-management_work -sonar.projectName=work -sonar.sources=. -sonar.exclusions=**/*_test.go,**/*_generated*.go,**/*_generated/**,**/vendor/**,**/test/**,**/cmd/**,**/pkg/cmd/** -sonar.tests=. -sonar.test.inclusions=**/*_test.go -sonar.test.exclusions=**/*_generated*.go,**/*_generated/**,**/vendor/** -sonar.go.tests.reportPaths=report.json -sonar.go.coverage.reportPaths=coverage.out -sonar.externalIssuesReportPaths=gosec.json diff --git a/test/e2e/deployer.go b/test/e2e/deployer.go index a31283c31..ab389319f 100644 --- a/test/e2e/deployer.go +++ b/test/e2e/deployer.go @@ -9,8 +9,6 @@ import ( "reflect" "time" - workclientset "github.com/open-cluster-management/api/client/work/clientset/versioned" - "github.com/open-cluster-management/work/test/e2e/bindata" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" corev1 "k8s.io/api/core/v1" @@ -30,6 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + "open-cluster-management.io/work/test/e2e/bindata" ) var ( diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index 6e11ded92..a77320e8d 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -9,7 +9,6 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" - workclientset "github.com/open-cluster-management/api/client/work/clientset/versioned" corev1 "k8s.io/api/core/v1" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" @@ -20,6 +19,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) diff --git a/test/e2e/webhook_test.go b/test/e2e/webhook_test.go index aacb0b988..967901a10 100644 --- a/test/e2e/webhook_test.go +++ b/test/e2e/webhook_test.go @@ -8,12 +8,12 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" - workapiv1 "github.com/open-cluster-management/api/work/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/util/retry" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + workapiv1 "open-cluster-management.io/api/work/v1" ) const ( diff --git a/test/e2e/work_agent_test.go b/test/e2e/work_agent_test.go index b81432df1..50f1ff357 100644 --- a/test/e2e/work_agent_test.go +++ b/test/e2e/work_agent_test.go @@ -10,7 +10,6 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" - workapiv1 "github.com/open-cluster-management/api/work/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -20,6 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + workapiv1 "open-cluster-management.io/api/work/v1" ) const ( diff --git a/test/integration/suite_test.go b/test/integration/suite_test.go index 886c0ab61..4e93e0630 100644 --- a/test/integration/suite_test.go +++ b/test/integration/suite_test.go @@ -17,10 +17,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - workclientset "github.com/open-cluster-management/api/client/work/clientset/versioned" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/helper" - "github.com/open-cluster-management/work/test/integration/util" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/helper" + "open-cluster-management.io/work/test/integration/util" ) const ( diff --git a/test/integration/util/assertion.go b/test/integration/util/assertion.go index a57d150c5..616678be5 100644 --- a/test/integration/util/assertion.go +++ b/test/integration/util/assertion.go @@ -17,8 +17,8 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" - workclientset "github.com/open-cluster-management/api/client/work/clientset/versioned" - workapiv1 "github.com/open-cluster-management/api/work/v1" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + workapiv1 "open-cluster-management.io/api/work/v1" ) func AssertWorkCondition(namespace, name string, workClient workclientset.Interface, expectedType string, expectedWorkStatus metav1.ConditionStatus, diff --git a/test/integration/util/util.go b/test/integration/util/util.go index c0b6b3fe6..f0e91ce52 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -14,7 +14,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - workapiv1 "github.com/open-cluster-management/api/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" ) func HaveManifestCondition(conditions []workapiv1.ManifestCondition, expectedType string, expectedStatuses []metav1.ConditionStatus) bool { diff --git a/test/integration/work_test.go b/test/integration/work_test.go index 64ff2e8ca..a6c62a4ce 100644 --- a/test/integration/work_test.go +++ b/test/integration/work_test.go @@ -17,10 +17,10 @@ import ( utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/dynamic" - workapiv1 "github.com/open-cluster-management/api/work/v1" - "github.com/open-cluster-management/work/pkg/spoke" - "github.com/open-cluster-management/work/pkg/spoke/controllers/statuscontroller" - "github.com/open-cluster-management/work/test/integration/util" + workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/work/pkg/spoke" + "open-cluster-management.io/work/pkg/spoke/controllers/statuscontroller" + "open-cluster-management.io/work/test/integration/util" ) func startWorkAgent(ctx context.Context, o *spoke.WorkloadAgentOptions) { diff --git a/vendor/k8s.io/api/core/v1/annotation_key_constants.go b/vendor/k8s.io/api/core/v1/annotation_key_constants.go index 612f6aa74..22476b2bd 100644 --- a/vendor/k8s.io/api/core/v1/annotation_key_constants.go +++ b/vendor/k8s.io/api/core/v1/annotation_key_constants.go @@ -148,7 +148,7 @@ const ( PodDeletionCost = "controller.kubernetes.io/pod-deletion-cost" // AnnotationTopologyAwareHints can be used to enable or disable Topology - // Aware Hints for a Service. This may be set to "auto" or "disabled". Any - // other value is treated as "disabled". + // Aware Hints for a Service. This may be set to "Auto" or "Disabled". Any + // other value is treated as "Disabled". AnnotationTopologyAwareHints = "service.kubernetes.io/topology-aware-hints" ) diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go index f89ca163c..3e0cdb10d 100644 --- a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go +++ b/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go @@ -166,7 +166,7 @@ func (m *Quantity) Unmarshal(data []byte) error { if err != nil { return err } - if skippy < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { diff --git a/vendor/modules.txt b/vendor/modules.txt index 744a327cd..28bef5139 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -138,19 +138,6 @@ github.com/onsi/gomega/matchers/support/goraph/edge github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types -# github.com/open-cluster-management/api v0.0.0-20210401125741-b719117321e2 -## explicit -github.com/open-cluster-management/api/client/work/clientset/versioned -github.com/open-cluster-management/api/client/work/clientset/versioned/fake -github.com/open-cluster-management/api/client/work/clientset/versioned/scheme -github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1 -github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake -github.com/open-cluster-management/api/client/work/informers/externalversions -github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces -github.com/open-cluster-management/api/client/work/informers/externalversions/work -github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1 -github.com/open-cluster-management/api/client/work/listers/work/v1 -github.com/open-cluster-management/api/work/v1 # github.com/openshift/api v0.0.0-20210331193751-3acddb19d360 github.com/openshift/api github.com/openshift/api/apps @@ -450,7 +437,7 @@ gopkg.in/natefinch/lumberjack.v2 gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 -# k8s.io/api v0.21.0-rc.0 +# k8s.io/api v0.21.1 ## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -507,7 +494,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 -# k8s.io/apimachinery v0.21.0-rc.0 +# k8s.io/apimachinery v0.21.1 ## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -688,7 +675,7 @@ k8s.io/apiserver/plugin/pkg/audit/truncate k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/client-go v0.21.0-rc.0 +# k8s.io/client-go v0.21.1 ## explicit k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -994,6 +981,19 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace +# open-cluster-management.io/api v0.0.0-20210610125115-f57c747b84aa +## explicit +open-cluster-management.io/api/client/work/clientset/versioned +open-cluster-management.io/api/client/work/clientset/versioned/fake +open-cluster-management.io/api/client/work/clientset/versioned/scheme +open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1 +open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake +open-cluster-management.io/api/client/work/informers/externalversions +open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces +open-cluster-management.io/api/client/work/informers/externalversions/work +open-cluster-management.io/api/client/work/informers/externalversions/work/v1 +open-cluster-management.io/api/client/work/listers/work/v1 +open-cluster-management.io/api/work/v1 # sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client diff --git a/vendor/github.com/open-cluster-management/api/LICENSE b/vendor/open-cluster-management.io/api/LICENSE similarity index 100% rename from vendor/github.com/open-cluster-management/api/LICENSE rename to vendor/open-cluster-management.io/api/LICENSE diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/clientset.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/clientset.go similarity index 95% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/clientset.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/clientset.go index 854ac0930..0fc75352a 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/clientset.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/clientset.go @@ -5,10 +5,10 @@ package versioned import ( "fmt" - workv1 "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + workv1 "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" ) type Interface interface { diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/doc.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/doc.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/doc.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/doc.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/clientset_generated.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/clientset_generated.go similarity index 86% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/clientset_generated.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/clientset_generated.go index be2c820f3..27941128e 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/clientset_generated.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/clientset_generated.go @@ -3,14 +3,14 @@ package fake import ( - clientset "github.com/open-cluster-management/api/client/work/clientset/versioned" - workv1 "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" - fakeworkv1 "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" + clientset "open-cluster-management.io/api/client/work/clientset/versioned" + workv1 "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + fakeworkv1 "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/doc.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/doc.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/doc.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/doc.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/register.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/register.go similarity index 95% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/register.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/register.go index 8a8962512..b811faba5 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/fake/register.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/fake/register.go @@ -3,12 +3,12 @@ package fake import ( - workv1 "github.com/open-cluster-management/api/work/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + workv1 "open-cluster-management.io/api/work/v1" ) var scheme = runtime.NewScheme() diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/scheme/doc.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/scheme/doc.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/scheme/doc.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/scheme/doc.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/scheme/register.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/scheme/register.go similarity index 95% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/scheme/register.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/scheme/register.go index 28af67b89..85a759144 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/scheme/register.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/scheme/register.go @@ -3,12 +3,12 @@ package scheme import ( - workv1 "github.com/open-cluster-management/api/work/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + workv1 "open-cluster-management.io/api/work/v1" ) var Scheme = runtime.NewScheme() diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go similarity index 97% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go index 506203468..dae98f5cb 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/appliedmanifestwork.go @@ -6,12 +6,12 @@ import ( "context" "time" - scheme "github.com/open-cluster-management/api/client/work/clientset/versioned/scheme" - v1 "github.com/open-cluster-management/api/work/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "open-cluster-management.io/api/client/work/clientset/versioned/scheme" + v1 "open-cluster-management.io/api/work/v1" ) // AppliedManifestWorksGetter has a method to return a AppliedManifestWorkInterface. diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/doc.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/doc.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/doc.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/doc.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/doc.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/doc.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/doc.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/doc.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go similarity index 98% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go index 588b9e83c..2e486b233 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_appliedmanifestwork.go @@ -5,13 +5,13 @@ package fake import ( "context" - workv1 "github.com/open-cluster-management/api/work/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + workv1 "open-cluster-management.io/api/work/v1" ) // FakeAppliedManifestWorks implements AppliedManifestWorkInterface diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go similarity index 98% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go index 1d466bfa7..78fed7c01 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_manifestwork.go @@ -5,13 +5,13 @@ package fake import ( "context" - workv1 "github.com/open-cluster-management/api/work/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + workv1 "open-cluster-management.io/api/work/v1" ) // FakeManifestWorks implements ManifestWorkInterface diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go similarity index 87% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go index d1437c87f..f1ce68b57 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/fake/fake_work_client.go @@ -3,9 +3,9 @@ package fake import ( - v1 "github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1 "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" ) type FakeWorkV1 struct { diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/generated_expansion.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/generated_expansion.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/generated_expansion.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/generated_expansion.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go similarity index 97% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go index 5f0f39ddc..33ff809c1 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/manifestwork.go @@ -6,12 +6,12 @@ import ( "context" "time" - scheme "github.com/open-cluster-management/api/client/work/clientset/versioned/scheme" - v1 "github.com/open-cluster-management/api/work/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "open-cluster-management.io/api/client/work/clientset/versioned/scheme" + v1 "open-cluster-management.io/api/work/v1" ) // ManifestWorksGetter has a method to return a ManifestWorkInterface. diff --git a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/work_client.go b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/work_client.go similarity index 93% rename from vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/work_client.go rename to vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/work_client.go index 8187ff0b7..3eb7563a1 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/clientset/versioned/typed/work/v1/work_client.go +++ b/vendor/open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1/work_client.go @@ -3,9 +3,9 @@ package v1 import ( - "github.com/open-cluster-management/api/client/work/clientset/versioned/scheme" - v1 "github.com/open-cluster-management/api/work/v1" rest "k8s.io/client-go/rest" + "open-cluster-management.io/api/client/work/clientset/versioned/scheme" + v1 "open-cluster-management.io/api/work/v1" ) type WorkV1Interface interface { diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/factory.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/factory.go similarity index 94% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/factory.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/factory.go index 9d96094f5..9aa177437 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/factory.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/factory.go @@ -7,13 +7,13 @@ import ( sync "sync" time "time" - versioned "github.com/open-cluster-management/api/client/work/clientset/versioned" - internalinterfaces "github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces" - work "github.com/open-cluster-management/api/client/work/informers/externalversions/work" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + versioned "open-cluster-management.io/api/client/work/clientset/versioned" + internalinterfaces "open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces" + work "open-cluster-management.io/api/client/work/informers/externalversions/work" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/generic.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/generic.go similarity index 96% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/generic.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/generic.go index 218058473..53490f508 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/generic.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/generic.go @@ -5,9 +5,9 @@ package externalversions import ( "fmt" - v1 "github.com/open-cluster-management/api/work/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + v1 "open-cluster-management.io/api/work/v1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 90% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go index e72f15bb4..e8fb5bcd7 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,10 +5,10 @@ package internalinterfaces import ( time "time" - versioned "github.com/open-cluster-management/api/client/work/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + versioned "open-cluster-management.io/api/client/work/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/interface.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/interface.go similarity index 79% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/interface.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/interface.go index 7a0b67783..b11282589 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/interface.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/interface.go @@ -3,8 +3,8 @@ package work import ( - internalinterfaces "github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces" - v1 "github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1" + internalinterfaces "open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces" + v1 "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" ) // Interface provides access to each of this group's versions. diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go similarity index 89% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go index e6db738a5..48eeeab5d 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/appliedmanifestwork.go @@ -6,14 +6,14 @@ import ( "context" time "time" - versioned "github.com/open-cluster-management/api/client/work/clientset/versioned" - internalinterfaces "github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces" - v1 "github.com/open-cluster-management/api/client/work/listers/work/v1" - workv1 "github.com/open-cluster-management/api/work/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + versioned "open-cluster-management.io/api/client/work/clientset/versioned" + internalinterfaces "open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces" + v1 "open-cluster-management.io/api/client/work/listers/work/v1" + workv1 "open-cluster-management.io/api/work/v1" ) // AppliedManifestWorkInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/interface.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/interface.go similarity index 91% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/interface.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/interface.go index 055a2558f..d96fea835 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/interface.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/interface.go @@ -3,7 +3,7 @@ package v1 import ( - internalinterfaces "github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces" + internalinterfaces "open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/manifestwork.go b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/manifestwork.go similarity index 89% rename from vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/manifestwork.go rename to vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/manifestwork.go index 6693608a8..11cb918bc 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/informers/externalversions/work/v1/manifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/informers/externalversions/work/v1/manifestwork.go @@ -6,14 +6,14 @@ import ( "context" time "time" - versioned "github.com/open-cluster-management/api/client/work/clientset/versioned" - internalinterfaces "github.com/open-cluster-management/api/client/work/informers/externalversions/internalinterfaces" - v1 "github.com/open-cluster-management/api/client/work/listers/work/v1" - workv1 "github.com/open-cluster-management/api/work/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + versioned "open-cluster-management.io/api/client/work/clientset/versioned" + internalinterfaces "open-cluster-management.io/api/client/work/informers/externalversions/internalinterfaces" + v1 "open-cluster-management.io/api/client/work/listers/work/v1" + workv1 "open-cluster-management.io/api/work/v1" ) // ManifestWorkInformer provides access to a shared informer and lister for diff --git a/vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/appliedmanifestwork.go b/vendor/open-cluster-management.io/api/client/work/listers/work/v1/appliedmanifestwork.go similarity index 97% rename from vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/appliedmanifestwork.go rename to vendor/open-cluster-management.io/api/client/work/listers/work/v1/appliedmanifestwork.go index f836b6183..8f60be5f7 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/appliedmanifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/listers/work/v1/appliedmanifestwork.go @@ -3,10 +3,10 @@ package v1 import ( - v1 "github.com/open-cluster-management/api/work/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1 "open-cluster-management.io/api/work/v1" ) // AppliedManifestWorkLister helps list AppliedManifestWorks. diff --git a/vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/expansion_generated.go b/vendor/open-cluster-management.io/api/client/work/listers/work/v1/expansion_generated.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/expansion_generated.go rename to vendor/open-cluster-management.io/api/client/work/listers/work/v1/expansion_generated.go diff --git a/vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/manifestwork.go b/vendor/open-cluster-management.io/api/client/work/listers/work/v1/manifestwork.go similarity index 98% rename from vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/manifestwork.go rename to vendor/open-cluster-management.io/api/client/work/listers/work/v1/manifestwork.go index f7b2996d7..1f59baa34 100644 --- a/vendor/github.com/open-cluster-management/api/client/work/listers/work/v1/manifestwork.go +++ b/vendor/open-cluster-management.io/api/client/work/listers/work/v1/manifestwork.go @@ -3,10 +3,10 @@ package v1 import ( - v1 "github.com/open-cluster-management/api/work/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1 "open-cluster-management.io/api/work/v1" ) // ManifestWorkLister helps list ManifestWorks. diff --git a/vendor/github.com/open-cluster-management/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml b/vendor/open-cluster-management.io/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml similarity index 100% rename from vendor/github.com/open-cluster-management/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml rename to vendor/open-cluster-management.io/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml diff --git a/vendor/github.com/open-cluster-management/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml b/vendor/open-cluster-management.io/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml similarity index 100% rename from vendor/github.com/open-cluster-management/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml rename to vendor/open-cluster-management.io/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml diff --git a/vendor/github.com/open-cluster-management/api/work/v1/0001_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml b/vendor/open-cluster-management.io/api/work/v1/0001_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml similarity index 100% rename from vendor/github.com/open-cluster-management/api/work/v1/0001_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml rename to vendor/open-cluster-management.io/api/work/v1/0001_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml diff --git a/vendor/github.com/open-cluster-management/api/work/v1/doc.go b/vendor/open-cluster-management.io/api/work/v1/doc.go similarity index 79% rename from vendor/github.com/open-cluster-management/api/work/v1/doc.go rename to vendor/open-cluster-management.io/api/work/v1/doc.go index 9563a1f14..9349a3526 100644 --- a/vendor/github.com/open-cluster-management/api/work/v1/doc.go +++ b/vendor/open-cluster-management.io/api/work/v1/doc.go @@ -1,6 +1,6 @@ // Package v1 contains API Schema definitions for the work v1 API group // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/open-cluster-management/api/apps +// +k8s:conversion-gen=open-cluster-management.io/api/work // +k8s:defaulter-gen=TypeMeta // +k8s:openapi-gen=true diff --git a/vendor/github.com/open-cluster-management/api/work/v1/register.go b/vendor/open-cluster-management.io/api/work/v1/register.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/work/v1/register.go rename to vendor/open-cluster-management.io/api/work/v1/register.go diff --git a/vendor/github.com/open-cluster-management/api/work/v1/types.go b/vendor/open-cluster-management.io/api/work/v1/types.go similarity index 99% rename from vendor/github.com/open-cluster-management/api/work/v1/types.go rename to vendor/open-cluster-management.io/api/work/v1/types.go index 74ebb2d7c..7591d739c 100644 --- a/vendor/github.com/open-cluster-management/api/work/v1/types.go +++ b/vendor/open-cluster-management.io/api/work/v1/types.go @@ -117,7 +117,7 @@ type ManifestWorkStatus struct { // 3. Available represents workload in ManifestWork exists on the managed cluster. // 4. Degraded represents the current state of workload does not match the desired // state for a certain period. - Conditions []metav1.Condition `json:"conditions"` + Conditions []metav1.Condition `json:"conditions,omitempty"` // ResourceStatus represents the status of each resource in manifestwork deployed on a // managed cluster. The Klusterlet agent on managed cluster syncs the condition from the managed cluster to the hub. diff --git a/vendor/github.com/open-cluster-management/api/work/v1/zz_generated.deepcopy.go b/vendor/open-cluster-management.io/api/work/v1/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/work/v1/zz_generated.deepcopy.go rename to vendor/open-cluster-management.io/api/work/v1/zz_generated.deepcopy.go diff --git a/vendor/github.com/open-cluster-management/api/work/v1/zz_generated.swagger_doc_generated.go b/vendor/open-cluster-management.io/api/work/v1/zz_generated.swagger_doc_generated.go similarity index 100% rename from vendor/github.com/open-cluster-management/api/work/v1/zz_generated.swagger_doc_generated.go rename to vendor/open-cluster-management.io/api/work/v1/zz_generated.swagger_doc_generated.go