mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	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
This commit is contained in:
		@@ -13,3 +13,5 @@
 | 
			
		||||
 ## Version 1.6 (Wed June 29 2016 Girish Kalele <gkalele@google.com>)
 | 
			
		||||
 - 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)
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@
 | 
			
		||||
# Default registry, arch and tag. This can be overwritten by arguments to make
 | 
			
		||||
PLATFORM?=linux
 | 
			
		||||
ARCH?=amd64
 | 
			
		||||
TAG?=1.6
 | 
			
		||||
TAG?=1.7
 | 
			
		||||
REGISTRY?=gcr.io/google_containers
 | 
			
		||||
 | 
			
		||||
GOLANG_VERSION=1.6
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@ spec:
 | 
			
		||||
    spec:
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: kubedns
 | 
			
		||||
        image: gcr.io/google_containers/kubedns-amd64:1.5
 | 
			
		||||
        image: gcr.io/google_containers/kubedns-amd64:1.7
 | 
			
		||||
        resources:
 | 
			
		||||
          # TODO: Set memory limits when we've profiled the container for large
 | 
			
		||||
          # clusters, then set request = limit to keep this container in
 | 
			
		||||
 
 | 
			
		||||
@@ -39,7 +39,7 @@ spec:
 | 
			
		||||
    spec:
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: kubedns
 | 
			
		||||
        image: gcr.io/google_containers/kubedns-{{ arch }}:1.6
 | 
			
		||||
        image: gcr.io/google_containers/kubedns-{{ arch }}:1.7
 | 
			
		||||
        resources:
 | 
			
		||||
          # TODO: Set memory limits when we've profiled the container for large
 | 
			
		||||
          # clusters, then set request = limit to keep this container in
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user