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

Cni toleration for tainted nodes #5804

Merged
merged 4 commits into from
Sep 19, 2018
Merged

Cni toleration for tainted nodes #5804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46d3682
Update tolerations in Cilium spec so the pods can run on all nodes
Sep 18, 2018
3f6df6f
Update tolerations in Amazon VPC CNI spec so the pods can run on all …
Sep 18, 2018
2dbc044
bump verions in the boostrapchannelbuilder per @mikesplain
Sep 19, 2018
1ea1c27
bump cilium manifest version in tests
Sep 19, 2018
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
2 changes: 2 additions & 0 deletions upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.7.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ spec:
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: CriticalAddonsOnly
operator: Exists
containers:
Expand Down
8 changes: 6 additions & 2 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,14 +387,18 @@ spec:
path: /srv/kubernetes/calico
{{- end }}
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
# Mark cilium's pod as critical for rescheduling
- key: CriticalAddonsOnly
operator: "Exists"
- effect: NoExecute
operator: Exists
# Allow the pod to run on all nodes. This is required
# for cluster communication
- effect: NoSchedule
operator: Exists
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
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 @@ -740,7 +740,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri

if b.cluster.Spec.Networking.AmazonVPC != nil {
key := "networking.amazon-vpc-routed-eni"
version := "1.0.0-kops.1"
version := "1.0.0-kops.2"

{
id := "k8s-1.7"
Expand All @@ -760,7 +760,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri

if b.cluster.Spec.Networking.Cilium != nil {
key := "networking.cilium.io"
version := "v1.0-kops.1"
version := "v1.0-kops.2"

{
id := "k8s-1.7"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -69,4 +69,4 @@ spec:
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: v1.0-kops.1
version: v1.0-kops.2