Skip to content

K
k3s
Commit fde99a1c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46599 from cblecker/cni-etcd-golang

Automatic merge from submit-queue (batch tested with PRs 45699, 46200, 46335, 46599) Bump CNI and etcd go base images to 1.7.6 **What this PR does / why we need it**: Addresses #46391 for CNI and etcd images. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /assign @luxas
parents 4d358a23 79a7dc21
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
build/cni/Makefile
View file @ fde99a1c
...@@ -22,7 +22,7 @@ CNI_RELEASE?=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff ...@@ -22,7 +22,7 @@ CNI_RELEASE?=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz
CUR_DIR=$(shell pwd) CUR_DIR=$(shell pwd)
OUTPUT_DIR=$(CUR_DIR)/output OUTPUT_DIR=$(CUR_DIR)/output
GOLANG_VERSION=1.7.5 GOLANG_VERSION=1.7.6
all: build all: build
......
cluster/images/etcd/Makefile
View file @ fde99a1c
...@@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.17 ...@@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.17
REGISTRY_TAG?=3.0.17 REGISTRY_TAG?=3.0.17
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.7.5 GOLANG_VERSION?=1.7.6
GOARM=7 GOARM=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment