From 39defc4d9179bce2197706fa72e17932eda033bc Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sun, 10 Apr 2022 18:07:39 +0200 Subject: [PATCH] Remove all bazel targets from Makefile Fix comment Remove bazel artifacts Remove bazel hacks Fix kubetest compat copy --- .bazelrc | 1 - .bazelversion | 1 - Makefile | 266 ++-------------------------------- hack/dev-build-aws.sh | 2 +- hack/dev-build-gce.sh | 2 +- hack/go.mod | 4 - hack/go.sum | 11 -- hack/install-bazelisk.sh | 25 ---- hack/tools.go | 4 - hack/update-bazel.sh | 33 ----- hack/verify-bazel.sh | 49 ------- hack/verify-gofmt.sh | 2 +- tools/bazel.rc | 62 -------- tools/get_workspace_status.sh | 2 +- 14 files changed, 14 insertions(+), 450 deletions(-) delete mode 100644 .bazelrc delete mode 100644 .bazelversion delete mode 100755 hack/install-bazelisk.sh delete mode 100755 hack/update-bazel.sh delete mode 100755 hack/verify-bazel.sh delete mode 100644 tools/bazel.rc diff --git a/.bazelrc b/.bazelrc deleted file mode 100644 index 416f122930..0000000000 --- a/.bazelrc +++ /dev/null @@ -1 +0,0 @@ -import %workspace%/tools/bazel.rc diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index fae6e3d04b..0000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -4.2.1 diff --git a/Makefile b/Makefile index 880a551f46..0ec59da529 100644 --- a/Makefile +++ b/Makefile @@ -28,18 +28,10 @@ ARTIFACTS?=$(BUILD)/artifacts DIST=$(BUILD)/dist IMAGES=$(DIST)/images UPLOAD=$(BUILD)/upload -BAZELBUILD=$(KOPS_ROOT)/.bazelbuild -BAZELDIST=$(BAZELBUILD)/dist -BAZELIMAGES=$(BAZELDIST)/images -BAZELUPLOAD=$(BAZELBUILD)/upload UID:=$(shell id -u) GID:=$(shell id -g) -BAZEL?=bazelisk -BAZEL_OPTIONS?= -BAZEL_CONFIG?= API_OPTIONS?= GCFLAGS?= -BAZEL_BIN=.bazel-bin OSARCH=$(shell go env GOOS)/$(shell go env GOARCH) # CODEGEN_VERSION is the version of k8s.io/code-generator to use @@ -147,7 +139,6 @@ help: # Show this help .PHONY: clean clean: if test -e ${BUILD}; then rm -rfv ${BUILD}; fi - ${BAZEL} clean rm -rf tests/integration/update_cluster/*/.terraform .PHONY: codegen @@ -257,40 +248,6 @@ gcs-upload-and-tag: gsutil gcs-upload echo "${GCS_URL}${VERSION}" > ${UPLOAD}/latest.txt gsutil -h "Cache-Control:private, max-age=0, no-transform" cp ${UPLOAD}/latest.txt ${GCS_LOCATION}${LATEST_FILE} -.PHONY: bazel-version-ci -bazel-version-ci: bazel-version-dist-linux-amd64 bazel-version-dist-linux-arm64 - rm -rf ${BAZELUPLOAD} - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/images/ - cp ${BAZEL_BIN}/cmd/kops/linux-amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/kops - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/kops.sha256 - cp ${BAZEL_BIN}/cmd/nodeup/linux-amd64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/nodeup - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/nodeup.sha256 - cp ${BAZEL_BIN}/cmd/nodeup/linux-arm64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/nodeup - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/nodeup.sha256 - cp -fp ${BAZEL_BIN}/channels/cmd/channels/linux-amd64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/channels - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/channels.sha256 - cp -fp ${BAZEL_BIN}/channels/cmd/channels/linux-arm64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/channels - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/channels.sha256 - cp -fp ${BAZEL_BIN}/protokube/cmd/protokube/linux-amd64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/protokube - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/protokube.sha256 - cp -fp ${BAZEL_BIN}/protokube/cmd/protokube/linux-arm64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/protokube - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/protokube.sha256 - cp ${BAZELIMAGES}/kops-controller-amd64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-amd64.tar.gz - cp ${BAZELIMAGES}/kops-controller-amd64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-amd64.tar.gz.sha256 - cp ${BAZELIMAGES}/kops-controller-arm64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-arm64.tar.gz - cp ${BAZELIMAGES}/kops-controller-arm64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-arm64.tar.gz.sha256 - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-amd64.tar.gz - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-amd64.tar.gz.sha256 - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-arm64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-arm64.tar.gz - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-arm64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-arm64.tar.gz.sha256 - cp ${BAZELIMAGES}/dns-controller-amd64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-amd64.tar.gz - cp ${BAZELIMAGES}/dns-controller-amd64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-amd64.tar.gz.sha256 - cp ${BAZELIMAGES}/dns-controller-arm64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-arm64.tar.gz - cp ${BAZELIMAGES}/dns-controller-arm64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-arm64.tar.gz.sha256 - cp -fr ${BAZELUPLOAD}/kops/${VERSION}/* ${BAZELDIST}/ - # gcs-publish-ci is the entry point for CI testing # In CI testing, always upload the CI version. # The last copy part is to satisfy kubetest2 path expectations @@ -302,8 +259,8 @@ gcs-publish-ci: gsutil version-dist-ci echo "VERSION: ${VERSION}" echo "${GCS_URL}/${VERSION}" > ${UPLOAD}/${LATEST_FILE} gsutil -h "Cache-Control:private, max-age=0, no-transform" cp ${UPLOAD}/${LATEST_FILE} ${GCS_LOCATION} - mkdir -p ${BAZEL_BIN}/cmd/kops/linux-amd64/ - cp ${DIST}/linux/amd64/kops ${BAZEL_BIN}/cmd/kops/linux-amd64/ + mkdir -p .bazel-bin/cmd/kops/linux-amd64/ + cp ${DIST}/linux/amd64/kops .bazel-bin/cmd/kops/linux-amd64/ .PHONY: gen-cli-docs gen-cli-docs: kops # Regenerate CLI docs @@ -337,20 +294,9 @@ push-aws-run-amd64 push-aws-run-arm64: push-aws-run-%: push-% ${NODEUP}: go build ${GCFLAGS} ${EXTRA_BUILDFLAGS} ${LDFLAGS}"${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" -o $@ k8s.io/kops/cmd/nodeup -.PHONY: bazel-crossbuild-dns-controller -bazel-crossbuild-dns-controller: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/... - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/... - - .PHONY: dns-controller-push dns-controller-push: ko-dns-controller-push -.PHONY: bazel-dns-controller-push -bazel-dns-controller-push: bazelisk - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} ${BAZEL} run --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-amd64 - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} ${BAZEL} run --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:push-image-arm64 - .PHONY: ko-dns-controller-push ko-dns-controller-push: ko KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller" ko build --tags ${DNS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/ @@ -366,28 +312,20 @@ dns-controller-manifest: # -------------------------------------------------- # development targets -.PHONY: gomod-prereqs -gomod-prereqs: - (which ${BAZEL} > /dev/null) || (echo "gomod requires that ${BAZEL} is installed"; exit 1) - .PHONY: gomod -gomod: bazelisk gomod-prereqs +gomod: go mod tidy go mod vendor # Switch weavemesh to use peer_name_hash - bazel rule-go doesn't support build tags yet rm vendor/github.com/weaveworks/mesh/peer_name_mac.go sed -i.bak -e 's/peer_name_hash/!peer_name_mac/g' vendor/github.com/weaveworks/mesh/peer_name_hash.go - # Remove all bazel build files that were vendored and regenerate (we assume they are go-gettable) - find vendor/ -name "BUILD" -delete - find vendor/ -name "BUILD.bazel" -delete - make gazelle cd tests/e2e; go mod tidy cd hack; go mod tidy .PHONY: gofmt gofmt: - find $(KOPS_ROOT) -name "*.go" | grep -v vendor | xargs ${BAZEL} run @go_sdk//:bin/gofmt -- -w -s + find $(KOPS_ROOT) -name "*.go" | grep -v vendor | xargs gofmt -w -s .PHONY: goimports goimports: @@ -413,7 +351,7 @@ verify-boilerplate: hack/verify-boilerplate.sh .PHONY: verify-gofmt -verify-gofmt: bazelisk +verify-gofmt: hack/verify-gofmt.sh .PHONY: verify-gomod @@ -437,10 +375,6 @@ verify-gendocs: kops fi @echo "cli docs up-to-date" -.PHONY: verify-bazel -verify-bazel: - hack/verify-bazel.sh - .PHONY: verify-golangci-lint verify-golangci-lint: hack/verify-golangci-lint.sh @@ -464,13 +398,12 @@ verify-hashes: # ci target is for developers, it aims to cover all the CI jobs # verify-gendocs will call kops target .PHONY: ci -ci: govet verify-gofmt verify-crds verify-gomod verify-goimports verify-boilerplate verify-bazel verify-versions verify-misspelling verify-shellcheck verify-golangci-lint verify-terraform nodeup examples test | verify-gendocs verify-apimachinery verify-codegen +ci: govet verify-gofmt verify-crds verify-gomod verify-goimports verify-boilerplate verify-versions verify-misspelling verify-shellcheck verify-golangci-lint verify-terraform nodeup examples test | verify-gendocs verify-apimachinery verify-codegen echo "Done!" -# we skip tasks that rely on bazel and are covered by other jobs -# verify-gofmt: uses bazel, covered by pull-kops-verify +# we skip tasks that are covered by other jobs .PHONY: quick-ci -quick-ci: verify-crds verify-goimports govet verify-boilerplate verify-bazel verify-versions verify-misspelling verify-shellcheck | verify-gendocs verify-apimachinery verify-codegen +quick-ci: verify-crds verify-goimports govet verify-boilerplate verify-versions verify-misspelling verify-shellcheck | verify-gendocs verify-apimachinery verify-codegen echo "Done!" # -------------------------------------------------- @@ -565,79 +498,6 @@ verify-crds: verify-versions: hack/verify-versions.sh -# ----------------------------------------------------- -# bazel targets - -.PHONY: bazel-test -bazel-test: bazelisk - ${BAZEL} ${BAZEL_OPTIONS} test ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --test_output=errors -- //... -//vendor/... - -.PHONY: bazel-build -bazel-build: bazelisk - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure //cmd/... //pkg/... //channels/... //nodeup/... //protokube/... //dns-controller/... //util/... - -.PHONY: bazel-build-cli -bazel-build-cli: bazelisk - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure //cmd/kops/... - -.PHONY: bazel-build-kops-darwin-amd64 bazel-build-kops-darwin-arm64 -bazel-build-kops-darwin-amd64 bazel-build-kops-darwin-arm64: bazel-build-kops-darwin-%: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:darwin_$* //cmd/kops/... - -.PHONY: bazel-build-kops-linux-amd64 bazel-build-kops-linux-arm64 -bazel-build-kops-linux-amd64 bazel-build-kops-linux-arm64: bazel-build-kops-linux-%: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kops/... - -.PHONY: bazel-build-kops-windows-amd64 -bazel-build-kops-windows-amd64: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:windows_amd64 //cmd/kops/... - -.PHONY: bazel-crossbuild-kops -bazel-crossbuild-kops: bazel-build-kops-darwin-amd64 bazel-build-kops-darwin-arm64 bazel-build-kops-linux-amd64 bazel-build-kops-linux-arm64 bazel-build-kops-windows-amd64 - echo "Done cross-building kops" - -.PHONY: bazel-build-nodeup-linux-amd64 bazel-build-nodeup-linux-arm64 -bazel-build-nodeup-linux-amd64 bazel-build-nodeup-linux-arm64: bazel-build-nodeup-linux-%: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/nodeup/... - -.PHONY: bazel-crossbuild-nodeup -bazel-crossbuild-nodeup: bazel-build-nodeup-linux-amd64 bazel-build-nodeup-linux-arm64 - echo "Done cross-building nodeup" - -.PHONY: bazel-build-protokube-linux-amd64 bazel-build-protokube-linux-arm64 -bazel-build-protokube-linux-amd64 bazel-build-protokube-linux-arm64: bazel-build-protokube-linux-%: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //protokube/... - -.PHONY: bazel-crossbuild-protokube -bazel-crossbuild-protokube: bazel-build-protokube-linux-amd64 bazel-build-protokube-linux-arm64 - echo "Done cross-building protokube" - -.PHONY: bazel-build-channels-linux-amd64 bazel-build-channels-linux-arm64 -bazel-build-channels-linux-amd64 bazel-build-channels-linux-arm64: bazel-build-channels-linux-%: - ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //channels/... - -.PHONY: bazel-crossbuild-channels -bazel-crossbuild-channels: bazel-build-channels-linux-amd64 bazel-build-channels-linux-arm64 - echo "Done cross-building channels" - -.PHONY: bazel-push -# Will always push a linux-based build up to the server -bazel-push: bazel-build-nodeup-linux-amd64 - ssh ${TARGET} touch /tmp/nodeup - ssh ${TARGET} chmod +w /tmp/nodeup - scp -C ${BAZEL_BIN}/cmd/nodeup/linux-amd64/nodeup ${TARGET}:/tmp/ - -.PHONY: bazel-push-gce-run -bazel-push-gce-run: bazel-push - ssh ${TARGET} sudo cp /tmp/nodeup /var/lib/toolbox/kubernetes-install/nodeup - ssh ${TARGET} sudo SKIP_PACKAGE_UPDATE=1 /var/lib/toolbox/kubernetes-install/nodeup --conf=/var/lib/toolbox/kubernetes-install/kube_env.yaml --v=8 - -# -t is for CentOS http://unix.stackexchange.com/questions/122616/why-do-i-need-a-tty-to-run-sudo-if-i-can-sudo-without-a-password -.PHONY: bazel-push-aws-run -bazel-push-aws-run: bazel-push - ssh ${TARGET} chmod +x /tmp/nodeup - ssh -t ${TARGET} sudo SKIP_PACKAGE_UPDATE=1 /tmp/nodeup --conf=/opt/kops/conf/kube_env.yaml --v=8 - .PHONY: gsutil gsutil: hack/install-gsutil.sh @@ -646,14 +506,6 @@ gsutil: ko: hack/install-ko.sh -.PHONY: bazelisk -bazelisk: - hack/install-bazelisk.sh - -.PHONY: gazelle -gazelle: - hack/update-bazel.sh - .PHONY: check-markdown-links check-markdown-links: docker run -t -v $$PWD:/tmp \ @@ -665,28 +517,6 @@ check-markdown-links: #----------------------------------------------------------- -.PHONY: bazel-kube-apiserver-healthcheck-export-linux-amd64 bazel-kube-apiserver-healthcheck-export-linux-arm64 -bazel-kube-apiserver-healthcheck-export-linux-amd64 bazel-kube-apiserver-healthcheck-export-linux-arm64: bazel-kube-apiserver-healthcheck-export-linux-%: - mkdir -p ${BAZELIMAGES} - DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="registry.k8s.io/kops/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kube-apiserver-healthcheck:image-bundle-$*.tar.gz.sha256 - cp -fp ${BAZEL_BIN}/cmd/kube-apiserver-healthcheck/image-bundle-$*.tar.gz ${BAZELIMAGES}/kube-apiserver-healthcheck-$*.tar.gz - cp -fp ${BAZEL_BIN}/cmd/kube-apiserver-healthcheck/image-bundle-$*.tar.gz.sha256 ${BAZELIMAGES}/kube-apiserver-healthcheck-$*.tar.gz.sha256 - -.PHONY: bazel-kube-apiserver-healthcheck-export -bazel-kube-apiserver-healthcheck-export: bazel-kube-apiserver-healthcheck-export-linux-amd64 bazel-kube-apiserver-healthcheck-export-linux-arm64 - echo "Done exporting kube-apiserver-healthcheck images" - -.PHONY: bazel-kops-controller-export-linux-amd64 bazel-kops-controller-export-linux-arm64 -bazel-kops-controller-export-linux-amd64 bazel-kops-controller-export-linux-arm64: bazel-kops-controller-export-linux-%: - mkdir -p ${BAZELIMAGES} - DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="registry.k8s.io/kops/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kops-controller:image-bundle-$*.tar.gz.sha256 - cp -fp ${BAZEL_BIN}/cmd/kops-controller/image-bundle-$*.tar.gz ${BAZELIMAGES}/kops-controller-$*.tar.gz - cp -fp ${BAZEL_BIN}/cmd/kops-controller/image-bundle-$*.tar.gz.sha256 ${BAZELIMAGES}/kops-controller-$*.tar.gz.sha256 - -.PHONY: bazel-kops-controller-export -bazel-kops-controller-export: bazel-kops-controller-export-linux-amd64 bazel-kops-controller-export-linux-arm64 - echo "Done exporting kops-controller images" - .PHONY: ko-kops-controller-export-linux-amd64 ko-kops-controller-export-linux-arm64 ko-kops-controller-export-linux-amd64 ko-kops-controller-export-linux-arm64: ko-kops-controller-export-linux-%: ko mkdir -p ${IMAGES} @@ -720,68 +550,6 @@ ko-dns-controller-export-linux-amd64 ko-dns-controller-export-linux-arm64: ko-dn ko-dns-controller-export: ko-dns-controller-export-linux-amd64 ko-dns-controller-export-linux-arm64 echo "Done exporting dns-controller images" -.PHONY: bazel-dns-controller-export-linux-amd64 bazel-dns-controller-export-linux-arm64 -bazel-dns-controller-export-linux-amd64 bazel-dns-controller-export-linux-arm64: bazel-dns-controller-export-linux-%: - mkdir -p ${BAZELIMAGES} - DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="registry.k8s.io/kops/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //dns-controller/cmd/dns-controller:image-bundle-$*.tar.gz.sha256 - cp -fp ${BAZEL_BIN}/dns-controller/cmd/dns-controller/image-bundle-$*.tar.gz ${BAZELIMAGES}/dns-controller-$*.tar.gz - cp -fp ${BAZEL_BIN}/dns-controller/cmd/dns-controller/image-bundle-$*.tar.gz.sha256 ${BAZELIMAGES}/dns-controller-$*.tar.gz.sha256 - -.PHONY: bazel-dns-controller-export -bazel-dns-controller-export: - echo "Done exporting dns-controller images" - -.PHONY: bazel-version-dist-linux-amd64 bazel-version-dist-linux-arm64 -bazel-version-dist-linux-amd64 bazel-version-dist-linux-arm64: bazel-version-dist-linux-%: bazelisk bazel-build-kops-linux-% bazel-build-nodeup-linux-% bazel-kops-controller-export-linux-% bazel-kube-apiserver-healthcheck-export-linux-% bazel-dns-controller-export-linux-% bazel-build-protokube-linux-% bazel-build-channels-linux-% - echo "Done building dist for $*" - -.PHONY: bazel-version-dist -bazel-version-dist: bazel-version-dist-linux-amd64 bazel-version-dist-linux-arm64 bazel-build-kops-darwin-amd64 bazel-build-kops-darwin-arm64 bazel-build-kops-windows-amd64 - rm -rf ${BAZELUPLOAD} - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/darwin/amd64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/darwin/arm64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/windows/amd64/ - mkdir -p ${BAZELUPLOAD}/kops/${VERSION}/images/ - cp ${BAZEL_BIN}/cmd/nodeup/linux-amd64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/nodeup - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/nodeup.sha256 - cp ${BAZEL_BIN}/cmd/nodeup/linux-arm64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/nodeup - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/nodeup ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/nodeup.sha256 - cp -fp ${BAZEL_BIN}/channels/cmd/channels/linux-amd64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/channels - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/channels.sha256 - cp -fp ${BAZEL_BIN}/channels/cmd/channels/linux-arm64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/channels - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/channels ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/channels.sha256 - cp -fp ${BAZEL_BIN}/protokube/cmd/protokube/linux-amd64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/protokube - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/protokube.sha256 - cp -fp ${BAZEL_BIN}/protokube/cmd/protokube/linux-arm64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/protokube - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/protokube ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/protokube.sha256 - cp ${BAZELIMAGES}/kops-controller-amd64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-amd64.tar.gz - cp ${BAZELIMAGES}/kops-controller-amd64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-amd64.tar.gz.sha256 - cp ${BAZELIMAGES}/kops-controller-arm64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-arm64.tar.gz - cp ${BAZELIMAGES}/kops-controller-arm64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kops-controller-arm64.tar.gz.sha256 - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-amd64.tar.gz - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-amd64.tar.gz.sha256 - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-arm64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-arm64.tar.gz - cp ${BAZELIMAGES}/kube-apiserver-healthcheck-arm64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/kube-apiserver-healthcheck-arm64.tar.gz.sha256 - cp ${BAZELIMAGES}/dns-controller-amd64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-amd64.tar.gz - cp ${BAZELIMAGES}/dns-controller-amd64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-amd64.tar.gz.sha256 - cp ${BAZELIMAGES}/dns-controller-arm64.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-arm64.tar.gz - cp ${BAZELIMAGES}/dns-controller-arm64.tar.gz.sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/dns-controller-arm64.tar.gz.sha256 - cp ${BAZEL_BIN}/cmd/kops/linux-amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/kops - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/linux/amd64/kops.sha256 - cp ${BAZEL_BIN}/cmd/kops/linux-arm64/kops ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/kops - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/kops ${BAZELUPLOAD}/kops/${VERSION}/linux/arm64/kops.sha256 - cp ${BAZEL_BIN}/cmd/kops/darwin-amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/darwin/amd64/kops - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/darwin/amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/darwin/amd64/kops.sha256 - cp ${BAZEL_BIN}/cmd/kops/darwin-arm64/kops ${BAZELUPLOAD}/kops/${VERSION}/darwin/arm64/kops - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/darwin/arm64/kops ${BAZELUPLOAD}/kops/${VERSION}/darwin/arm64/kops.sha256 - cp ${BAZEL_BIN}/cmd/kops/windows-amd64/kops ${BAZELUPLOAD}/kops/${VERSION}/windows/amd64/kops.exe - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/windows/amd64/kops.exe ${BAZELUPLOAD}/kops/${VERSION}/windows/amd64/kops.exe.sha256 - tar cfvz ${BAZELUPLOAD}/kops/${VERSION}/images/images.tar.gz -C ${BAZELIMAGES} --exclude "*.sha256" . - tools/sha256 ${BAZELUPLOAD}/kops/${VERSION}/images/images.tar.gz ${BAZELUPLOAD}/kops/${VERSION}/images/images.tar.gz.sha256 - cp -fr ${BAZELUPLOAD}/kops/${VERSION}/* ${BAZELDIST}/ - .PHONY: version-dist version-dist: dev-version-dist-amd64 dev-version-dist-arm64 crossbuild mkdir -p ${UPLOAD}/kops/${VERSION}/linux/amd64/ @@ -808,15 +576,11 @@ version-dist-ci: dev-version-dist-amd64 dev-version-dist-arm64 crossbuild-kops-l tools/sha256 ${UPLOAD}/kops/${VERSION}/linux/amd64/kops ${UPLOAD}/kops/${VERSION}/linux/amd64/kops.sha256 -.PHONY: bazel-upload -bazel-upload: bazel-version-dist # Upload kops to S3 - aws s3 sync --acl public-read ${BAZELUPLOAD}/ ${S3_BUCKET} - # prow-postsubmit is run by the prow postsubmit job # It uploads a build to a staging directory, which in theory we can publish as a release .PHONY: prow-postsubmit -prow-postsubmit: bazel-version-dist - ${UPLOAD_CMD} ${BAZELUPLOAD}/kops/${VERSION}/ ${UPLOAD_DEST}/${VERSION}/ +prow-postsubmit: version-dist + ${UPLOAD_CMD} ${UPLOAD}/kops/${VERSION}/ ${UPLOAD_DEST}/${VERSION}/ #----------------------------------------------------------- # static html documentation @@ -967,11 +731,6 @@ crds: .PHONY: kops-controller-push kops-controller-push: ko-kops-controller-push -.PHONY: bazel-kops-controller-push -bazel-kops-controller-push: bazelisk - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} ${BAZEL} run --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-amd64 - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} ${BAZEL} run --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:push-image-arm64 - .PHONY: ko-kops-controller-push ko-kops-controller-push: ko KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller" ko build --tags ${KOPS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-controller/ @@ -988,11 +747,6 @@ kops-controller-manifest: .PHONY: kube-apiserver-healthcheck-push kube-apiserver-healthcheck-push: ko-kube-apiserver-healthcheck-push -.PHONY: bazel-kube-apiserver-healthcheck-push -bazel-kube-apiserver-healthcheck-push: bazelisk - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} ${BAZEL} run --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-amd64 - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} ${BAZEL} run --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:push-image-arm64 - .PHONY: ko-kube-apiserver-healthcheck-push ko-kube-apiserver-healthcheck-push: ko KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck" ko build --tags ${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kube-apiserver-healthcheck/ diff --git a/hack/dev-build-aws.sh b/hack/dev-build-aws.sh index 0c17fa79cf..0208e4a80b 100644 --- a/hack/dev-build-aws.sh +++ b/hack/dev-build-aws.sh @@ -24,7 +24,7 @@ #set -x -# bazel caching doesn't work when when we switch architectures +# Dev environments typically do not need to test multiple architectures KOPS_ARCH=amd64 export KOPS_ARCH diff --git a/hack/dev-build-gce.sh b/hack/dev-build-gce.sh index 048bfe82cc..4e80756379 100644 --- a/hack/dev-build-gce.sh +++ b/hack/dev-build-gce.sh @@ -24,7 +24,7 @@ #set -x -# bazel caching doesn't work when when we switch architectures +# Dev environments typically do not need to test multiple architectures KOPS_ARCH=amd64 export KOPS_ARCH diff --git a/hack/go.mod b/hack/go.mod index 888154b690..c54fba4f21 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -3,8 +3,6 @@ module k8s.io/kops/hack go 1.17 require ( - github.com/bazelbuild/bazel-gazelle v0.23.0 - github.com/bazelbuild/bazelisk v1.10.1 github.com/client9/misspell v0.3.4 github.com/golangci/golangci-lint v1.45.0 golang.org/x/tools v0.1.10 @@ -23,11 +21,9 @@ require ( github.com/alexkohler/prealloc v1.0.0 // indirect github.com/ashanbrown/forbidigo v1.3.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect - github.com/bazelbuild/buildtools v0.0.0-20200718160251-b1667ff58f71 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bkielbasa/cyclop v1.2.0 // indirect github.com/blizzy78/varnamelen v0.6.0 // indirect - github.com/bmatcuk/doublestar v1.2.2 // indirect github.com/bombsimon/wsl/v3 v3.3.0 // indirect github.com/breml/bidichk v0.2.2 // indirect github.com/breml/errchkjson v0.2.3 // indirect diff --git a/hack/go.sum b/hack/go.sum index 1e53626ee0..22186cf9f7 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -113,15 +113,6 @@ github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvx github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/bazelbuild/bazel-gazelle v0.23.0 h1:Ks6YN+WkOv2lYWlvf7ksxUpLvrDbBHPBXXUrBFQ3BZM= -github.com/bazelbuild/bazel-gazelle v0.23.0/go.mod h1:3mHi4TYn0QxwdMKPJfj3FKhZxYgWm46DjWQQPOg20BY= -github.com/bazelbuild/bazelisk v1.10.1 h1:2EWA2lRrt/k8B5ASt0mlTDQ+7mnzvKdF6ShNWLbk0o0= -github.com/bazelbuild/bazelisk v1.10.1/go.mod h1:s3ZIQZj3l9iCk/03rBgjhYvqz0c5SPRvoQCZuz8Lw/4= -github.com/bazelbuild/buildtools v0.0.0-20200718160251-b1667ff58f71 h1:Et1IIXrXwhpDvR5wH9REPEZ0sUtzUoJSq19nfmBqzBY= -github.com/bazelbuild/buildtools v0.0.0-20200718160251-b1667ff58f71/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU= -github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M= -github.com/bazelbuild/rules_go v0.28.0 h1:fNtx0dJpG5ENGdMj3/GICoi/7z+ixB3IIW5rERTzOgM= -github.com/bazelbuild/rules_go v0.28.0/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -133,8 +124,6 @@ github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbz github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blizzy78/varnamelen v0.6.0 h1:TOIDk9qRIMspALZKX8x+5hQfAjuvAFogppnxtvuNmBo= github.com/blizzy78/varnamelen v0.6.0/go.mod h1:zy2Eic4qWqjrxa60jG34cfL0VXcSwzUrIx68eJPb4Q8= -github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0= -github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bombsimon/wsl/v3 v3.3.0 h1:Mka/+kRLoQJq7g2rggtgQsjuI/K5Efd87WX96EWFxjM= github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/breml/bidichk v0.2.2 h1:w7QXnpH0eCBJm55zGCTJveZEkQBt6Fs5zThIdA6qQ9Y= diff --git a/hack/install-bazelisk.sh b/hack/install-bazelisk.sh deleted file mode 100755 index 25ccb7d42f..0000000000 --- a/hack/install-bazelisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2021 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -if ! command -v bazelisk &> /dev/null; then - . "$(dirname "${BASH_SOURCE[0]}")/common.sh" - cd "${KOPS_ROOT}/hack" || exit 1 - go install github.com/bazelbuild/bazelisk -fi diff --git a/hack/tools.go b/hack/tools.go index f1d3fc5dd8..82039336ac 100644 --- a/hack/tools.go +++ b/hack/tools.go @@ -17,10 +17,6 @@ limitations under the License. package hack import ( - _ "github.com/bazelbuild/bazelisk" - - _ "github.com/bazelbuild/bazel-gazelle/cmd/gazelle" - _ "github.com/client9/misspell/cmd/misspell" _ "golang.org/x/tools/cmd/goimports" diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh deleted file mode 100755 index b231824f84..0000000000 --- a/hack/update-bazel.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -. "$(dirname "${BASH_SOURCE[0]}")/common.sh" - -cd "${KOPS_ROOT}/hack" || exit 1 -go build -o "${TOOLS_BIN}/gazelle" github.com/bazelbuild/bazel-gazelle/cmd/gazelle -cd "${KOPS_ROOT}" || exit 1 - -"${TOOLS_BIN}/gazelle" fix \ - -external=vendored \ - -exclude=tests/e2e \ - -exclude=hack \ - -mode=fix \ - -proto=disable \ - -repo_root="${KOPS_ROOT}" diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh deleted file mode 100755 index 90cd9f7a6f..0000000000 --- a/hack/verify-bazel.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -. "$(dirname "${BASH_SOURCE[0]}")/common.sh" - -cd "${KOPS_ROOT}/hack" || exit 1 -go build -o "${TOOLS_BIN}/gazelle" github.com/bazelbuild/bazel-gazelle/cmd/gazelle -cd "${KOPS_ROOT}" || exit 1 - -gazelle_diff=$("${TOOLS_BIN}/gazelle" fix \ - -external=vendored \ - -exclude=tests/e2e \ - -exclude=hack \ - -mode=diff \ - -proto=disable \ - -repo_root="${KOPS_ROOT}") || _=$? - -if [[ -n "${gazelle_diff}" ]]; then - echo "${gazelle_diff}" >&2 - echo >&2 - echo "FAIL: ./hack/verify-bazel.sh failed, as the bazel files are not up to date" >&2 - echo "FAIL: Please execute the following command: ./hack/update-bazel.sh" >&2 - exit 1 -fi - -# Make sure there are no BUILD files outside vendor - we should only have -# BUILD.bazel files. -old_build_files=$(find . -name BUILD \( -type f -o -type l \) \ - -not -path './vendor/*' | sort) -if [[ -n "${old_build_files}" ]]; then - echo "One or more BUILD files found in the tree:" >&2 - echo "${old_build_files}" >&2 - echo >&2 - echo "FAIL: Only bazel files named BUILD.bazel are allowed." >&2 - echo "FAIL: Please move incorrectly named files to BUILD.bazel" >&2 - exit 1 -fi diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 2086e94ef0..77a9ad5b4b 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -18,7 +18,7 @@ cd "${KOPS_ROOT}" || exit 1 -bad_files=$(git ls-files "*.go" | grep -v vendor | xargs bazelisk run @go_sdk//:bin/gofmt -- -s -w -l) +bad_files=$(git ls-files "*.go" | grep -v vendor | xargs gofmt -s -w -l) if [[ -n "${bad_files}" ]]; then echo "FAIL: 'make gofmt' needs to be run on the following files: " echo "${bad_files}" diff --git a/tools/bazel.rc b/tools/bazel.rc deleted file mode 100644 index 596c6e797f..0000000000 --- a/tools/bazel.rc +++ /dev/null @@ -1,62 +0,0 @@ -build --symlink_prefix=.bazel- -test --symlink_prefix=.bazel- - -# Also suppress the generation of the bazel-out symlink, which always appears,no -# matter what you set --symlink_prefix to. -build --experimental_no_product_name_out_symlink - -startup --expand_configs_in_place - -# TODO: Remove once we expect everyone is running bazel >= 0.18 -# (This is the "legacy" location for bazel.rc) -# (See https://github.com/bazelbuild/bazel/issues/6319) - -# --stamp is needed to use x_defs, as of rules_go 0.19.0 -build --stamp - -build --workspace_status_command=./tools/get_workspace_status.sh -build --verbose_failures - -test --test_output=errors - - -# RBE configuration -# Note needs an instance name -# https://github.com/bazelbuild/bazel-toolchains/blob/master/bazelrc/bazel-0.27.0.bazelrc -build:remote --jobs=500 -build:remote --host_javabase=@rbe_default//java:jdk -build:remote --javabase=@rbe_default//java:jdk -build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 -build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 -build:remote --crosstool_top=@rbe_default//cc:toolchain -build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 - -build:remote --extra_toolchains=@rbe_default//config:cc-toolchain -build:remote --extra_execution_platforms=@io_k8s_repo_infra//:rbe_with_network -build:remote --host_platform=@io_k8s_repo_infra//:rbe_with_network -build:remote --platforms=@io_k8s_repo_infra//:rbe_with_network - -build:remote --define=EXECUTOR=remote -build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com -build:remote --remote_timeout=3600 - -# Alt: --google_credentials=some_file.json -build:remote --google_default_credentials=true - -# Minimize what is downloaded -build:inmemory --experimental_inmemory_jdeps_files -build:inmemory --experimental_inmemory_dotd_files - -# Minimize what is downloaded -build:toplevel --config=inmemory -build:toplevel --experimental_remote_download_outputs=toplevel - -build:minimal --config=inmemory -build:minimal --experimental_remote_download_outputs=minimal - -build:remote --config=toplevel -test:remote --incompatible_allow_tags_propagation # //images:protokube-image fails to find xz on rbe - -run:remote --experimental_remote_download_outputs=all --noexperimental_inmemory_jdeps_files --noexperimental_inmemory_dotd_files - -build:ci --host_force_python=PY2 # TODO(fejta): noop stub to allow CI to use --config=ci diff --git a/tools/get_workspace_status.sh b/tools/get_workspace_status.sh index 24e6d40f94..373168da22 100755 --- a/tools/get_workspace_status.sh +++ b/tools/get_workspace_status.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This script will be run bazel when building process starts to +# This script will be run when building process starts to # generate key-value information that represents the status of the # workspace. The output should be like #