diff --git a/.github/workflows/lint-build-commits.yaml b/.github/workflows/lint-build-commits.yaml index 0642761ec3bbf..0c9364445c323 100644 --- a/.github/workflows/lint-build-commits.yaml +++ b/.github/workflows/lint-build-commits.yaml @@ -41,7 +41,7 @@ jobs: - name: Install ginkgo run: | - go get github.com/onsi/ginkgo/ginkgo@v1.12.1 + go install github.com/onsi/ginkgo/ginkgo@cc0216944b25a88d3259699a029d4e601fb8a222 # v1.12.1 - name: Checkout code uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 diff --git a/.github/workflows/tests-smoke.yaml b/.github/workflows/tests-smoke.yaml index 694d2e588b6de..d6e31703f143f 100644 --- a/.github/workflows/tests-smoke.yaml +++ b/.github/workflows/tests-smoke.yaml @@ -187,7 +187,7 @@ jobs: cilium_pod=$(kubectl -n kube-system get po -o name --field-selector=status.phase==Running -l 'k8s-app=cilium' -o jsonpath='{.items[0].metadata.name}' ) kubectl -n kube-system exec $cilium_pod -- sh -c "apt update && apt install curl -y" kubectl -n kube-system exec $cilium_pod -- curl http://localhost:9090/metrics > metrics.prom - GO111MODULE=on go get github.com/prometheus/prometheus/cmd/promtool@e4487274853c587717006eeda8804e597d120340 # This is commit hash for v2.24.1 + go install github.com/prometheus/prometheus/cmd/promtool@@e4487274853c587717006eeda8804e597d120340 # This is commit hash for v2.24.1 cat metrics.prom | $HOME/go/bin/promtool check metrics - name: Capture cilium-sysdump diff --git a/.travis/prepare.sh b/.travis/prepare.sh index 9d14879301004..98e795ef664f5 100755 --- a/.travis/prepare.sh +++ b/.travis/prepare.sh @@ -45,9 +45,7 @@ install_clang export PATH="/usr/local/clang/bin:$PATH" -# disable go modules to avoid downloading all dependencies when doing go get -GO111MODULE=off go get golang.org/x/tools/cmd/cover -GO111MODULE=off go get github.com/mattn/goveralls +go install github.com/mattn/goveralls@a36c7ef8f23b2952fa6e39663f52107dfc8ad69d # v0.0.11 # Install golangci-lint curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0 diff --git a/Documentation/contributing/development/dev_setup.rst b/Documentation/contributing/development/dev_setup.rst index aaf19fc290680..5bb50df17b65c 100644 --- a/Documentation/contributing/development/dev_setup.rst +++ b/Documentation/contributing/development/dev_setup.rst @@ -25,33 +25,31 @@ Requirements You need to have the following tools available in order to effectively contribute to Cilium: -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -| Dependency | Version / Commit ID | Download Command | -+==============================================================+==============================+=========================================================+ -| git | latest | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -| clang | >= 10.0 (latest recommended) | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -| llvm | >= 10.0 (latest recommended) | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -| `go `_ | |GO_RELEASE| | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `ginkgo `__ | >= 1.4.0 | ``go get -u github.com/onsi/ginkgo/ginkgo`` | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `gomega `_ | >= 1.2.0 | ``go get -u github.com/onsi/gomega`` | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `golangci-lint `_ | >= v1.27 | ``go get -u github.com/golangci/golangci-lint`` | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `cfssl `_ | >= v1.6.0 | ``go get -u github.com/cloudflare/cfssl/cmd/cfssl`` | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `cfssljson `_ | >= v1.6.0 | ``go get -u github.com/cloudflare/cfssl/cmd/cfssljson`` | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `Docker `_ | OS-Dependent | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ `Docker-Compose `_ | OS-Dependent | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ -+ python3-pip | latest | N/A (OS-specific) | -+--------------------------------------------------------------+------------------------------+---------------------------------------------------------+ ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ +| Dependency | Version / Commit ID | Download Command | ++==============================================================+==============================+=================================================================+ +| git | latest | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ +| clang | >= 10.0 (latest recommended) | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ +| llvm | >= 10.0 (latest recommended) | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ +| `go `_ | |GO_RELEASE| | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ `ginkgo `__ | >= 1.4.0 | ``go install github.com/onsi/ginkgo/ginkgo@latest`` | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ `golangci-lint `_ | >= v1.27 | ``go install github.com/golangci/golangci-lint@latest`` | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ `cfssl `_ | >= v1.6.0 | ``go install github.com/cloudflare/cfssl/cmd/cfssl@latest`` | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ `cfssljson `_ | >= v1.6.0 | ``go install github.com/cloudflare/cfssl/cmd/cfssljson@latest`` | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ `Docker `_ | OS-Dependent | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ `Docker-Compose `_ | OS-Dependent | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ ++ python3-pip | latest | N/A (OS-specific) | ++--------------------------------------------------------------+------------------------------+-----------------------------------------------------------------+ For `integration_testing`, you will need to run ``docker`` without privileges. You can usually achieve this by adding your current user to the ``docker`` diff --git a/images/builder/build-go-deps.sh b/images/builder/build-go-deps.sh index 9e7acaaea0956..bb30bd09c2f65 100755 --- a/images/builder/build-go-deps.sh +++ b/images/builder/build-go-deps.sh @@ -12,4 +12,4 @@ mkdir /src cd /src -GO111MODULE=on go get github.com/gordonklaus/ineffassign@1003c8bd00dc2869cb5ca5282e6ce33834fed514 +go install github.com/gordonklaus/ineffassign@1003c8bd00dc2869cb5ca5282e6ce33834fed514 diff --git a/test/consul/gen-cert.sh b/test/consul/gen-cert.sh index 2c4614f826e00..d294748b2f76e 100755 --- a/test/consul/gen-cert.sh +++ b/test/consul/gen-cert.sh @@ -18,14 +18,14 @@ gen() { if [ -z "$(which cfssl)" ]; then echo "Please install the cfssl utility and make sure you have it in your \$PATH" echo "You can install it in your \$GOPATH by running:" - echo "go get -u github.com/cloudflare/cfssl/cmd/cfssl" + echo "go install github.com/cloudflare/cfssl/cmd/cfssl@latest" exit -1 fi if [ -z "$(which cfssljson)" ]; then echo "Please install the cfssljson utility and make sure you have it in your \$PATH" echo "You can install it in your \$GOPATH by running:" - echo "go get -u github.com/cloudflare/cfssl/cmd/cfssljson" + echo "go install github.com/cloudflare/cfssl/cmd/cfssljson@latest" exit -1 fi diff --git a/test/packet/scripts/install.sh b/test/packet/scripts/install.sh index c406da0bef306..f2ab92bdf2338 100644 --- a/test/packet/scripts/install.sh +++ b/test/packet/scripts/install.sh @@ -64,9 +64,8 @@ sudo ln -s /usr/local/go/bin/* /usr/local/bin/ go version sudo mkdir /go/ export GOPATH=/go/ -go get -u github.com/google/gops -go get -u github.com/onsi/ginkgo/ginkgo -go get -u github.com/onsi/gomega/... +go install github.com/google/gops@db6b6e9ba07629c90654a7720c452fb44a864dfb # v0.3.22 +go install github.com/onsi/ginkgo/ginkgo@1ed6486197ba2a007858c59bdc4d1522631025d5 # v2.1.3 sudo ln -sf /go/bin/* /usr/local/bin/ echo 'cd /root/go/src/github.com/cilium/cilium' >> /root/.bashrc diff --git a/tools/dev-doctor/rootcmd.go b/tools/dev-doctor/rootcmd.go index de2449ddf22de..a30fcbece453e 100644 --- a/tools/dev-doctor/rootcmd.go +++ b/tools/dev-doctor/rootcmd.go @@ -90,7 +90,7 @@ func rootCmdRun(cmd *cobra.Command, args []string) { versionArgs: []string{"version"}, versionRegexp: regexp.MustCompile(`Ginkgo Version (\d+\.\d+\S*)`), minVersion: &semver.Version{Major: 1, Minor: 4, Patch: 0}, - hint: `Run "go get -u github.com/onsi/ginkgo/ginkgo".`, + hint: `Run "go install github.com/onsi/ginkgo/ginkgo@latest".`, }, // FIXME add gomega check? &binaryCheck{