Merge pull request kubernetes#103677 from puerco/go-11514

[1.20][go1.15] Update to go1.15.14
openshift · Jul 14, 2021 · c553357 · c553357
2 parents 9bdbdaa + 57f38e4
commit c553357
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 47 deletions.
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.15.13-legacy-1
+v1.15.14-legacy-1
diff --git a/build/common.sh b/build/common.sh
@@ -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.13-buster.0
+  local go_runner_version=v2.3.1-go1.15.14-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=(

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
@@ -17,7 +17,7 @@ dependencies:
 
   # Bazel
   - name: "repo-infra"
-    version: 0.1.8
+    version: 0.1.9
     refPaths:
     - path: build/root/WORKSPACE
       match: strip_prefix = "repo-infra-\d+.\d+.\d+"
@@ -99,7 +99,7 @@ dependencies:
 
   # Golang
   - name: "golang: upstream version"
-    version: 1.15.13
+    version: 1.15.14
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: build/root/WORKSPACE
@@ -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.13-legacy-1
+    version: v1.15.14-legacy-1
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: test/images/sample-apiserver/Makefile
@@ -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.13-buster.0
+    version: v2.3.1-go1.15.14-buster.0
     refPaths:
     - path: build/common.sh
       match: go_runner_version=

diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
@@ -5,10 +5,10 @@ load("//build:workspace_mirror.bzl", "mirror")
 
 http_archive(
     name = "io_k8s_repo_infra",
-    strip_prefix = "repo-infra-0.1.8",
-    sha256 = "5baf1b698bc20080ba714401c34ddc6ffa447757896c26399c00ab8bb39cc980",
+    strip_prefix = "repo-infra-0.1.9",
+    sha256 = "c4f81de0234a1ca292dc3986fed4332102299bbd0b73697b733218057112d790",
     urls = [
-        "https://github.com/kubernetes/repo-infra/archive/v0.1.8.tar.gz",
+        "https://github.com/kubernetes/repo-infra/archive/v0.1.9.tar.gz",
     ],
 )
 
@@ -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.13",
+    override_go_version = "1.15.14",
     minimum_bazel_version = "2.2.0",
 )
 

diff --git a/build/workspace.bzl b/build/workspace.bzl
@@ -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.13-buster.0
-# Arches: skopeo inspect --raw docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.13-buster.0
+# 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
 _GO_RUNNER_DIGEST = {
-    "manifest": "sha256:4e96ec5dd39b1761eadc23e539eb17cb507953c98e34f45e24c18487d2116d65",
-    "amd64": "sha256:96af15fb8033cd0e54a37555ac42da6bcc30369917652fe6d1ebf8f0e6206f42",
-    "arm": "sha256:a365f9e69a184813c6456a413b98ca51bb76d0fbcfd24e7ce45935f9f7acecd5",
-    "arm64": "sha256:65fe98f99598a75e335893c647694123a1b29092b4c3cbfa80b60d5f26191e58",
-    "ppc64le": "sha256:fe4a3a3c4270b55f3cb88fcfbdebab3d6de7ed789b70bf398e9114b0c6ab2a16",
-    "s390x": "sha256:58f4fcdd828c5b08cf8b49c9ead57b4e35b625b472f1e5c40bf3616bb244cb84",
+    "manifest": "sha256:ce9328e06037ec8ca6bc4233d2d3f60fb4a4157462b660c56bc984bb31a62940",
+    "amd64": "sha256:2aede631c3f17a99a75664e914822eed5ae2093f52900e98966e83dc70e8947f",
+    "arm": "sha256:3587b0891bae56d074899485f341fe867527bec794dab22874f484804f8369fe",
+    "arm64": "sha256:637e26085ccea7783d84340cd5363925f64b5138d9c061a86666986f99082fe4",
+    "ppc64le": "sha256:ba8d09474f0ab648eabd13b241b059ed26c275639b09ad5a0af291dce6e3cb90",
+    "s390x": "sha256:e7db8707e6ed74402eeb057d07d4844fb63e0c748b268fc6d8656362133f8ecc",
 }
 
 def _digest(d, arch):
@@ -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.13-buster.0",  # ignored, but kept here for documentation
+            tag = "v2.3.1-go1.15.14-buster.0",  # ignored, but kept here for documentation
         )
 
         container_pull(

diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.15.13 AS builder
+FROM golang:1.15.14 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
 

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -4,7 +4,7 @@ recursive-delete-patterns:
 - BUILD.bazel
 - "*/BUILD.bazel"
 - Gopkg.toml
-default-go-version: 1.15.13
+default-go-version: 1.15.14
 rules:
 - destination: code-generator
   branches:
@@ -26,7 +26,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/code-generator
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
 
 - destination: apimachinery
   library: true
@@ -49,7 +49,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/apimachinery
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
 
 - destination: api
   library: true
@@ -81,7 +81,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/api
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
       - repository: apimachinery
         branch: release-1.19
@@ -122,7 +122,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/client-go
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
       - repository: apimachinery
         branch: release-1.19
@@ -175,7 +175,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/component-base
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -247,7 +247,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/apiserver
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -317,7 +317,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-aggregator
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -397,7 +397,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/sample-apiserver
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -470,7 +470,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/sample-controller
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -551,7 +551,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/apiextensions-apiserver
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -616,7 +616,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/metrics
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -669,7 +669,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cli-runtime
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: api
       branch: release-1.19
@@ -726,7 +726,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/sample-cli-plugin
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: api
       branch: release-1.19
@@ -785,7 +785,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-proxy
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -836,7 +836,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kubelet
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -895,7 +895,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-scheduler
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -928,7 +928,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/controller-manager
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
 
 - destination: cloud-provider
   library: true
@@ -978,7 +978,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cloud-provider
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1043,7 +1043,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-controller-manager
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1090,7 +1090,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cluster-bootstrap
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1141,7 +1141,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/csi-translation-lib
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1222,7 +1222,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/legacy-cloud-providers
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1278,7 +1278,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cri-api
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
 
 - destination: kubectl
   library: true
@@ -1348,7 +1348,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kubectl
     name: release-1.19
-    go: 1.15.13
+    go: 1.15.14
     dependencies:
     - repository: api
       branch: release-1.19

diff --git a/test/images/Makefile b/test/images/Makefile
@@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 GOARM ?= 7
 DOCKER_CERT_BASE_PATH ?=
 QEMUVERSION=v5.1.0-2
-GOLANG_VERSION=1.15.13
+GOLANG_VERSION=1.15.14
 export
 
 ifndef WHAT

diff --git a/test/images/sample-apiserver/Makefile b/test/images/sample-apiserver/Makefile
@@ -24,7 +24,7 @@ export
 # Get without building to populate module cache
 # Then, get with OS/ARCH-specific env to build
 bin:
-	docker run --rm -it -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.13-legacy-1 \
+	docker run --rm -it -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.14-legacy-1 \
 		/bin/bash -c "\
 			mkdir -p /go/src /go/bin && \
 			GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \