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

Merge pull request #8503 from gjtempleton/CoreDNS-1.6.7-Revert-master 

Revert "Merge pull request #8452 from maruina/coredns-1.6.7"
This commit is contained in:
Kubernetes Prow Robot 2020-02-06 17:31:32 -08:00 committed by GitHub
parent 3c85693938 f6b6f277d9
commit 6cebe2d499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.7{{ end }}
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.6{{ end }}
imagePullPolicy: IfNotPresent
resources:
limits:

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

@ -113,7 +113,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.7{{ 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

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