Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to go1.12.1 #75413

Merged
merged 4 commits into from Mar 16, 2019
Merged

upgrade to go1.12.1 #75413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4d447d
install go1.12.1 in the cross image
BenTheElder Mar 15, 2019
1bee729
update kube-cross version
BenTheElder Mar 15, 2019
dbae273
update bazel to go 1.12.1
BenTheElder Mar 15, 2019
650ffe2
update test/images to go 1.12.1
BenTheElder Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 44 additions & 0 deletions build/build-image/cross/Dockerfile
View file
Open in desktop
Expand Up @@ -17,6 +17,50 @@

FROM golang:1.12.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 1.12.1 tag is now published. do we still want to merge this workaround?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ixdy yes, This lets get the CI jobs get started quicker. We can revert things back on monday (and publish fresh images)

Copy link
Member

@dims dims Mar 15, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#75372 (comment) @ixdy

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR merged a few hours ago, but you can also now pull the image, meaning this workaround isn't needed:

$ docker pull golang:1.12.1
1.12.1: Pulling from library/golang
22dbe790f715: Pull complete
0250231711a0: Pull complete
6fba9447437b: Pull complete
c2b4d327b352: Pull complete
619f4932b7ea: Pull complete
16e105463ffe: Pull complete
ed842bbe1793: Pull complete
Digest: sha256:8630e0f0e9a8187f54066ea81a9fe33a21ddbfbe88c7149fe2299d8cd989ad63
Status: Downloaded newer image for golang:1.12.1

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ixdy i am happy for us to switch things back right now if you, @amwat and @BenTheElder are ok with it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

build-cross v1.12.1-1 is already pushed with this workaround, so we should commit this to record the source of v1.12.1-1. that will also let CI soak begin for the weekend while a v1.12.1-2 without this workaround gets pushed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm up to switch it but it sounds like for now we want to let the CI soak then switch it for v1.12.1-2?
https://kubernetes.slack.com/archives/C2C40FMNF/p1552691032534800


################################################################################
# this is from the upstream golang image source so we can get go1.2.1
# https://github.com/docker-library/golang/blob/fd272b2b72db82a0bd516ce3d09bba624651516c/1.12/stretch/Dockerfile#L12-L44
# TODO(bentheelder): remove this block
################################################################################

ENV GOLANG_VERSION 1.12.1

RUN set -eux; \
\
# this "case" statement is generated via "update.sh"
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
amd64) goRelArch='linux-amd64'; goRelSha256='2a3fdabf665496a0db5f41ec6af7a9b15a49fbe71a85a50ca38b1f13a103aeec' ;; \
armhf) goRelArch='linux-armv6l'; goRelSha256='ceac33f07f8fdbccd6c6f7339db33479e1be8c206e67458ba259470fe796dbf2' ;; \
arm64) goRelArch='linux-arm64'; goRelSha256='10dba44cf95c7aa7abc3c72610c12ebcaf7cad6eed761d5ad92736ca3bc0d547' ;; \
i386) goRelArch='linux-386'; goRelSha256='af74b6572dd0c133e5de121928616eab60a6252c66f6d9b15007c82207416a2c' ;; \
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='e1258c81f420c88339abf40888423904c0023497b4e9bbffac9ee484597a57d3' ;; \
s390x) goRelArch='linux-s390x'; goRelSha256='a9b8f49be6b2083e2586c2ce8a2a86d5dbf47cca64ac6195546a81c9927f9513' ;; \
*) goRelArch='src'; goRelSha256='0be127684df4b842a64e58093154f9d15422f1405f1fcff4b2c36ffc6a15818a'; \
echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
esac; \
\
url="https://golang.org/dl/go${GOLANG_VERSION}.${goRelArch}.tar.gz"; \
wget -O go.tgz "$url"; \
echo "${goRelSha256} *go.tgz" | sha256sum -c -; \
tar -C /usr/local -xzf go.tgz; \
rm go.tgz; \
\
if [ "$goRelArch" = 'src' ]; then \
echo >&2; \
echo >&2 'error: UNIMPLEMENTED'; \
echo >&2 'TODO install golang-any from jessie-backports for GOROOT_BOOTSTRAP (and uninstall after build)'; \
echo >&2; \
exit 1; \
fi; \
\
export PATH="/usr/local/go/bin:$PATH"; \
go version

################################################################################
# below is our usual sources
################################################################################

ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
armhf \
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
View file
Open in desktop
@@ -1 +1 @@
v1.12.0-1
v1.12.1-1
6 changes: 3 additions & 3 deletions build/root/WORKSPACE
View file
Open in desktop
Expand Up @@ -21,16 +21,16 @@ http_archive(

http_archive(
name = "io_bazel_rules_go",
sha256 = "6776d68ebb897625dead17ae510eac3d5f6342367327875210df44dbe2aeeb19",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.1/rules_go-0.17.1.tar.gz"),
sha256 = "6433336b4c5feb54e2f45df4c1c84ea4385b2dc0b6f274ec2cd5d745045eae1f",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.2/rules_go-0.17.2.tar.gz"),
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.12",
go_version = "1.12.1",
)

http_archive(
Expand Down
2 changes: 1 addition & 1 deletion test/images/Makefile
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM=7
QEMUVERSION=v2.9.1
GOLANG_VERSION=1.12.0
GOLANG_VERSION=1.12.1
export

ifndef WHAT
Expand Down