kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update flannel manifest to v0.11.0 and add iptables-resync flag

This commit is contained in:
Artem Yarmoliuk 2019-03-23 18:37:36 +02:00 committed by Artem Yarmoluk
parent bfae48c08d
commit db6b29ba10
No known key found for this signature in database
GPG Key ID: DF2C48C02E60BD53
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/networking.md
View File

@ -440,6 +440,19 @@ For support with Cilium Network Policies you can reach out on Slack or Github:
- [Cilium Github](https://github.com/cilium/cilium)
- [Cilium Slack](https://cilium.io/slack)
### Flannel Example for CNI
#### Configuraing Flannel iptables resync period
Flannel iptables resync option is configurable via editing a cluster and adding
`iptablesResyncSeconds` option to spec:
```
networking:
flannel:
iptablesResyncSeconds: 360
```
### Validating CNI Installation
You will notice that `kube-dns` fails to start properly until you deploy your CNI provider.

10
upup/models/cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template
View File

@ -104,7 +104,7 @@ spec:
- operator: Exists
initContainers:
- name: install-cni
image: quay.io/coreos/flannel:v0.10.0-amd64
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
- cp
args:
@ -118,8 +118,12 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: quay.io/coreos/flannel:v0.10.0-amd64
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
- "/opt/bin/flanneld"
- "--ip-masq"
- "--kube-subnet-mgr"
- "--iptables-resync={{- or .Networking.Flannel.IptablesResyncSeconds "5" }}"
securityContext:
privileged: true
env:

10
upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml.template
View File

@ -99,7 +99,7 @@ spec:
- operator: Exists
initContainers:
- name: install-cni
image: quay.io/coreos/flannel:v0.10.0-amd64
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
- cp
args:
@ -113,8 +113,12 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: quay.io/coreos/flannel:v0.10.0-amd64
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
- "/opt/bin/flanneld"
- "--ip-masq"
- "--kube-subnet-mgr"
- "--iptables-resync={{- or .Networking.Flannel.IptablesResyncSeconds "5" }}"
securityContext:
privileged: true
env:

12
upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml.template
View File

@ -54,8 +54,12 @@ spec:
serviceAccountName: flannel
containers:
- name: kube-flannel
image: quay.io/coreos/flannel:v0.10.0-amd64
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
- "/opt/bin/flanneld"
- "--ip-masq"
- "--kube-subnet-mgr"
- "--iptables-resync={{- or .Networking.Flannel.IptablesResyncSeconds "5" }}"
securityContext:
privileged: true
env:
@ -79,7 +83,7 @@ spec:
- name: flannel-cfg
mountPath: /etc/kube-flannel/
- name: install-cni
image: quay.io/coreos/flannel:v0.10.0-amd64
image: quay.io/coreos/flannel:v0.11.0-amd64
command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ]
resources:
limits:
@ -102,4 +106,4 @@ spec:
path: /etc/cni/net.d
- name: flannel-cfg
configMap:
name: kube-flannel-cfg
name: kube-flannel-cfg