Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update KubeDNS to v1.15.13 #9462

Merged
merged 2 commits into from
Jun 30, 2020
Merged

Update KubeDNS to v1.15.13 #9462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48c2c3
Update KubeDNS to v1.15.13
Jun 30, 2020
81b429c
Update tests output
Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions upup/models/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ spec:
spec:
containers:
- name: autoscaler
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.4.0
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1
resources:
requests:
cpu: "20m"
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
spec:
containers:
- name: autoscaler
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.4.0
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1
resources:
requests:
cpu: "20m"
Expand Down Expand Up @@ -134,7 +134,7 @@ spec:

containers:
- name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns:1.14.13
image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
Expand Down Expand Up @@ -228,7 +228,7 @@ spec:
mountPath: /etc/k8s/dns/dnsmasq-nanny

- name: sidecar
image: k8s.gcr.io/k8s-dns-sidecar:1.14.13
image: k8s.gcr.io/k8s-dns-sidecar:1.15.13
livenessProbe:
httpGet:
path: /metrics
Expand Down
8 changes: 4 additions & 4 deletions upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
spec:
containers:
- name: autoscaler
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.2-r2
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1
resources:
requests:
cpu: "20m"
Expand Down Expand Up @@ -121,7 +121,7 @@ spec:

containers:
- name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns:1.14.10
image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
Expand Down Expand Up @@ -173,7 +173,7 @@ spec:
mountPath: /kube-dns-config

- name: dnsmasq
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.10
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.15.13
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
Expand Down Expand Up @@ -215,7 +215,7 @@ spec:
mountPath: /etc/k8s/dns/dnsmasq-nanny

- name: sidecar
image: k8s.gcr.io/k8s-dns-sidecar:1.14.10
image: k8s.gcr.io/k8s-dns-sidecar:1.15.13
livenessProbe:
httpGet:
path: /metrics
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

{
key := "kube-dns.addons.k8s.io"
version := "1.14.13-kops.2"
version := "1.15.13-kops.1"

{
location := key + "/k8s-1.6.yaml"
Expand Down Expand Up @@ -280,7 +280,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

{
key := "coredns.addons.k8s.io"
version := "1.6.7-kops.1"
version := "1.6.7-kops.2"

{
location := key + "/k8s-1.12.yaml"
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
manifestHash: dc3d42acafa02913589a75b6800ed22aa4ff97b1
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
manifestHash: bef376880342f3d48af99b0d9cb2298a0d77c620
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.8
manifest: rbac.addons.k8s.io/k8s-1.8.yaml
manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
manifestHash: dc3d42acafa02913589a75b6800ed22aa4ff97b1
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
manifestHash: bef376880342f3d48af99b0d9cb2298a0d77c620
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.8
manifest: rbac.addons.k8s.io/k8s-1.8.yaml
manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
manifestHash: dc3d42acafa02913589a75b6800ed22aa4ff97b1
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
manifestHash: bef376880342f3d48af99b0d9cb2298a0d77c620
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.8
manifest: rbac.addons.k8s.io/k8s-1.8.yaml
manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
manifestHash: dc3d42acafa02913589a75b6800ed22aa4ff97b1
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
manifestHash: bef376880342f3d48af99b0d9cb2298a0d77c620
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
version: 1.15.13-kops.1
- id: k8s-1.8
manifest: rbac.addons.k8s.io/k8s-1.8.yaml
manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914
Expand Down