Skip to content

Commit

Permalink
Bump to golang 1.15.15 in build/**
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Aug 7, 2021
1 parent 495d685 commit 05338ad
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.15.14-legacy-1
v1.15.15-legacy-1
2 changes: 1 addition & 1 deletion build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
local debian_iptables_version=buster-v1.6.5
local go_runner_version=v2.3.1-go1.15.14-buster.0
local go_runner_version=v2.3.1-go1.15.15-buster.0
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets
local targets=(
Expand Down
8 changes: 4 additions & 4 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:

# Bazel
- name: "repo-infra"
version: 0.1.9
version: 0.1.10
refPaths:
- path: build/root/WORKSPACE
match: strip_prefix = "repo-infra-\d+.\d+.\d+"
Expand Down Expand Up @@ -99,7 +99,7 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.15.14
version: 1.15.15
refPaths:
- path: build/build-image/cross/VERSION
- path: build/root/WORKSPACE
Expand All @@ -112,7 +112,7 @@ dependencies:
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'

- name: "k8s.gcr.io/kube-cross: dependents"
version: v1.15.14-legacy-1
version: v1.15.15-legacy-1
refPaths:
- path: build/build-image/cross/VERSION
- path: test/images/sample-apiserver/Makefile
Expand Down Expand Up @@ -146,7 +146,7 @@ dependencies:
match: configs\[DebianIptables\] = Config{buildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"}

- name: "k8s.gcr.io/go-runner: dependents"
version: v2.3.1-go1.15.14-buster.0
version: v2.3.1-go1.15.15-buster.0
refPaths:
- path: build/common.sh
match: go_runner_version=
Expand Down
8 changes: 4 additions & 4 deletions build/root/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ load("//build:workspace_mirror.bzl", "mirror")

http_archive(
name = "io_k8s_repo_infra",
strip_prefix = "repo-infra-0.1.9",
sha256 = "c4f81de0234a1ca292dc3986fed4332102299bbd0b73697b733218057112d790",
strip_prefix = "repo-infra-0.1.10",
sha256 = "c1da51ca6d34b1ec767125c7a7ca5d7d890c9e5772210ae43fd2aba88a6dda41",
urls = [
"https://github.com/kubernetes/repo-infra/archive/v0.1.9.tar.gz",
"https://github.com/kubernetes/repo-infra/archive/v0.1.10.tar.gz",
],
)

Expand All @@ -23,7 +23,7 @@ load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_
# 'override_go_version': used to specify an alternate go version provided
# by kubernetes/repo-infra
repo_infra_configure(
override_go_version = "1.15.14",
override_go_version = "1.15.15",
minimum_bazel_version = "2.2.0",
)

Expand Down
18 changes: 9 additions & 9 deletions build/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ _DEBIAN_IPTABLES_DIGEST = {
# Use skopeo to find these values: https://github.com/containers/skopeo
#
# Example
# Manifest: skopeo inspect docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.14-buster.0
# Arches: skopeo inspect --raw docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.14-buster.0
# Manifest: skopeo inspect docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.15-buster.0
# Arches: skopeo inspect --raw docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.15-buster.0
_GO_RUNNER_DIGEST = {
"manifest": "sha256:ce9328e06037ec8ca6bc4233d2d3f60fb4a4157462b660c56bc984bb31a62940",
"amd64": "sha256:2aede631c3f17a99a75664e914822eed5ae2093f52900e98966e83dc70e8947f",
"arm": "sha256:3587b0891bae56d074899485f341fe867527bec794dab22874f484804f8369fe",
"arm64": "sha256:637e26085ccea7783d84340cd5363925f64b5138d9c061a86666986f99082fe4",
"ppc64le": "sha256:ba8d09474f0ab648eabd13b241b059ed26c275639b09ad5a0af291dce6e3cb90",
"s390x": "sha256:e7db8707e6ed74402eeb057d07d4844fb63e0c748b268fc6d8656362133f8ecc",
"manifest": "sha256:3677ad5ab7f58cb91b5bc44171d4b4ef20800c4730cac75e532d3b0b614001b7",
"amd64": "sha256:f816d2e77334e456180c738628ce42dd15bec2725cccde8b3eb02b44664fa9f0",
"arm": "sha256:f6ef14f21aa7e872afd2671fe72b3baf9440b9273e0053fcc41c408f57a82535",
"arm64": "sha256:cf613b2b8fd1f3f940801b7e049699fbb0de5ba7c204ce57a525a869c91d9b1b",
"ppc64le": "sha256:565eac823b7787acc2e6d67abc0c78ebac8e62b8aa20623def72db8317bc9d33",
"s390x": "sha256:3520419608a21129627e1860621ae8d3b114b589153200fd01d20ef968cefa07",
}

def _digest(d, arch):
Expand All @@ -127,7 +127,7 @@ def image_dependencies():
digest = _digest(_GO_RUNNER_DIGEST, arch),
registry = "k8s.gcr.io/build-image",
repository = "go-runner",
tag = "v2.3.1-go1.15.14-buster.0", # ignored, but kept here for documentation
tag = "v2.3.1-go1.15.15-buster.0", # ignored, but kept here for documentation
)

container_pull(
Expand Down

0 comments on commit 05338ad

Please sign in to comment.