chore: update kind and kube-ovn-cni updateStrategy

kubeovn · Sep 21, 2020 · 98bb751 · 98bb751
1 parent 7af1f4f
commit 98bb751
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -83,6 +83,14 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
+      - name: Install Kind
+        env:
+          KIND_VERSION: v0.9.0
+        run: |
+          curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64
+          chmod +x ./kind
+          sudo mv kind /usr/local/bin
+
       - name: Init Kind
         run: |
           pip install j2cli --user
@@ -121,6 +129,14 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
+      - name: Install Kind
+        env:
+          KIND_VERSION: v0.9.0
+        run: |
+          curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64
+          chmod +x ./kind
+          sudo mv kind /usr/local/bin
+
       - name: Init Kind
         run: |
           pip install j2cli --user
@@ -160,6 +176,14 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
+      - name: Install Kind
+        env:
+          KIND_VERSION: v0.9.0
+        run: |
+          curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64
+          chmod +x ./kind
+          sudo mv kind /usr/local/bin
+
       - name: Init Kind
         run: |
           pip install j2cli --user

diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -1107,8 +1107,6 @@ spec:
   selector:
     matchLabels:
       app: kube-ovn-cni
-  updateStrategy:
-    type: OnDelete
   template:
     metadata:
       labels:

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1224,8 +1224,6 @@ spec:
   selector:
     matchLabels:
       app: kube-ovn-cni
-  updateStrategy:
-    type: OnDelete
   template:
     metadata:
       labels:

diff --git a/yamls/kind.yaml.j2 b/yamls/kind.yaml.j2
@@ -1,5 +1,5 @@
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha3
+apiVersion: kind.x-k8s.io/v1alpha4
 networking:
   disableDefaultCNI: true
   ipFamily: {{ ip_family }}
@@ -17,13 +17,13 @@ kubeadmConfigPatches:
         dataDir: "/tmp/lib/etcd"
 nodes:
   - role: control-plane
-    image: kindest/node:v1.18.2
+    image: kindest/node:v1.19.1
   {%- if ha is equalto "true" %}
   - role: control-plane
-    image: kindest/node:v1.18.2
+    image: kindest/node:v1.19.1
   - role: control-plane
-    image: kindest/node:v1.18.2
+    image: kindest/node:v1.19.1
   {%- else %}
   - role: worker
-    image: kindest/node:v1.18.2
+    image: kindest/node:v1.19.1
   {%- endif %}
diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
@@ -93,8 +93,6 @@ spec:
   selector:
     matchLabels:
       app: kube-ovn-cni
-  updateStrategy:
-    type: OnDelete
   template:
     metadata:
       labels:

diff --git a/yamls/kube-ovn-pre17.yaml b/yamls/kube-ovn-pre17.yaml
@@ -90,8 +90,6 @@ spec:
   selector:
     matchLabels:
       app: kube-ovn-cni
-  updateStrategy:
-    type: OnDelete
   template:
     metadata:
       labels: