kind: support reload kube-ovn component in kind cluster

kubeovn · Nov 26, 2019 · bbd4257 · bbd4257
1 parent cca26bb
commit bbd4257
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ resume:
 suspend:
 	cd vagrant && vagrant suspend
 
-kind:
+kind-init:
 	kind create cluster --config yamls/kind.yaml
 	@for role in ${ROLES} ; do \
 		kind load docker-image ${REGISTRY}/kube-ovn-$$role:${RELEASE_TAG}; \
@@ -69,3 +69,9 @@ kind:
 	kubectl apply -f yamls/crd.yaml
 	kubectl apply -f yamls/ovn.yaml
 	kubectl apply -f yamls/kube-ovn.yaml
+
+kind-reload:
+	@for role in ${ROLES} ; do \
+		kind load docker-image ${REGISTRY}/kube-ovn-$$role:${RELEASE_TAG}; \
+	done
+	kubectl delete pod -n kube-ovn --all
diff --git a/yamls/kind.yaml b/yamls/kind.yaml
@@ -5,4 +5,3 @@ networking:
 nodes:
   - role: control-plane
   - role: worker
-  - role: worker
diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
@@ -38,7 +38,7 @@ spec:
       hostNetwork: true
       containers:
         - name: kube-ovn-controller
-          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v1.0.0-pre"
           imagePullPolicy: Always
           command:
             - /kube-ovn/start-controller.sh
@@ -109,7 +109,7 @@ spec:
       hostPID: true
       initContainers:
         - name: install-cni
-          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:vv1.0.0-pre"
           imagePullPolicy: Always
           command: ["/kube-ovn/install-cni.sh"]
           securityContext:
@@ -122,7 +122,7 @@ spec:
               name: cni-bin
       containers:
         - name: cni-server
-          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0-pre"
           command: ["sh", "/kube-ovn/start-cniserver.sh"]
           args:
             - --enable-mirror=false
@@ -205,7 +205,7 @@ spec:
       hostPID: true
       containers:
         - name: pinger
-          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v1.0.0-pre"
           imagePullPolicy: Always
           securityContext:
             runAsUser: 0

diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
@@ -38,7 +38,7 @@ spec:
       hostNetwork: true
       containers:
         - name: kube-ovn-controller
-          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v0.9.0-pre"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-controller:v1.0.0-pre"
           imagePullPolicy: Always
           command:
           - /kube-ovn/start-controller.sh
@@ -112,7 +112,7 @@ spec:
       hostPID: true
       initContainers:
       - name: install-cni
-        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.9.0"
+        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0-pre"
         imagePullPolicy: Always
         command: ["/kube-ovn/install-cni.sh"]
         securityContext:
@@ -125,7 +125,7 @@ spec:
             name: cni-bin
       containers:
       - name: cni-server
-        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v0.9.0"
+        image: "index.alauda.cn/alaudak8s/kube-ovn-cni:v1.0.0-pre"
         imagePullPolicy: Always
         command:
           - sh
@@ -215,7 +215,7 @@ spec:
       hostPID: true
       containers:
         - name: pinger
-          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-pinger:v1.0.0-pre"
           imagePullPolicy: Always
           securityContext:
             runAsUser: 0

diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml
@@ -158,7 +158,7 @@ spec:
       hostNetwork: true
       containers:
         - name: ovn-central
-          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-db:v1.0.0-pre"
           imagePullPolicy: Always
           env:
             - name: POD_IP
@@ -245,7 +245,7 @@ spec:
       hostPID: true
       containers:
         - name: openvswitch
-          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v0.9.0"
+          image: "index.alauda.cn/alaudak8s/kube-ovn-node:v1.0.0-pre"
           imagePullPolicy: Always
           securityContext:
             runAsUser: 0