mirror of https://github.com/kubernetes/kops.git
Merge pull request #9512 from hakman/kube-router-v1.0.0
Update kube-router to v1.0.0
This commit is contained in:
commit
b13209d654
|
@ -7141,7 +7141,7 @@ func cloudupResourcesAddonsNetworkingKopeIoK8s16Yaml() (*asset, error) {
|
||||||
return a, nil
|
return a, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var _cloudupResourcesAddonsNetworkingKuberouterK8s112YamlTemplate = []byte(`# Pulled and modified from https://github.com/cloudnativelabs/kube-router/blob/v0.4.0/daemonset/kubeadm-kuberouter.yaml
|
var _cloudupResourcesAddonsNetworkingKuberouterK8s112YamlTemplate = []byte(`# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.0.0/daemonset/kubeadm-kuberouter.yaml
|
||||||
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
|
@ -7192,7 +7192,7 @@ spec:
|
||||||
serviceAccountName: kube-router
|
serviceAccountName: kube-router
|
||||||
containers:
|
containers:
|
||||||
- name: kube-router
|
- name: kube-router
|
||||||
image: docker.io/cloudnativelabs/kube-router:v0.4.0
|
image: docker.io/cloudnativelabs/kube-router:v1.0.0
|
||||||
args:
|
args:
|
||||||
- --run-router=true
|
- --run-router=true
|
||||||
- --run-firewall=true
|
- --run-firewall=true
|
||||||
|
@ -7227,9 +7227,12 @@ spec:
|
||||||
- name: kubeconfig
|
- name: kubeconfig
|
||||||
mountPath: /var/lib/kube-router/kubeconfig
|
mountPath: /var/lib/kube-router/kubeconfig
|
||||||
readOnly: true
|
readOnly: true
|
||||||
|
- name: xtables-lock
|
||||||
|
mountPath: /run/xtables.lock
|
||||||
|
readOnly: false
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: busybox
|
image: docker.io/cloudnativelabs/kube-router:v1.0.0
|
||||||
command:
|
command:
|
||||||
- /bin/sh
|
- /bin/sh
|
||||||
- -c
|
- -c
|
||||||
|
@ -7270,6 +7273,10 @@ spec:
|
||||||
- name: kubeconfig
|
- name: kubeconfig
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /var/lib/kube-router/kubeconfig
|
path: /var/lib/kube-router/kubeconfig
|
||||||
|
- name: xtables-lock
|
||||||
|
hostPath:
|
||||||
|
path: /run/xtables.lock
|
||||||
|
type: FileOrCreate
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
|
|
|
@ -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
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
|
@ -49,7 +49,7 @@ spec:
|
||||||
serviceAccountName: kube-router
|
serviceAccountName: kube-router
|
||||||
containers:
|
containers:
|
||||||
- name: kube-router
|
- name: kube-router
|
||||||
image: docker.io/cloudnativelabs/kube-router:v0.4.0
|
image: docker.io/cloudnativelabs/kube-router:v1.0.0
|
||||||
args:
|
args:
|
||||||
- --run-router=true
|
- --run-router=true
|
||||||
- --run-firewall=true
|
- --run-firewall=true
|
||||||
|
@ -84,9 +84,12 @@ spec:
|
||||||
- name: kubeconfig
|
- name: kubeconfig
|
||||||
mountPath: /var/lib/kube-router/kubeconfig
|
mountPath: /var/lib/kube-router/kubeconfig
|
||||||
readOnly: true
|
readOnly: true
|
||||||
|
- name: xtables-lock
|
||||||
|
mountPath: /run/xtables.lock
|
||||||
|
readOnly: false
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: busybox
|
image: docker.io/cloudnativelabs/kube-router:v1.0.0
|
||||||
command:
|
command:
|
||||||
- /bin/sh
|
- /bin/sh
|
||||||
- -c
|
- -c
|
||||||
|
@ -127,6 +130,10 @@ spec:
|
||||||
- name: kubeconfig
|
- name: kubeconfig
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /var/lib/kube-router/kubeconfig
|
path: /var/lib/kube-router/kubeconfig
|
||||||
|
- name: xtables-lock
|
||||||
|
hostPath:
|
||||||
|
path: /run/xtables.lock
|
||||||
|
type: FileOrCreate
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
|
|
|
@ -842,7 +842,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
|
||||||
key := "networking.kuberouter"
|
key := "networking.kuberouter"
|
||||||
versions := map[string]string{
|
versions := map[string]string{
|
||||||
"k8s-1.6": "0.3.1-kops.3",
|
"k8s-1.6": "0.3.1-kops.3",
|
||||||
"k8s-1.12": "0.4.0-kops.3",
|
"k8s-1.12": "1.0.0-kops.1",
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue