Merge pull request #6660 from gordonbondon/flannes-0.11.0

Updated Flannel manifest to 0.11.0
kubernetes · Mar 25, 2019 · 080b2fb · 080b2fb
2 parents d565706 + db6b29b
commit 080b2fb
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 13 deletions.
diff --git a/docs/networking.md b/docs/networking.md
@@ -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.

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -69,6 +69,8 @@ type WeaveNetworkingSpec struct {
 type FlannelNetworkingSpec struct {
 	// Backend is the backend overlay type we want to use (vxlan or udp)
 	Backend string `json:"backend,omitempty"`
+	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
+	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
 }
 
 // CalicoNetworkingSpec declares that we want Calico networking

diff --git a/pkg/apis/kops/v1alpha1/networking.go b/pkg/apis/kops/v1alpha1/networking.go
@@ -69,6 +69,8 @@ type WeaveNetworkingSpec struct {
 type FlannelNetworkingSpec struct {
 	// Backend is the backend overlay type we want to use (vxlan or udp)
 	Backend string `json:"backend,omitempty"`
+	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
+	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
 }
 
 // CalicoNetworkingSpec declares that we want Calico networking

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -69,6 +69,8 @@ type WeaveNetworkingSpec struct {
 type FlannelNetworkingSpec struct {
 	// Backend is the backend overlay type we want to use (vxlan or udp)
 	Backend string `json:"backend,omitempty"`
+	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
+	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
 }
 
 // CalicoNetworkingSpec declares that we want Calico networking

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template
@@ -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:

diff --git a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml.template
@@ -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:

diff --git a/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml.template
@@ -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