From 15a4ae943bea6ede1219cf96aa367fc0621a4d60 Mon Sep 17 00:00:00 2001
From: jmgao <jmgaozz@163.com>
Date: Sat, 27 Jan 2018 13:54:12 +0800
Subject: [PATCH] update kubedns to 1.14.8

---
 docs/guide/kubedns.md                  |  8 ++++++++
 manifests/kubedns/kubedns.yaml         | 12 ++++++------
 roles/deploy/templates/kubedns.yaml.j2 | 12 ++++++------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/docs/guide/kubedns.md b/docs/guide/kubedns.md
index f750c88b0..180f94cbd 100644
--- a/docs/guide/kubedns.md
+++ b/docs/guide/kubedns.md
@@ -4,6 +4,14 @@ kubedns 是 k8s 集群首先需要部署的，集群中的其他 pods 使用它
 
 配置文件参考 `https://github.com/kubernetes/kubernetes` 项目目录 `kubernetes/cluster/addons/dns` 
 
+更新 `kube-dns to 1.14.8`，如果集群中已经运行kubedns插件，请使用`RollingUpdate`如下：
+
+```
+kubectl set image -n kube-system deploy/kube-dns kubedns=mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.8
+kubectl set image -n kube-system deploy/kube-dns dnsmasq=mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.8
+kubectl set image -n kube-system deploy/kube-dns sidecar=mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.8
+```
+
 ### 安装
 
 **kubectl create -f /etc/ansible/manifests/kubedns/[kubedns.yaml](../../manifests/kubedns/kubedns.yaml)**
diff --git a/manifests/kubedns/kubedns.yaml b/manifests/kubedns/kubedns.yaml
index 456296f97..3763d31c8 100644
--- a/manifests/kubedns/kubedns.yaml
+++ b/manifests/kubedns/kubedns.yaml
@@ -79,8 +79,8 @@ spec:
           optional: true
       containers:
       - name: kubedns
-        #image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
-        image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.5
+        #image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8
+        image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.8
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -131,8 +131,8 @@ spec:
         - name: kube-dns-config
           mountPath: /kube-dns-config
       - name: dnsmasq
-        #image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
-        image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
+        #image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8
+        image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.8
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -170,8 +170,8 @@ spec:
         - name: kube-dns-config
           mountPath: /etc/k8s/dns/dnsmasq-nanny
       - name: sidecar
-        #image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
-        image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.5
+        #image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8
+        image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.8
         livenessProbe:
           httpGet:
             path: /metrics
diff --git a/roles/deploy/templates/kubedns.yaml.j2 b/roles/deploy/templates/kubedns.yaml.j2
index ff5b71d9b..80f277005 100644
--- a/roles/deploy/templates/kubedns.yaml.j2
+++ b/roles/deploy/templates/kubedns.yaml.j2
@@ -79,8 +79,8 @@ spec:
           optional: true
       containers:
       - name: kubedns
-        #image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
-        image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.5
+        #image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8
+        image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.8
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -131,8 +131,8 @@ spec:
         - name: kube-dns-config
           mountPath: /kube-dns-config
       - name: dnsmasq
-        #image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
-        image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
+        #image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8
+        image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.8
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -170,8 +170,8 @@ spec:
         - name: kube-dns-config
           mountPath: /etc/k8s/dns/dnsmasq-nanny
       - name: sidecar
-        #image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
-        image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.5
+        #image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8
+        image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.8
         livenessProbe:
           httpGet:
             path: /metrics