github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #31392 from MrHohn/push-kube-dns 

Automatic merge from submit-queue

Build and push kube-dns for 1.4 release.

Fix #31355.

Following docker images had been uploaded:
gcr.io/google_containers/kubedns-amd64:1.7
gcr.io/google_containers/kubedns-arm:1.7
gcr.io/google_containers/kubedns-arm64:1.7

Build for ppc64le is disabled by default, and it failed to be built using:
`KUBE_BUILD_PPC64LE=y make release`

I'm still working on making the ppc64le build. Updates will be added following this thread.

@girishkalele @thockin
pull/6/head
Kubernetes Submit Queue 2016-08-26 00:40:10 -07:00 committed by GitHub
parent df99dfd04d f1ff86f189
commit d5033c27e4
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/kube-dns/Changelog
View File

@ -13,3 +13,5 @@
## Version 1.6 (Wed June 29 2016 Girish Kalele <gkalele@google.com>) ## Version 1.6 (Wed June 29 2016 Girish Kalele <gkalele@google.com>)
- Godeps update for vendor code (skydns/mux) - Godeps update for vendor code (skydns/mux)
## Version 1.7 (Wed August 24 2016 Zihong Zheng <zihongz@google.com>)
- Add support for ExternalName services (pr #31159)

2
build/kube-dns/Makefile
View File

@ -22,7 +22,7 @@
# Default registry, arch and tag. This can be overwritten by arguments to make # Default registry, arch and tag. This can be overwritten by arguments to make
PLATFORM?=linux PLATFORM?=linux
ARCH?=amd64 ARCH?=amd64
TAG?=1.6 TAG?=1.7
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION=1.6 GOLANG_VERSION=1.6

2
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View File

@ -21,7 +21,7 @@ spec:
spec: spec:
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.5 image: gcr.io/google_containers/kubedns-amd64:1.7
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in

2
cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
View File

@ -39,7 +39,7 @@ spec:
spec: spec:
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/kubedns-{{ arch }}:1.6 image: gcr.io/google_containers/kubedns-{{ arch }}:1.7
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in