Kubernetes 1.16.0 api reference change

[ta/caas-danm.git] / ansible / roles / flannel / templates / flannel-ds.yaml

diff --git a/ansible/roles/flannel/templates/flannel-ds.yaml b/ansible/roles/flannel/templates/flannel-ds.yaml
index 90e7386..901679c 100644 (file)
--- a/ansible/roles/flannel/templates/flannel-ds.yaml
+++ b/ansible/roles/flannel/templates/flannel-ds.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: flannel-ds
@@ -32,14 +32,14 @@ spec:
         tier: node
         {{ caas.kubernetes_component_label }}: flannel
     spec:
+      priorityClassName: "system-node-critical"
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
-     # TODO: figure out why flannel needs to run with root to modify network settings on the host
-     # Some setcap calls might be missing on its binary?
+     # TODO: figure out why privileged mode is also not enough for flannel to modify network settings on the host (same problem as watcher)
      #securityContext:
      #     runAsUser: {{ caas.uid.flannel }}
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
       containers:
@@ -62,12 +62,21 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        resources:
+          requests:
+            cpu: "10m"
         volumeMounts:
+        - name: time-mount
+          mountPath: /etc/localtime
+          readOnly: true
         - name: run
           mountPath: /run
         - name: flannel-cfg
           mountPath: /etc/kube-flannel/
       volumes:
+        - name: time-mount
+          hostPath:
+             path: /etc/localtime
         - name: run
           hostPath:
             path: /run