mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 02:11:09 +00:00
Merge pull request #106956 from cpanato/gco1175
[go1.17] Update to go1.17.5
This commit is contained in:
commit
4ea2448be2
@ -1 +1 @@
|
||||
v1.24.0-go1.17.4-bullseye.0
|
||||
v1.24.0-go1.17.5-bullseye.0
|
||||
|
@ -91,7 +91,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||
|
||||
# These are the default versions (image tags) for their respective base images.
|
||||
readonly __default_debian_iptables_version=bullseye-v1.1.0
|
||||
readonly __default_go_runner_version=v2.3.1-go1.17.4-bullseye.0
|
||||
readonly __default_go_runner_version=v2.3.1-go1.17.5-bullseye.0
|
||||
readonly __default_setcap_version=bullseye-v1.0.0
|
||||
|
||||
# These are the base images for the Docker-wrapped binaries.
|
||||
|
@ -87,7 +87,7 @@ dependencies:
|
||||
|
||||
# Golang
|
||||
- name: "golang: upstream version"
|
||||
version: 1.17.4
|
||||
version: 1.17.5
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
- path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
|
||||
@ -110,13 +110,13 @@ dependencies:
|
||||
match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||
|
||||
- name: "golang: etcd release version"
|
||||
version: 1.16.11
|
||||
version: 1.16.12
|
||||
refPaths:
|
||||
- path: cluster/images/etcd/Makefile
|
||||
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
|
||||
|
||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||
version: v1.24.0-go1.17.4-bullseye.0
|
||||
version: v1.24.0-go1.17.5-bullseye.0
|
||||
refPaths:
|
||||
- path: build/build-image/cross/VERSION
|
||||
|
||||
@ -146,7 +146,7 @@ dependencies:
|
||||
match: configs\[DebianIptables\] = Config{list\.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.17.4-bullseye.0
|
||||
version: v2.3.1-go1.17.5-bullseye.0
|
||||
refPaths:
|
||||
- path: build/common.sh
|
||||
match: __default_go_runner_version=
|
||||
|
@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM golang:1.17.4 AS builder
|
||||
FROM golang:1.17.5 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
|
||||
|
||||
|
@ -62,7 +62,7 @@ endif
|
||||
# This option is for running docker manifest command
|
||||
export DOCKER_CLI_EXPERIMENTAL := enabled
|
||||
# golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
|
||||
GOLANG_VERSION?=1.16.11
|
||||
GOLANG_VERSION?=1.16.12
|
||||
GOARM?=7
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
|
||||
|
@ -7,7 +7,7 @@ recursive-delete-patterns:
|
||||
- BUILD.bazel
|
||||
- "*/BUILD.bazel"
|
||||
- Gopkg.toml
|
||||
default-go-version: 1.17.4
|
||||
default-go-version: 1.17.5
|
||||
rules:
|
||||
- destination: code-generator
|
||||
branches:
|
||||
|
@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.io/e2e-test-images
|
||||
GOARM ?= 7
|
||||
DOCKER_CERT_BASE_PATH ?=
|
||||
QEMUVERSION=v5.1.0-2
|
||||
GOLANG_VERSION=1.17.4
|
||||
GOLANG_VERSION=1.17.5
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
Loading…
Reference in New Issue
Block a user