From de94eb157240b1b15c2da091b203a03cbd69f7cf Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 6 Mar 2020 16:53:42 -0500 Subject: cni: prevent go from downloading stuff in the background While testing the cni uprev by building in a container with network=none the following error was found: go: github.com/Microsoft/go-winio@v0.4.11: Get https://proxy.golang.org/github.com/%21microsoft/go-winio/@v/v0.4.11.mod: dial tcp: lookup proxy.golang.org on 128.224.144.130:53: dial udp 128.224.144.130:53: connect: network is unreachable After some digging through the go documentation it was found that the '-mod=vendor' is required for 'go build' to use shipped vendor modules when building modules. This can be confirmed by look at the 'build_linux.sh' script which is found in the plugins repo. By using '-mod=vendor' and also ensuring things are properly placed in the GOPATH (ie $B) we can avoid having to create many of the links we had been previously. We also put all the build artifacts into $B to avoid mixing source and build. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- recipes-networking/cni/cni_git.bb | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) (limited to 'recipes-networking/cni') diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index a81e6ccc..3ad939bd 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -14,7 +14,7 @@ SRCREV_cni = "4cfb7b568922a3c79a23e438dc52fe537fc9687e" SRCREV_plugins = "1f33fb729ae2b8900785f896df2dc1f6fe5e8239" SRC_URI = "\ git://github.com/containernetworking/cni.git;nobranch=1;name=cni \ - git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=plugins;name=plugins \ + git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins \ " RPROVIDES_${PN} += "kubernetes-cni" @@ -30,36 +30,22 @@ inherit go inherit goarch do_compile() { - # link fixups for compilation - rm -f ${S}/src/import/vendor/src - mkdir -p ${S}/src/import/vendor/ - ln -sf ./ ${S}/src/import/vendor/src - rm -rf ${S}/src/import/plugins - rm -rf ${S}/src/import/vendor/github.com/containernetworking/plugins + mkdir -p ${S}/src/github.com/containernetworking + ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni - mkdir -p ${S}/src/import/vendor/github.com/containernetworking/cni - - ln -sf ../../../../libcni ${S}/src/import/vendor/github.com/containernetworking/cni/libcni - ln -sf ../../../../pkg ${S}/src/import/vendor/github.com/containernetworking/cni/pkg - ln -sf ../../../../cnitool ${S}/src/import/vendor/github.com/containernetworking/cni/cnitool - ln -sf ${WORKDIR}/plugins ${S}/src/import/vendor/github.com/containernetworking/plugins - - export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" - export CGO_ENABLED="1" - - cd ${S}/src/import/vendor/github.com/containernetworking/cni/libcni + cd ${B}/src/github.com/containernetworking/cni/libcni ${GO} build - cd ${S}/src/import/vendor/github.com/containernetworking/cni/cnitool + cd ${B}/src/github.com/containernetworking/cni/cnitool ${GO} build - cd ${S}/src/import/vendor/github.com/containernetworking/plugins/ + cd ${B}/src/github.com/containernetworking/plugins PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)" - mkdir -p ${WORKDIR}/plugins/bin/ + mkdir -p ${B}/plugins/bin/ for p in $PLUGINS; do plugin="$(basename "$p")" echo "building: $p" - ${GO} build -o ${WORKDIR}/plugins/bin/$plugin github.com/containernetworking/plugins/$p + ${GO} build -mod=vendor -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p done } @@ -70,7 +56,7 @@ do_install() { install -d ${D}/${sysconfdir}/cni/net.d install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} - install -m 755 -D ${WORKDIR}/plugins/bin/* ${D}/${localbindir} + install -m 755 -D ${B}/plugins/bin/* ${D}/${localbindir} # Parts of k8s expect the cni binaries to be available in /opt/cni install -d ${D}/opt/cni -- cgit v1.2.3-54-g00ecf