update kube-ovn to 0.9.1

easzlab · Dec 4, 2019 · a54f6f5 · a54f6f5
1 parent 7ee25c2
commit a54f6f5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/roles/kube-ovn/defaults/main.yml b/roles/kube-ovn/defaults/main.yml
@@ -7,4 +7,4 @@ kube_ovn_node_switch_cidr: 100.64.0.0/16
 kube_ovn_enable_mirror: true
 
 # 离线镜像tar包
-kube_ovn_offline: "kube_ovn_0.8.0.tar"
+kube_ovn_offline: "kube_ovn_0.9.1.tar"
diff --git a/roles/kube-ovn/templates/kube-ovn.yaml.j2 b/roles/kube-ovn/templates/kube-ovn.yaml.j2
@@ -38,7 +38,7 @@ spec:
       hostNetwork: true
       containers:
         - name: kube-ovn-controller
-          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v0.8.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v0.9.1"
           imagePullPolicy: IfNotPresent
           command:
           - /kube-ovn/start-controller.sh
@@ -96,7 +96,7 @@ spec:
     matchLabels:
       app: kube-ovn-cni
   updateStrategy:
-    type: RollingUpdate
+    type: OnDelete
   template:
     metadata:
       labels:
@@ -112,17 +112,20 @@ spec:
       hostPID: true
       initContainers:
       - name: install-cni
-        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.8.0"
+        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.9.1"
         imagePullPolicy: IfNotPresent
         command: ["/kube-ovn/install-cni.sh"]
+        securityContext:
+          runAsUser: 0
+          privileged: true
         volumeMounts:
           - mountPath: /etc/cni/net.d
             name: cni-conf
           - mountPath: /opt/cni/bin
             name: cni-bin
       containers:
       - name: cni-server
-        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.8.0"
+        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.9.1"
         imagePullPolicy: IfNotPresent
         command:
           - sh
@@ -204,7 +207,7 @@ spec:
       hostPID: true
       containers:
         - name: pinger
-          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v0.8.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v0.9.1"
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0

diff --git a/roles/kube-ovn/templates/ovn.yaml.j2 b/roles/kube-ovn/templates/ovn.yaml.j2
@@ -158,7 +158,7 @@ spec:
       hostNetwork: true
       containers:
         - name: ovn-central
-          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v0.8.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v0.9.1"
           imagePullPolicy: IfNotPresent
           env:
             - name: POD_IP
@@ -229,7 +229,7 @@ spec:
     matchLabels:
       app: ovs
   updateStrategy:
-    type: RollingUpdate
+    type: OnDelete
   template:
     metadata:
       labels:
@@ -245,7 +245,7 @@ spec:
       hostPID: true
       containers:
         - name: openvswitch
-          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v0.8.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v0.9.1"
           imagePullPolicy: IfNotPresent
           securityContext:
             runAsUser: 0
@@ -286,11 +286,11 @@ spec:
             failureThreshold: 5
           resources:
             requests:
-              cpu: 100m
+              cpu: 200m
               memory: 300Mi
             limits:
-              cpu: 200m
-              memory: 400Mi
+              cpu: 1000m
+              memory: 800Mi
       nodeSelector:
         beta.kubernetes.io/os: "linux"
       volumes: