Skip to content

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

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
parents df99dfd0 f1ff86f1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
build/kube-dns/Changelog
View file @ d5033c27
...@@ -13,3 +13,5 @@ ...@@ -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)
build/kube-dns/Makefile
View file @ d5033c27
...@@ -22,7 +22,7 @@ ...@@ -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
......
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View file @ d5033c27
...@@ -21,7 +21,7 @@ spec: ...@@ -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
......
cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
View file @ d5033c27
...@@ -39,7 +39,7 @@ spec: ...@@ -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
......
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