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

Automated cherry pick of #9512: Update kube-router to v1.0.0 #9547: Widen the tolerations of kuberouter #9557

Merged
merged 3 commits into from
Jul 13, 2020
Merged

Automated cherry pick of #9512: Update kube-router to v1.0.0 #9547: Widen the tolerations of kuberouter #9557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50d6f7d
Update kube-router to v1.0.0
Jul 7, 2020
ccd7511
Widen the tolerations of kuberouter
johngmyers Jul 10, 2020
1696b7e
Update bindata
Jul 13, 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
27 changes: 12 additions & 15 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.

22 changes: 11 additions & 11 deletions upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pulled and modified from https://github.com/cloudnativelabs/kube-router/blob/v0.4.0/daemonset/kubeadm-kuberouter.yaml
# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.0.0/daemonset/kubeadm-kuberouter.yaml

apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -49,7 +49,7 @@ spec:
serviceAccountName: kube-router
containers:
- name: kube-router
image: docker.io/cloudnativelabs/kube-router:v0.4.0
image: docker.io/cloudnativelabs/kube-router:v1.0.0
args:
- --run-router=true
- --run-firewall=true
Expand Down Expand Up @@ -84,9 +84,12 @@ spec:
- name: kubeconfig
mountPath: /var/lib/kube-router/kubeconfig
readOnly: true
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
initContainers:
- name: install-cni
image: busybox
image: docker.io/cloudnativelabs/kube-router:v1.0.0
command:
- /bin/sh
- -c
Expand All @@ -106,14 +109,7 @@ spec:
name: kube-router-cfg
hostNetwork: true
tolerations:
- key: CriticalAddonsOnly
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
- effect: NoSchedule
key: node.kubernetes.io/not-ready
operator: Exists
- operator: Exists
volumes:
- name: lib-modules
hostPath:
Expand All @@ -127,6 +123,10 @@ spec:
- name: kubeconfig
hostPath:
path: /var/lib/kube-router/kubeconfig
- name: xtables-lock
hostPath:
path: /run/xtables.lock
type: FileOrCreate
---
apiVersion: v1
kind: ServiceAccount
Expand Down
5 changes: 1 addition & 4 deletions upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.6.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,7 @@ spec:
hostNetwork: true
serviceAccountName: kube-router
tolerations:
- key: CriticalAddonsOnly
operator: Exists
- effect: NoSchedule
operator: Exists
- operator: Exists
volumes:
- hostPath:
path: /lib/modules
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 @@ -853,8 +853,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if b.cluster.Spec.Networking.Kuberouter != nil {
key := "networking.kuberouter"
versions := map[string]string{
"k8s-1.6": "0.3.1-kops.3",
"k8s-1.12": "0.4.0-kops.3",
"k8s-1.6": "0.3.1-kops.4",
"k8s-1.12": "1.0.0-kops.2",
}

{
Expand Down