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

Fix dns selectors for older k8s #9431

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Fix dns selectors for older k8s #9431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 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 @@ -119,7 +119,7 @@ spec:
- --logtostderr=true
- --v=2
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/role: master
priorityClassName: system-cluster-critical
tolerations:
- key: "CriticalAddonsOnly"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -70,7 +70,7 @@ spec:
- --logtostderr=true
- --v=2
nodeSelector:
kubernetes.io/arch: amd64
kubernetes.io/role: master
priorityClassName: system-cluster-critical
tolerations:
- key: "CriticalAddonsOnly"
Expand Down
4 changes: 4 additions & 0 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 @@ -68,9 +68,13 @@ spec:
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
- --logtostderr=true
- --v=2
nodeSelector:
kubernetes.io/role: master
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
- key: node-role.kubernetes.io/master
operator: Exists
serviceAccountName: kube-dns-autoscaler

---
Expand Down
4 changes: 2 additions & 2 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,15 +21,15 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
Expand Down
4 changes: 2 additions & 2 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,15 +21,15 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
Expand Down
4 changes: 2 additions & 2 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,15 +21,15 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
Expand Down
4 changes: 2 additions & 2 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,15 +21,15 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
manifestHash: 7778a47fa6bda0bae9e0eeea1593a117a9b8bba4
manifestHash: 9fd3af6ffc7eb38e9e4d65326eff859dbe188be6
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.14.13-kops.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: c1d396ba1997d0eb54586cc14da24fb07548e215
manifestHash: 5542a0a05fb3bf378d7aebebf0f5dcf2c4b2071e
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
Expand Down