fix: remove vendor dependency in virtualized toolchain (argoproj#8000)

Signed-off-by: Jesse Suen <[email protected]>

Author: jessesuen

hack/generate-proto.sh

@@ -38,7 +38,7 @@ APIMACHINERY_PKGS=(
 export GO111MODULE=on
 [ -e ./v2 ] || ln -s . v2
 
-${PROJECT_ROOT}/dist/go-to-protobuf \
+go-to-protobuf \
     --go-header-file=${PROJECT_ROOT}/hack/custom-boilerplate.go.txt \
     --packages=$(IFS=, ; echo "${PACKAGES[*]}") \
     --apimachinery-packages=$(IFS=, ; echo "${APIMACHINERY_PKGS[*]}") \

hack/installers/checksums/jq-1.6-linux-amd64.sha256

@@ -9,10 +9,12 @@ SRCROOT="$( CDPATH='' cd -- "$(dirname "$0")/../.." && pwd -P )"
 # unecessary dependencies to go.mod). We want to maintain a single source of truth for versioning
 # our binaries (either go.mod or go install <pkg>@<version>), so we use two techniques to install
 # our CLIs:
-# 1. For CLIs which are NOT vendored in go.mod, we can run `go install` with an explicit version
-# 2. For packages which we *do* vendor in go.mod, we can run `go install` from the vendor directory
+# 1. For CLIs which are NOT vendored in go.mod, we can run `go install <pkg>@<version>` with an explicit version
+# 2. For packages which we *do* vendor in go.mod, we determine version from go.mod followed by `go install` with that version
 go_mod_install() {
-    go install -mod=vendor ./vendor/$1
+    module=$(go list -f '{{.Module}}' $1 | awk '{print $1}')
+    module_version=$(go list -m $module | awk '{print $NF}' | head -1)
+    go install $1@$module_version
 }
 
 # All binaries are compiled into the argo-cd/dist directory, which is added to the PATH during codegen

hack/installers/checksums/jq_1.6-1_arm64.deb.sha256

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -eux -o pipefail
 
-KUSTOMIZE_VERSION=4.2.0 "$(dirname $0)/../install.sh" helm2-linux jq-linux kustomize-linux protoc-linux
+KUSTOMIZE_VERSION=4.2.0 "$(dirname $0)/../install.sh" helm2-linux kustomize-linux protoc-linux

hack/installers/checksums/jq_1.6-1_armhf.deb.sha256

@@ -11,7 +11,6 @@
 awscliv2_version=2.4.6
 helm2_version=2.17.0
 helm3_version=3.7.1
-jq_version=1.6
 ksonnet_version=0.13.1
 kubectl_version=1.17.8
 kubectx_version=0.6.3

hack/installers/install-codegen-go-tools.sh

@@ -20,12 +20,19 @@ set -o nounset
 set -o pipefail
 
 PROJECT_ROOT=$(cd $(dirname ${BASH_SOURCE})/..; pwd)
+PATH="${PROJECT_ROOT}/dist:${PATH}"
 
 TARGET_SCRIPT=/tmp/generate-groups.sh
+
+# codegen utilities are installed outside of generate-groups.sh so remove the `go install` step in the script.
 sed -e '/go install/d' ${PROJECT_ROOT}/vendor/k8s.io/code-generator/generate-groups.sh > ${TARGET_SCRIPT}
 
+# generate-groups.sh assumes codegen utilities are installed to GOBIN, but we just ensure the CLIs
+# are in the path and invoke them without assumption of their location
+sed -i.bak -e 's#${gobin}/##g' ${TARGET_SCRIPT}
+
 [ -e ./v2 ] || ln -s . v2
-GOBIN=${PROJECT_ROOT}/dist bash -x ${TARGET_SCRIPT} "deepcopy,client,informer,lister" \
+bash -x ${TARGET_SCRIPT} "deepcopy,client,informer,lister" \
   github.com/argoproj/argo-cd/v2/pkg/client github.com/argoproj/argo-cd/v2/pkg/apis \
   "application:v1alpha1" \
   --go-header-file ${PROJECT_ROOT}/hack/custom-boilerplate.go.txt

hack/installers/install-codegen-tools.sh

@@ -10,7 +10,7 @@ PATH="${PROJECT_ROOT}/dist:${PATH}"
 VERSION="v1alpha1"
 
 [ -e ./v2 ] || ln -s . v2
-./dist/openapi-gen \
+openapi-gen \
   --go-header-file ${PROJECT_ROOT}/hack/custom-boilerplate.go.txt \
   --input-dirs github.com/argoproj/argo-cd/v2/pkg/apis/application/${VERSION} \
   --output-package github.com/argoproj/argo-cd/v2/pkg/apis/application/${VERSION} \

hack/installers/install-jq-linux.sh

@@ -18,6 +18,7 @@ RUN  apt-get update && apt-get install --fix-missing -y \
         git \
         git-lfs \
         gpg \
+        jq \
         make \
         wget \
         gcc \
@@ -29,14 +30,16 @@ RUN  apt-get update && apt-get install --fix-missing -y \
 
 COPY --from=golang /usr/local/go /usr/local/go
 
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV PATH /dist:/go/bin:/usr/local/go/bin:$PATH
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
 
 # Install build and test dependencies
 ADD ./hack/tool-versions.sh .
 ADD ./hack/install.sh .
 ADD ./hack/installers installers
+ADD go.mod go.mod
+ADD go.sum go.sum
 
 RUN ./install.sh ksonnet-linux && \
     ./install.sh helm2-linux && \