Merge pull request #101846 from cpanato/automated-cherry-pick-of-#101…

…845-upstream-release-1.19 [1.19][go1.15] Update to go1.15.12
kubernetes · May 10, 2021 · 0657e7d · 0657e7d
2 parents cc22cfa + c5058d5
commit 0657e7d
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 50 deletions.
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.15.11-legacy-1
+v1.15.12-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=v12.1.2
-  local go_runner_version=v2.3.1-go1.15.11-buster.0
+  local go_runner_version=v2.3.1-go1.15.12-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.6
+    version: 0.1.7
     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.11
+    version: 1.15.12
     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.11-legacy-1
+    version: v1.15.12-legacy-1
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: test/images/sample-apiserver/Dockerfile
@@ -146,7 +146,7 @@ dependencies:
       match: configs\[DebianIptables\] = Config{buildImageRegistry, "debian-iptables", "v\d+\.\d+.\d+"}
 
   - name: "k8s.gcr.io/go-runner: dependents"
-    version: v2.3.1-go1.15.11-buster.0
+    version: v2.3.1-go1.15.12-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.6",
-    sha256 = "a51e1a20d9a286042bd5d171fdbc941b90779f71b1bf7f960935e91f5048a73b",
+    strip_prefix = "repo-infra-0.1.7",
+    sha256 = "8947a185f5af08472786c1ebb80c9b72cfa16cb7fc2b33d55e5b50db69d909c9",
     urls = [
-        "https://github.com/kubernetes/repo-infra/archive/v0.1.6.tar.gz",
+        "https://github.com/kubernetes/repo-infra/archive/v0.1.7.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.11",
+    override_go_version = "1.15.12",
     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.11-buster.0
-# Arches: skopeo inspect --raw docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.11-buster.0
+# Manifest: skopeo inspect docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.12-buster.0
+# Arches: skopeo inspect --raw docker://k8s.gcr.io/build-image/go-runner:v2.3.1-go1.15.12-buster.0
 _GO_RUNNER_DIGEST = {
-    "manifest": "sha256:90c2f48c26fbbf1406450e8ba1e80a4bd15d53a2a4daacb63ff8d242413c2128",
-    "amd64": "sha256:64b82491bd6809429b2a65da771d7d46e2d6b018d1d68f89ffaee1154e46f7a3",
-    "arm": "sha256:c4dc079e4e19f193d94647c54410a68a4c2344cf5ced165231eaf01697a41353",
-    "arm64": "sha256:6ca69811c32bbf0a055bef1f4a92e3bf454a96352bd5a22ef98b36df6562fe86",
-    "ppc64le": "sha256:356f6eff717454cdd5cb07b835a448abfc35c3f9674bcbb39fa75f47397edcf2",
-    "s390x": "sha256:6f9c2680c0516345270825ac702f0f53dbfe08a05e11674c175e872da445c468",
+    "manifest": "sha256:d3d705c7de100a7cf49df13c4198d156078d6273032de503f723ba1534a6170f",
+    "amd64": "sha256:1c220d5a4755398fe10d90f14c94d0a4e1f444cff54b27a53a3d1e66b1eca0b9",
+    "arm": "sha256:e8e8f55970c493fd3a40f06ec7a3eae8bff3ac3163217ea9bc3c4fdcca1ad150",
+    "arm64": "sha256:0d403be4b772296bac0fddc8d5aa1024e1149c8ea8f773708395352ea385f93d",
+    "ppc64le": "sha256:c2d7228164f6e6b4a965fa4e44479c3eed0a91a9aa8bb10334d898361ca4251a",
+    "s390x": "sha256:a45c19002eecddf80aebc0f119c4a04969a2ed274a53993f17c6303d7f71de47",
 }
 
 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.11-buster.0",  # ignored, but kept here for documentation
+            tag = "v2.3.1-go1.15.12-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.11 AS builder
+FROM golang:1.15.12 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.11
+default-go-version: 1.15.12
 rules:
 - destination: code-generator
   branches:
@@ -31,12 +31,12 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/code-generator
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
   - source:
       branch: release-1.20
       dir: staging/src/k8s.io/code-generator
     name: release-1.20
-    go: 1.15.11
+    go: 1.15.12
 
 - destination: apimachinery
   library: true
@@ -64,12 +64,12 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/apimachinery
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
   - source:
       branch: release-1.20
       dir: staging/src/k8s.io/apimachinery
     name: release-1.20
-    go: 1.15.11
+    go: 1.15.12
 
 - destination: api
   library: true
@@ -109,7 +109,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/api
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
       - repository: apimachinery
         branch: release-1.19
@@ -160,7 +160,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/client-go
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
       - repository: apimachinery
         branch: release-1.19
@@ -225,7 +225,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/component-base
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -296,7 +296,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/apiserver
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -384,7 +384,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-aggregator
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -484,7 +484,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/sample-apiserver
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -573,7 +573,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/sample-controller
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -674,7 +674,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/apiextensions-apiserver
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -753,7 +753,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/metrics
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -818,7 +818,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cli-runtime
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: api
       branch: release-1.19
@@ -889,7 +889,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/sample-cli-plugin
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: api
       branch: release-1.19
@@ -962,7 +962,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-proxy
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1023,7 +1023,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kubelet
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1096,7 +1096,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-scheduler
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1169,7 +1169,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kube-controller-manager
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1226,7 +1226,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cluster-bootstrap
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: apimachinery
       branch: release-1.19
@@ -1289,7 +1289,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cloud-provider
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1364,7 +1364,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/csi-translation-lib
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1463,7 +1463,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/legacy-cloud-providers
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1538,12 +1538,12 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/cri-api
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
   - source:
       branch: release-1.20
       dir: staging/src/k8s.io/cri-api
     name: release-1.20
-    go: 1.15.11
+    go: 1.15.12
 
 - destination: kubectl
   library: true
@@ -1631,7 +1631,7 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/kubectl
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
     dependencies:
     - repository: api
       branch: release-1.19
@@ -1659,4 +1659,4 @@ rules:
       branch: release-1.19
       dir: staging/src/k8s.io/controller-manager
     name: release-1.19
-    go: 1.15.11
+    go: 1.15.12
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=v2.9.1
-GOLANG_VERSION=1.15.11
+GOLANG_VERSION=1.15.12
 export
 
 ifndef WHAT

diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASEIMAGE
-FROM k8s.gcr.io/build-image/kube-cross:v1.15.11-legacy-1 as build_k8s_1_17_sample_apiserver
+FROM k8s.gcr.io/build-image/kube-cross:v1.15.12-legacy-1 as build_k8s_1_17_sample_apiserver
 
 ENV GOPATH /go
 RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin