github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27895 from nikhiljindal/pushDNSImage

Browse Source 
Automatic merge from submit-queue

Pushing a new KubeDNS image and updating the YAML files

Updating KubeDNS image to include https://github.com/kubernetes/kubernetes/pull/27845

@kubernetes/sig-cluster-federation @girishkalele @mml
This commit is contained in:
k8s-merge-robot 2016-06-22 16:56:31 -07:00 committed by GitHub
commit 70fc517f79
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/kube-dns/Changelog
View File

@ -3,3 +3,6 @@
## Version 1.3 (Fri June 3 2016 Prashanth.B <beeps@google.com>)
- Fixed SRV record lookup (issue #26116)
## Version 1.4 (Tue June 21 2016 Nikhil Jindal <nikhiljindal@google.com>)
- Initialising nodesStore (issue #27820)

4
build/kube-dns/Makefile
View File

@ -17,12 +17,12 @@
# If you update this image please bump the tag value before pushing.
#
# Usage:
# [ARCH=amd64] [TAG=1.3] [REGISTRY=gcr.io/google_containers] [BASEIMAGE=busybox] make (container|push)
# [ARCH=amd64] [TAG=1.4] [REGISTRY=gcr.io/google_containers] [BASEIMAGE=busybox] make (container|push)
# Default registry, arch and tag. This can be overwritten by arguments to make
PLATFORM?=linux
ARCH?=amd64
TAG?=1.3
TAG?=1.4
REGISTRY?=gcr.io/google_containers
GOLANG_VERSION=1.6

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View File

@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v15
name: kube-dns-v16
namespace: kube-system
labels:
k8s-app: kube-dns
version: v15
version: v16
kubernetes.io/cluster-service: "true"
spec:
replicas: __PILLAR__DNS__REPLICAS__
selector:
k8s-app: kube-dns
version: v15
version: v16
template:
metadata:
labels:
k8s-app: kube-dns
version: v15
version: v16
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.3
image: gcr.io/google_containers/kubedns-amd64:1.4
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View File

@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v15
name: kube-dns-v16
namespace: kube-system
labels:
k8s-app: kube-dns
version: v15
version: v16
kubernetes.io/cluster-service: "true"
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
k8s-app: kube-dns
version: v15
version: v16
template:
metadata:
labels:
k8s-app: kube-dns
version: v15
version: v16
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.3
image: gcr.io/google_containers/kubedns-amd64:1.4
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View File

@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v15
name: kube-dns-v16
namespace: kube-system
labels:
k8s-app: kube-dns
version: v15
version: v16
kubernetes.io/cluster-service: "true"
spec:
replicas: $DNS_REPLICAS
selector:
k8s-app: kube-dns
version: v15
version: v16
template:
metadata:
labels:
k8s-app: kube-dns
version: v15
version: v16
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.3
image: gcr.io/google_containers/kubedns-amd64:1.4
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in