rebuild

istios/Makefile

@@ -8,4 +8,4 @@ build:
 	./scripts/join.sh ${HUB}/operator ${VERSION}
 
 build-binaries:
-	HUB=${HUB} VERSION=${VERSION} ./scripts/build-binaries.sh
+	HUB=${HUB} VERSION=${VERSION} ./scripts/build-binaries.sh

istios/bake.hcl

@@ -7,7 +7,7 @@ variable HUB {
 }
 
 variable BASE_VERSION {
-  default = "2020-06-29"
+  default = "2020-07-10"
 }
 
 group "default" {

istios/scripts/build-binaries.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
+set -eux
+
 if [[ ! -d .tmp/istio ]]; then
-    git clone https://github.com/istio/istio .tmp/istio
+  git clone https://github.com/istio/istio .tmp/istio
 fi
 
 cd .tmp/istio || exit
@@ -11,11 +13,9 @@ HUB=${HUB}
 
 git checkout ${VERSION}
 
-BINARIES="./pilot/cmd/pilot-discovery ./pilot/cmd/pilot-agent ./operator/cmd/operator"
-
 docker run \
-    -v ${PWD}/../../bin:/tmp/istio \
-    -v ${PWD}:/go/src/github.com/istio/istio \
-    --workdir /go/src/github.com/istio/istio \
-    golang:1.14 \
-    sh -c "STATIC=0 GOOS=linux GOARCH=arm64 LDFLAGS='-extldflags -static -s -w' common/scripts/gobuild.sh /tmp/istio/ ${BINARIES}"
+  -v ${PWD}/../../bin:/tmp/bin \
+  -v ${PWD}/../../scripts:/tmp/scripts \
+  -v ${PWD}:/go/src/istio.io/istio \
+  --workdir /go/src/istio.io/istio \
+  golang:1.14 /tmp/scripts/gobuild.sh

istios/scripts/gobuild.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -eux
+
+GO111MODULE=on go get github.com/jteeuwen/go-bindata/go-bindata@6025e8de665b
+
+./operator/scripts/create_assets_gen.sh
+
+BINARIES="./pilot/cmd/pilot-discovery ./pilot/cmd/pilot-agent ./operator/cmd/operator"
+
+sh -c "STATIC=0 GOOS=linux GOARCH=arm64 LDFLAGS='-extldflags -static -s -w' common/scripts/gobuild.sh /tmp/bin/ ${BINARIES}"