Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit e7d1aac

Browse files
authored
Merge pull request #427 from diegs/go1.7.5
Bump build/build-release.sh Go version to 1.7.5.
2 parents 523cf92 + 9c5ccd1 commit e7d1aac

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

build/build-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ BOOTKUBE_ROOT=$(git rev-parse --show-toplevel)
55
sudo rkt run \
66
--volume bk,kind=host,source=${BOOTKUBE_ROOT} \
77
--mount volume=bk,target=/go/src/github.com/kubernetes-incubator/bootkube \
8-
--insecure-options=image docker://golang:1.7.4 --exec /bin/bash -- -c \
8+
--insecure-options=image docker://golang:1.7.5 --exec /bin/bash -- -c \
99
"cd /go/src/github.com/kubernetes-incubator/bootkube && make release"

hack/tests/conformance-gce.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ else
115115

116116
#TODO(pb): See if there is a way to make the --inherit-env option replace
117117
#passing all the variables manually.
118-
sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.7.4 --exec /bin/bash -- -c \
118+
sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.7.5 --exec /bin/bash -- -c \
119119
"IN_CONTAINER=true COREOS_CHANNEL=${COREOS_CHANNEL} GCE_PREFIX=${GCE_PREFIX} GCE_SERVICE_ACCOUNT=${GCE_SERVICE_ACCOUNT} GCE_PROJECT=${GCE_PROJECT} SELF_HOST_ETCD=${SELF_HOST_ETCD} /build/bootkube/hack/tests/$(basename $0)"
120120
fi

hack/tests/conformance-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ CONFORMANCE="\
4444
KUBECONFIG=/kubeconfig KUBERNETES_PROVIDER=skeleton KUBERNETES_CONFORMANCE_TEST=Y go run hack/e2e.go \
4545
-v --test -check_version_skew=false --test_args='--ginkgo.focus=\[Conformance\]'"
4646

47-
CMD="sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.7.4 --exec /bin/bash -- -c \"${INIT} && ${BUILD} && ${CONFORMANCE}\""
47+
CMD="sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.7.5 --exec /bin/bash -- -c \"${INIT} && ${BUILD} && ${CONFORMANCE}\""
4848
ssh -q -o stricthostkeychecking=no -i ${ssh_key} -p ${ssh_port} core@${ssh_host} "${CMD}"

0 commit comments

Comments
 (0)