Merge pull request #834 from binacs/binacs/remove-vendoring

cleanup: remove vendoring

Author: k8s-ci-robot

Makefile

@@ -81,9 +81,9 @@ local-image: clean build-images
 push-images: EXTRA_ARGS="--push"
 push-images: build-images
 
-.PHONY: update-vendor
-update-vendor:
-	hack/update-vendor.sh
+.PHONY: update-gomod
+update-gomod:
+	hack/update-gomod.sh
 
 .PHONY: unit-test
 unit-test: install-envtest

doc/develop.md

@@ -34,9 +34,9 @@ If you would like to build just the binaries you can do it by
 make
 ```
 command.
-If you changed the branch or added new dependency you might need to regenerate vendor directory, for this you can use
+If you changed the branch or added new dependency you might need to update the go.mod, for this you can use
 ```shell
-make update-vendor
+make update-gomod
 ```
 command.
 

hack/integration-test.sh

@@ -33,7 +33,7 @@ runTests() {
 
   kube::log::status "Running integration test cases"
 
-  go test -timeout=40m -mod=vendor sigs.k8s.io/scheduler-plugins/test/integration/... ${ARGS:-}
+  go test -timeout=40m sigs.k8s.io/scheduler-plugins/test/integration/... ${ARGS:-}
 }
 
 trap cleanup EXIT

hack/unit-test.sh

@@ -28,7 +28,7 @@ source "${TEMP_DIR}/setup-envtest"
 # get the args to pass to go test
 ARGS=("$@")
 
-go test "${ARGS[@]}" -mod=vendor \
+go test "${ARGS[@]}" \
   sigs.k8s.io/scheduler-plugins/cmd/... \
   sigs.k8s.io/scheduler-plugins/pkg/... \
   sigs.k8s.io/scheduler-plugins/apis/...

hack/update-codegen.sh

@@ -31,7 +31,7 @@ CRD_OPTIONS="crd:crdVersions=v1"
 
 GOBIN=${TOOLS_BIN_DIR} ${GO_INSTALL} sigs.k8s.io/controller-tools/cmd/controller-gen ${CONTROLLER_GEN_BIN} ${CONTROLLER_GEN_VER}
 
-CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+CODEGEN_PKG=${CODEGEN_PKG:-$(go list -f '{{.Dir}}' k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
 
 source "${CODEGEN_PKG}/kube_codegen.sh"
 

hack/update-vendor.sh renamed to hack/update-gomod.sh

@@ -24,4 +24,4 @@ source "${SCIPRT_ROOT}/hack/lib/init.sh"
 kube::golang::verify_go_version
 
 go mod tidy
-go mod vendor
+go mod download

hack/verify-crdgen.sh

@@ -30,7 +30,7 @@ CONTROLLER_GEN="${GOPATH}/bin/controller-gen"
 go install sigs.k8s.io/controller-tools/cmd/[email protected]
 
 # Generate CRD
-api_paths="./apis/scheduling/v1alpha1/...;./vendor/github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/...;./vendor/github.com/diktyo-io/appgroup-api/pkg/apis/...;./vendor/github.com/diktyo-io/networktopology-api/pkg/apis/...;./vendor/sigs.k8s.io/security-profiles-operator/api/seccompprofile/v1beta1/..."
+api_paths="./apis/scheduling/v1alpha1/...;github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2;github.com/diktyo-io/appgroup-api/pkg/apis/...;github.com/diktyo-io/networktopology-api/pkg/apis/...;sigs.k8s.io/security-profiles-operator/api/seccompprofile/v1beta1/..."
 
 ${CONTROLLER_GEN} ${CRD_OPTIONS} paths="${api_paths}" output:dir="./manifests/crds"
 

site/content/en/docs/user-guide/develop.md

@@ -38,9 +38,9 @@ If you would like to build just the binaries you can do it by
 make
 ```
 command.
-If you changed the branch or added new dependency you might need to regenerate vendor directory, for this you can use
+If you changed the branch or added new dependency you might need to update the go.mod, for this you can use
 ```shell
-make update-vendor
+make update-gomod
 ```
 command.