summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpyros Trigazis <strigazi@gmail.com>2017-09-14 13:53:27 +0000
committerSpyros Trigazis (strigazi) <strigazi@gmail.com>2017-09-14 14:15:21 +0000
commita6d9f8950cfd91e5856a047061ac8057b7e257f3 (patch)
tree27183986fe17395dee0d1e2330db2fe3d971b282
parenta5aabcb6ab84c676971528dd44ec66f6d46a9e71 (diff)
Update CoreDNS to 0114.1.4
Update CoreDNS to version 011 which includes a fix [0] for kubernetes srv and update the Corefile appropriately [1]. [0] https://github.com/coredns/coredns/pull/823 [1] https://github.com/coredns/deployment/blob/master/kubernetes/coredns.yaml.sed#L12 Closes-Bug: #1717238 (Cherry-picked from 68d7b87a0bd506ed1ed9b1e24a9eda3ec568b0ef) Change-Id: Ibeaa01578874335ddb70ac178ff708c6b953f129
Notes
Notes (review): Code-Review+2: yatin <ykarel@redhat.com> Code-Review+2: Madhuri Kumari <madhuri.kumari@intel.com> Workflow+1: Madhuri Kumari <madhuri.kumari@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 15 Sep 2017 06:42:30 +0000 Reviewed-on: https://review.openstack.org/504063 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rw-r--r--magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh
index 7f293f6..4c34f30 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh
@@ -18,9 +18,7 @@ data:
18 errors 18 errors
19 log stdout 19 log stdout
20 health 20 health
21 kubernetes ${DNS_CLUSTER_DOMAIN} { 21 kubernetes ${DNS_CLUSTER_DOMAIN} ${PORTAL_NETWORK_CIDR}
22 cidrs ${PORTAL_NETWORK_CIDR}
23 }
24 proxy . /etc/resolv.conf 22 proxy . /etc/resolv.conf
25 cache 30 23 cache 30
26 } 24 }
@@ -49,7 +47,7 @@ spec:
49 spec: 47 spec:
50 containers: 48 containers:
51 - name: coredns 49 - name: coredns
52 image: coredns/coredns:007 50 image: coredns/coredns:011
53 imagePullPolicy: Always 51 imagePullPolicy: Always
54 args: [ "-conf", "/etc/coredns/Corefile" ] 52 args: [ "-conf", "/etc/coredns/Corefile" ]
55 volumeMounts: 53 volumeMounts: