Clean up vendor dir references in the VPA directory

Signed-off-by: Feruzjon Muyassarov <[email protected]>
kubernetes · Jun 7, 2024 · 6b18596 · 6b18596
1 parent 6320648
commit 6b18596
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/vertical-pod-autoscaler/hack/run-e2e-tests.sh b/vertical-pod-autoscaler/hack/run-e2e-tests.sh
@@ -48,9 +48,9 @@ case ${SUITE} in
   recommender|updater|admission-controller|actuation|full-vpa)
     export KUBECONFIG=$HOME/.kube/config
     pushd ${SCRIPT_ROOT}/e2e
-    go test -mod vendor ./v1beta2/*go -v --test.timeout=90m --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump --ginkgo.timeout=90m
+    go test ./v1beta2/*go -v --test.timeout=90m --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump --ginkgo.timeout=90m
     V1BETA2_RESULT=$?
-    go test -mod vendor ./v1/*go -v --test.timeout=90m --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump --ginkgo.timeout=90m
+    go test ./v1/*go -v --test.timeout=90m --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump --ginkgo.timeout=90m
     V1_RESULT=$?
     popd
     echo v1beta2 test result: ${V1BETA2_RESULT}

diff --git a/vertical-pod-autoscaler/hack/update-kubernetes-deps-in-e2e.sh b/vertical-pod-autoscaler/hack/update-kubernetes-deps-in-e2e.sh
@@ -59,8 +59,7 @@ function update_deps() {
     echo "Updating k8s to ${K8S_TAG}"
     go get "k8s.io/kubernetes@v${K8S_TAG}"
 
-    echo "Running go mod tidy and vendoring deps"
-    # tidy and vendor modules
+    echo "Running go mod tidy"
+    # tidy
     go mod tidy
-    go mod vendor
 )
diff --git a/vertical-pod-autoscaler/hack/update-kubernetes-deps.sh b/vertical-pod-autoscaler/hack/update-kubernetes-deps.sh
@@ -59,8 +59,7 @@ function update_deps() {
     echo "Updating k8s to ${K8S_TAG}"
     go get "k8s.io/kubernetes@v${K8S_TAG}"
 
-    echo "Running go mod tidy and vendoring deps"
-    # tidy and vendor modules
+    echo "Running go mod tidy"
+    # tidy
     go mod tidy
-    go mod vendor
 )
diff --git a/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile b/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile
@@ -22,7 +22,7 @@ WORKDIR /gopath/src/k8s.io/autoscaler/vertical-pod-autoscaler
 
 ARG TARGETOS TARGETARCH
 
-RUN CGO_ENABLED=0 LD_FLAGS=-s GOARCH=$TARGETARCH GOOS=$TARGETOS go build -C pkg/admission-controller -mod vendor -o admission-controller-$TARGETARCH
+RUN CGO_ENABLED=0 LD_FLAGS=-s GOARCH=$TARGETARCH GOOS=$TARGETOS go build -C pkg/admission-controller -o admission-controller-$TARGETARCH
 
 FROM gcr.io/distroless/static:latest
 MAINTAINER Tomasz Kulczynski "[email protected]"

diff --git a/vertical-pod-autoscaler/pkg/admission-controller/Makefile b/vertical-pod-autoscaler/pkg/admission-controller/Makefile
@@ -84,7 +84,7 @@ clean-%:
 	rm -f ${COMPONENT}-$*
 
 format:
-	test -z "$$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -s -d {} + | tee /dev/stderr)" || \
-	test -z "$$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -s -w {} + | tee /dev/stderr)"
+	test -z "$$(find . -type f -o -name '*.go' -exec gofmt -s -d {} + | tee /dev/stderr)" || \
+	test -z "$$(find . -type f -o -name '*.go' -exec gofmt -s -w {} + | tee /dev/stderr)"
 
 .PHONY: all build test-unit clean format release
diff --git a/vertical-pod-autoscaler/pkg/recommender/Dockerfile b/vertical-pod-autoscaler/pkg/recommender/Dockerfile
@@ -22,7 +22,7 @@ WORKDIR /gopath/src/k8s.io/autoscaler/vertical-pod-autoscaler
 
 ARG TARGETOS TARGETARCH
 
-RUN CGO_ENABLED=0 LD_FLAGS=-s GOARCH=$TARGETARCH GOOS=$TARGETOS go build -C pkg/recommender -mod vendor -o recommender-$TARGETARCH
+RUN CGO_ENABLED=0 LD_FLAGS=-s GOARCH=$TARGETARCH GOOS=$TARGETOS go build -C pkg/recommender -o recommender-$TARGETARCH
 
 FROM gcr.io/distroless/static:latest
 MAINTAINER Krzysztof Grygiel "[email protected]"

diff --git a/vertical-pod-autoscaler/pkg/recommender/Makefile b/vertical-pod-autoscaler/pkg/recommender/Makefile
@@ -86,7 +86,7 @@ clean-%:
 	rm -f ${COMPONENT}-$*
 
 format:
-	test -z "$$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -s -d {} + | tee /dev/stderr)" || \
-	test -z "$$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -s -w {} + | tee /dev/stderr)"
+	test -z "$$(find . -type f -o -name '*.go' -exec gofmt -s -d {} + | tee /dev/stderr)" || \
+	test -z "$$(find . -type f -o -name '*.go' -exec gofmt -s -w {} + | tee /dev/stderr)"
 
 .PHONY: all build test-unit clean format release
diff --git a/vertical-pod-autoscaler/pkg/updater/Dockerfile b/vertical-pod-autoscaler/pkg/updater/Dockerfile
@@ -22,7 +22,7 @@ WORKDIR /gopath/src/k8s.io/autoscaler/vertical-pod-autoscaler
 
 ARG TARGETOS TARGETARCH
 
-RUN CGO_ENABLED=0 LD_FLAGS=-s GOARCH=$TARGETARCH GOOS=$TARGETOS go build -C pkg/updater -mod vendor -o updater-$TARGETARCH
+RUN CGO_ENABLED=0 LD_FLAGS=-s GOARCH=$TARGETARCH GOOS=$TARGETOS go build -C pkg/updater -o updater-$TARGETARCH
 
 FROM gcr.io/distroless/static:latest
 MAINTAINER Marcin Wielgus "[email protected]"

diff --git a/vertical-pod-autoscaler/pkg/updater/Makefile b/vertical-pod-autoscaler/pkg/updater/Makefile
@@ -84,7 +84,7 @@ clean-%:
 	rm -f ${COMPONENT}-$*
 
 format:
-	test -z "$$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -s -d {} + | tee /dev/stderr)" || \
-	test -z "$$(find . -path ./vendor -prune -type f -o -name '*.go' -exec gofmt -s -w {} + | tee /dev/stderr)"
+	test -z "$$(find . -type f -o -name '*.go' -exec gofmt -s -d {} + | tee /dev/stderr)" || \
+	test -z "$$(find . -type f -o -name '*.go' -exec gofmt -s -w {} + | tee /dev/stderr)"
 
 .PHONY: all build test-unit clean format release