Skip to content

Commit a2978e3

Browse files
authored
Merge pull request kubernetes#92718 from rajansandeep/kube-up-coredns1.7.0
[kube-up]: Bump CoreDNS to v1.7.0
2 parents 888255b + adffc7f commit a2978e3

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
match: cniVersion[\t\n\f\r ]*=
1313

1414
- name: "coredns-kube-up"
15-
version: 1.6.7
15+
version: 1.7.0
1616
refPaths:
1717
- path: cluster/addons/dns/coredns/coredns.yaml.base
1818
match: k8s.gcr.io/coredns

cluster/addons/dns/coredns/coredns.yaml.base

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ data:
7373
ttl 30
7474
}
7575
prometheus :9153
76-
forward . /etc/resolv.conf
76+
forward . /etc/resolv.conf {
77+
max_concurrent 1000
78+
}
7779
cache 30
7880
loop
7981
reload
@@ -129,7 +131,7 @@ spec:
129131
kubernetes.io/os: linux
130132
containers:
131133
- name: coredns
132-
image: k8s.gcr.io/coredns:1.6.7
134+
image: k8s.gcr.io/coredns:1.7.0
133135
imagePullPolicy: IfNotPresent
134136
resources:
135137
limits:

cluster/addons/dns/coredns/coredns.yaml.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ data:
7373
ttl 30
7474
}
7575
prometheus :9153
76-
forward . /etc/resolv.conf
76+
forward . /etc/resolv.conf {
77+
max_concurrent 1000
78+
}
7779
cache 30
7880
loop
7981
reload
@@ -129,7 +131,7 @@ spec:
129131
kubernetes.io/os: linux
130132
containers:
131133
- name: coredns
132-
image: k8s.gcr.io/coredns:1.6.7
134+
image: k8s.gcr.io/coredns:1.7.0
133135
imagePullPolicy: IfNotPresent
134136
resources:
135137
limits:

cluster/addons/dns/coredns/coredns.yaml.sed

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ data:
7373
ttl 30
7474
}
7575
prometheus :9153
76-
forward . /etc/resolv.conf
76+
forward . /etc/resolv.conf {
77+
max_concurrent 1000
78+
}
7779
cache 30
7880
loop
7981
reload
@@ -129,7 +131,7 @@ spec:
129131
kubernetes.io/os: linux
130132
containers:
131133
- name: coredns
132-
image: k8s.gcr.io/coredns:1.6.7
134+
image: k8s.gcr.io/coredns:1.7.0
133135
imagePullPolicy: IfNotPresent
134136
resources:
135137
limits:

cluster/gce/upgrade.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -477,35 +477,35 @@ function update-coredns-config() {
477477
case "$(uname -m)" in
478478
x86_64*)
479479
host_arch=amd64
480-
corefile_tool_SHA="b902651aa26434f9aa087cadb634a1c26e9808571d48241e4d3c4ecf21a773ff"
480+
corefile_tool_SHA="2e1da3d2a27e103597438ccc99be5cf909fd1be038c4770ddac3985e7df18fa2"
481481
;;
482482
i?86_64*)
483483
host_arch=amd64
484-
corefile_tool_SHA="b902651aa26434f9aa087cadb634a1c26e9808571d48241e4d3c4ecf21a773ff"
484+
corefile_tool_SHA="2e1da3d2a27e103597438ccc99be5cf909fd1be038c4770ddac3985e7df18fa2"
485485
;;
486486
amd64*)
487487
host_arch=amd64
488-
corefile_tool_SHA="b902651aa26434f9aa087cadb634a1c26e9808571d48241e4d3c4ecf21a773ff"
488+
corefile_tool_SHA="2e1da3d2a27e103597438ccc99be5cf909fd1be038c4770ddac3985e7df18fa2"
489489
;;
490490
aarch64*)
491491
host_arch=arm64
492-
corefile_tool_SHA="d8be194de0f430e364da9de148693b11bcbaf31751f6aa77ea2c8a4e2418503a"
492+
corefile_tool_SHA="12a08dfa9f01b806ab46902c1e6c909fdf93264f8c6aac3d951e7ac30d9c7f9b"
493493
;;
494494
arm64*)
495495
host_arch=arm64
496-
corefile_tool_SHA="d8be194de0f430e364da9de148693b11bcbaf31751f6aa77ea2c8a4e2418503a"
496+
corefile_tool_SHA="12a08dfa9f01b806ab46902c1e6c909fdf93264f8c6aac3d951e7ac30d9c7f9b"
497497
;;
498498
arm*)
499499
host_arch=arm
500-
corefile_tool_SHA="d7ba2ebe740382ed7c5f00bc00eda3d383b2bbbe3554ffb12b912946d28ceb59"
500+
corefile_tool_SHA="b5d83f5e29a2900cc345de8e7b5b25c4e5534e57d61bf52395343d76e64026e3"
501501
;;
502502
s390x*)
503503
host_arch=s390x
504-
corefile_tool_SHA="77eac119aef08fcf1541f3594138838fbfe4669e309b20d530247dff408a67c0"
504+
corefile_tool_SHA="29754c9966f5215260562eed1db1017e86462dbaba1c0ee9801f0f9cdae3bd2f"
505505
;;
506506
ppc64le*)
507507
host_arch=ppc64le
508-
corefile_tool_SHA="f1bd00d9f3846c3fbedb4dd53fd61c5daf6d09a75c0d24fe8744f4f7b7252acb"
508+
corefile_tool_SHA="c4271ddc80345ed7b3a3d41b706c5c7abb4ad6a3e3e9f20fe8849699e399adc8"
509509
;;
510510
*)
511511
echo "Unsupported host arch. Must be x86_64, 386, arm, arm64, s390x or ppc64le." >&2
@@ -515,7 +515,7 @@ function update-coredns-config() {
515515

516516
# Download the CoreDNS migration tool
517517
echo "== Downloading the CoreDNS migration tool =="
518-
wget -P "${download_dir}" "https://github.com/coredns/corefile-migration/releases/download/v1.0.6/corefile-tool-${host_arch}" >/dev/null 2>&1
518+
wget -P "${download_dir}" "https://github.com/coredns/corefile-migration/releases/download/v1.0.10/corefile-tool-${host_arch}" >/dev/null 2>&1
519519

520520
local -r checkSHA=$(sha256sum "${download_dir}/corefile-tool-${host_arch}" | cut -d " " -f 1)
521521
if [[ "${checkSHA}" != "${corefile_tool_SHA}" ]]; then

0 commit comments

Comments
 (0)