github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue
2017-05-29 11:14:05 -07:00
committed by GitHub
parent 4d358a23b6 79a7dc218e
commit fde99a1c0f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cni/Makefile
View File

@@ -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

2
cluster/images/etcd/Makefile
View File

@@ -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)