Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pushing a new KubeDNS image and updating the YAML files #27895

Merged
merged 1 commit into from
Jun 22, 2016
Merged

Pushing a new KubeDNS image and updating the YAML files #27895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions build/kube-dns/Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions build/kube-dns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down