kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8333 from gjtempleton/CoreDNS-1.6.6 

CoreDNS default image bump to 1.6.6 to resolve CVE
This commit is contained in:
Kubernetes Prow Robot 2020-01-26 23:39:02 -08:00 committed by GitHub
parent 82b3bd5a0f d15971e240
commit 1860e409d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -64,7 +64,9 @@ data:
{{- else }}
.:53 {
errors
health
health {
lameduck 5s
}
kubernetes {{ KubeDNS.Domain }}. in-addr.arpa ip6.arpa {
pods insecure
upstream
@ -165,7 +167,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.3.1{{ end }}
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.6{{ end }}
imagePullPolicy: IfNotPresent
resources:
limits:
@ -175,9 +177,6 @@ spec:
memory: {{ KubeDNS.MemoryRequest }}
args: [ "-conf", "/etc/coredns/Corefile" ]
volumeMounts:
# Workaround for 1.3.1 bug, can be removed after bumping to 1.4+. See: https://github.com/coredns/coredns/pull/2529
- name: tmp
mountPath: /tmp
- name: config-volume
mountPath: /etc/coredns
readOnly: true
@ -215,9 +214,6 @@ spec:
scheme: HTTP
dnsPolicy: Default
volumes:
# Workaround for 1.3.1 bug, can be removed after bumping to 1.4+. See: https://github.com/coredns/coredns/pull/2529
- name: tmp
emptyDir: {}
- name: config-volume
configMap:
name: coredns

6
upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template
View File

@ -64,7 +64,9 @@ data:
{{- else }}
.:53 {
errors
health
health {
lameduck 5s
}
kubernetes {{ KubeDNS.Domain }}. in-addr.arpa ip6.arpa {
pods insecure
upstream
@ -111,7 +113,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.3.1{{ end }}
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.6{{ end }}
imagePullPolicy: IfNotPresent
resources:
limits:

4
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -285,7 +285,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if kubeDNS.Provider == "CoreDNS" {
{
key := "coredns.addons.k8s.io"
version := "1.3.1-kops.5"
version := "1.6.6-kops.1"
{
location := key + "/k8s-1.6.yaml"
@ -304,7 +304,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
{
key := "coredns.addons.k8s.io"
version := "1.3.1-kops.5"
version := "1.6.6-kops.1"
{
location := key + "/k8s-1.12.yaml"