Merge pull request #884 from Gacko/patch-1

Documentation/Manifests: Improve YMLs.
flannel-io · Nov 24, 2017 · 83c984f · 83c984f
2 parents 1b1461a + a5a422e
commit 83c984f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/Documentation/k8s-manifests/kube-flannel-legacy.yml b/Documentation/k8s-manifests/kube-flannel-legacy.yml
@@ -19,6 +19,7 @@ data:
       "name": "cbr0",
       "type": "flannel",
       "delegate": {
+        "hairpinMode": true,
         "isDefaultGateway": true
       }
     }
@@ -52,7 +53,11 @@ spec:
       containers:
       - name: kube-flannel
         image: quay.io/coreos/flannel:v0.9.1-amd64
-        command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
         securityContext:
           privileged: true
         env:
@@ -86,4 +91,4 @@ spec:
             path: /etc/cni/net.d
         - name: flannel-cfg
           configMap:
-            name: kube-flannel-cfg
+            name: kube-flannel-cfg
diff --git a/Documentation/kube-flannel-aliyun.yml b/Documentation/kube-flannel-aliyun.yml
@@ -57,6 +57,7 @@ data:
       "name": "cbr0",
       "type": "flannel",
       "delegate": {
+        "hairpinMode": true,
         "isDefaultGateway": true
       }
     }
@@ -108,7 +109,11 @@ spec:
       containers:
       - name: kube-flannel
         image: registry.cn-hangzhou.aliyuncs.com/google-containers/flannel:v0.9.0
-        command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
         securityContext:
           privileged: true
         env:

diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
@@ -109,7 +109,11 @@ spec:
       containers:
       - name: kube-flannel
         image: quay.io/coreos/flannel:v0.9.1-amd64
-        command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
         securityContext:
           privileged: true
         env:

diff --git a/Documentation/minikube.yml b/Documentation/minikube.yml
@@ -22,6 +22,7 @@ data:
       "name": "cbr0",
       "type": "flannel",
       "delegate": {
+        "hairpinMode": true,
         "isDefaultGateway": true
       }
     }
@@ -53,7 +54,11 @@ spec:
       - name: kube-flannel
         image: flannel/minikube
         imagePullPolicy: Never
-        command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
+        command:
+        - /opt/bin/flanneld
+        args:
+        - --ip-masq
+        - --kube-subnet-mgr
         securityContext:
           privileged: true
         env: