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.

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

[1.20][go1.15] Update to go1.15.7 #98567

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.5-1
v1.15.7-2
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.3.0
local go_runner_version=buster-v2.2.2
local go_runner_version=buster-v2.2.4
### 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
6 changes: 3 additions & 3 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.15.5
version: 1.15.7
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.5-1
version: v1.15.7-2
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: buster-v2.2.2
version: buster-v2.2.4
refPaths:
- path: build/common.sh
match: go_runner_version=
Expand Down
2 changes: 1 addition & 1 deletion build/root/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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(
go_version = "1.15.5",
go_version = "1.15.7",
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://gcr.io/k8s-staging-build-image/go-runner:buster-v2.2.2
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.2.2
# Manifest: skopeo inspect docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.2.4
# Arches: skopeo inspect --raw docker://gcr.io/k8s-staging-build-image/go-runner:buster-v2.2.4
_GO_RUNNER_DIGEST = {
"manifest": "sha256:384e84aa715aed583798a77b92b78747f786f238a3bf9a43419d80029ecb3cf8",
"amd64": "sha256:38f0621075389afe17c29f60715123469b5ee9aa18a34532eca3613e945486cb",
"arm": "sha256:2e70823f577cb81a22f5974d276171568bd71dd0407b0bd46f4c66d8fc46a3b7",
"arm64": "sha256:c69c669947d5b60ce4e64069b24c9021799f8354521a7d0cbff68adc96db8726",
"ppc64le": "sha256:1a794556fafbc240a3ea5c8a0b42b63c6a3f4ef157b5120c6c10e934b70a6d63",
"s390x": "sha256:ff594a58928755e3fdb1c8e25d453515adfce01b6c9035f9ffc01015c886f82d",
"manifest": "sha256:059fd64240ad0fcd0f6eee6a791004747f1b4a5d3c44dd5ca68258bda4555e67",
"amd64": "sha256:66cdf0be9ba12e3183c43664f9f02b14e2642b19a3d82784d15f56d01e521017",
"arm": "sha256:61eefb4de21f946c1d4bc8e941f17a2a77c38f66c8b4a07d6da6d1e8918d47c4",
"arm64": "sha256:4b8dcdf86964ae8ceea7eca409ca7b87ad01421c1db0a0a99cc99676785496e3",
"ppc64le": "sha256:1e9368e5a81184eb1fd17053b7796f20663724c2046d17ce394b40f5e47affb1",
"s390x": "sha256:9ed1b51936ff6057d1534f5d22309d4e7369211d302b3bd72554e9d3963dbae3",
}

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 = "buster-v2.2.2", # ignored, but kept here for documentation
tag = "buster-v2.2.4", # ignored, but kept here for documentation
)

container_pull(
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.15.5 AS builder
FROM golang:1.15.7 AS builder
COPY elasticsearch_logging_discovery.go go.mod go.sum /
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go

Expand Down
2 changes: 1 addition & 1 deletion staging/publishing/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ recursive-delete-patterns:
- BUILD.bazel
- "*/BUILD.bazel"
- Gopkg.toml
default-go-version: 1.15.5
default-go-version: 1.15.7
rules:
- destination: code-generator
branches:
Expand Down
106 changes: 53 additions & 53 deletions staging/src/k8s.io/api/admissionregistration/v1/generated.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.