Update Milvus to V2.1.0, milvus-helm to 3.1.2, bump version (#171)

Signed-off-by: shaoyue.chen <[email protected]>

Makefile

@@ -2,8 +2,8 @@
 # Image URL to use all building/pushing image targets
 IMG ?= milvusdb/milvus-operator:dev-latest
 SIT_IMG ?= milvus-operator:sit
-VERSION ?= 0.5.2
-MILVUS_HELM_VERSION ?= milvus-3.0.28
+VERSION ?= 0.6.0
+MILVUS_HELM_VERSION ?= milvus-3.1.2
 RELEASE_IMG ?= milvusdb/milvus-operator:v$(VERSION)
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
@@ -207,9 +207,7 @@ sit-prepare-operator-images:
 
 sit-prepare-images: sit-prepare-operator-images
 	@echo "Preparing images"
-	# TODO: change back to milvus release image
-	docker pull milvusdb/milvus-dev:master-20220602-e88ffb8a
-	docker tag milvusdb/milvus-dev:master-20220602-e88ffb8a milvusdb/milvus:v2.0.2
+	docker pull milvusdb/milvus:v2.1.0
 
 	docker pull -q apachepulsar/pulsar:2.8.2
 	docker pull -q bitnami/kafka:3.1.0-debian-10-r52
@@ -227,7 +225,7 @@ sit-load-operator-images:
 
 sit-load-images: sit-load-operator-images
 	@echo "Loading images"
-	kind load docker-image milvusdb/milvus:v2.0.2
+	kind load docker-image milvusdb/milvus:v2.1.0
 	kind load docker-image apachepulsar/pulsar:2.8.2
 	kind load docker-image bitnami/kafka:3.1.0-debian-10-r52
 	kind load docker-image milvusdb/etcd:3.5.0-r6

README.md

@@ -21,13 +21,13 @@ Install with helm:
 ```shell
 helm install milvus-operator \
   -n milvus-operator --create-namespace \
-  https://github.com/milvus-io/milvus-operator/releases/download/v0.5.2/milvus-operator-0.5.2.tgz
+  https://github.com/milvus-io/milvus-operator/releases/download/v0.6.0/milvus-operator-0.6.0.tgz
 ```
 
 Or install with kubectl & raw manifests:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/milvus-io/milvus-operator/v0.5.2/deploy/manifests/deployment.yaml
+kubectl apply -f https://raw.githubusercontent.com/milvus-io/milvus-operator/v0.6.0/deploy/manifests/deployment.yaml
 ```
 
 For more infomation Check [instructions on how to install/uninstall milvus operator](docs/installation/installation.md)
@@ -43,11 +43,11 @@ Versions of the underlying components are listed below:
 
 <!-- source csv for table
 Components, Milvus, Pulsar / Kafka, Etcd, MinIO
-Versions, v2.0.2 `[1]`, 2.8.2 / 3.1.0, 3.5.0, RELEASE.2022-03-17T06-34-49Z -->
+Versions, v2.1.0 `[1]`, 2.8.2 / 3.1.0, 3.5.0, RELEASE.2022-03-17T06-34-49Z -->
 
 |Components| Milvus| Pulsar / Kafka| Etcd| MinIO|
 |---|---|---|---|---|
-|Versions| v2.0.2 `[1]`| 2.8.2 / 3.1.0 | 3.5.0|RELEASE.2022-03-17T06-34-49Z|
+|Versions| v2.1.0 `[1]`| 2.8.2 / 3.1.0 | 3.5.0|RELEASE.2022-03-17T06-34-49Z|
 
 
 **NOTES:**
@@ -57,22 +57,22 @@ Versions, v2.0.2 `[1]`, 2.8.2 / 3.1.0, 3.5.0, RELEASE.2022-03-17T06-34-49Z -->
 ## Compatibility With Milvus Releases
 
 <!-- source csv for table
-Milvus Versions, <=v2.0.0-rc8, v2.0.0-pre-ga, v2.0.0~v2.0.2
+Milvus Versions, <=v2.0.0-rc8, v2.0.0-pre-ga, >=v2.0.0
 Compatibility, :heavy_multiplication_x:, :heavy_check_mark:, :heavy_check_mark:  -->
 
-|Milvus Versions| <=v2.0.0-rc8| v2.0.0-pre-ga| v2.0.0~v2.0.2|
+|Milvus Versions| <=v2.0.0-rc8| v2.0.0-pre-ga| >=v2.0.0|
 |---|---|---|---|
 |Compatibility| :heavy_multiplication_x:| :heavy_check_mark:| :heavy_check_mark:|
 
 ## Compatibility With Milvus-Operator Earlier Releases
 
 <!-- source csv for table
-Milvus Operator Versions, <0.4.0, 0.4.x
+Milvus Operator Versions, <0.4.0, >=0.4.0
 Compatibility, :heavy_multiplication_x:, :heavy_check_mark:  -->
 
-|Milvus Operator Versions| <0.4.0| 0.4.x| 0.5.x|
-|---|---|---|---|
-|Compatibility| :heavy_multiplication_x:| :heavy_check_mark:|:heavy_check_mark:|
+|Milvus Operator Versions| <0.4.0| >=0.4.0|
+|---|---|---|
+|Compatibility| :heavy_multiplication_x:| :heavy_check_mark:|
 
 **NOTES:**
 

charts/milvus-operator/Chart.yaml

@@ -18,13 +18,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.2
+version: 0.6.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.2"
+appVersion: "0.6.0"
 
 maintainers:
   - name: devops team of zilliz

charts/milvus-operator/values.yaml

@@ -7,7 +7,7 @@ image:
   # image.pullPolicy -- The image pull policy for the controller.
   pullPolicy: IfNotPresent
   # image.tag -- The image tag whose default is the chart appVersion.
-  tag: "v0.5.2"
+  tag: "v0.6.0"
 
 # installCRDs -- If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED
 installCRDs: true

deploy/manifests/deployment.yaml

@@ -11,10 +11,10 @@ metadata:
   name: "milvus-operator"
   namespace: "milvus-operator"
   labels:
-    helm.sh/chart: milvus-operator-0.5.2
+    helm.sh/chart: milvus-operator-0.6.0
     app.kubernetes.io/name: milvus-operator
     app.kubernetes.io/instance: milvus-operator
-    app.kubernetes.io/version: "0.5.2"
+    app.kubernetes.io/version: "0.6.0"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: milvus-operator/templates/serviceaccount.yaml
@@ -24,10 +24,10 @@ metadata:
   name: "milvus-operator-checker"
   namespace: "milvus-operator"
   labels:
-    helm.sh/chart: milvus-operator-0.5.2
+    helm.sh/chart: milvus-operator-0.6.0
     app.kubernetes.io/name: milvus-operator
     app.kubernetes.io/instance: milvus-operator
-    app.kubernetes.io/version: "0.5.2"
+    app.kubernetes.io/version: "0.6.0"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: milvus-operator/templates/crds.yaml
@@ -13026,10 +13026,10 @@ kind: Service
 metadata:
   labels:
     service-kind: metrics
-    helm.sh/chart: milvus-operator-0.5.2
+    helm.sh/chart: milvus-operator-0.6.0
     app.kubernetes.io/name: milvus-operator
     app.kubernetes.io/instance: milvus-operator
-    app.kubernetes.io/version: "0.5.2"
+    app.kubernetes.io/version: "0.6.0"
     app.kubernetes.io/managed-by: Helm
   name: 'milvus-operator-metrics-service'
   namespace: "milvus-operator"
@@ -13047,10 +13047,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: milvus-operator-0.5.2
+    helm.sh/chart: milvus-operator-0.6.0
     app.kubernetes.io/name: milvus-operator
     app.kubernetes.io/instance: milvus-operator
-    app.kubernetes.io/version: "0.5.2"
+    app.kubernetes.io/version: "0.6.0"
     app.kubernetes.io/managed-by: Helm
   name: 'milvus-operator-webhook-service'
   namespace: "milvus-operator"
@@ -13069,10 +13069,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: milvus-operator-0.5.2
+    helm.sh/chart: milvus-operator-0.6.0
     app.kubernetes.io/name: milvus-operator
     app.kubernetes.io/instance: milvus-operator
-    app.kubernetes.io/version: "0.5.2"
+    app.kubernetes.io/version: "0.6.0"
     app.kubernetes.io/managed-by: Helm
   name: "milvus-operator"
   namespace: "milvus-operator"
@@ -13102,7 +13102,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: 'milvusdb/milvus-operator:v0.5.2'
+        image: 'milvusdb/milvus-operator:v0.6.0'
         imagePullPolicy: "IfNotPresent"
         livenessProbe:
           httpGet:
@@ -13157,10 +13157,10 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   labels:
-    helm.sh/chart: milvus-operator-0.5.2
+    helm.sh/chart: milvus-operator-0.6.0
     app.kubernetes.io/name: milvus-operator
     app.kubernetes.io/instance: milvus-operator
-    app.kubernetes.io/version: "0.5.2"
+    app.kubernetes.io/version: "0.6.0"
     app.kubernetes.io/managed-by: Helm
   name: "milvus-operator-checker"
   namespace: "milvus-operator"
@@ -13174,7 +13174,7 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: checker
-        image: 'milvusdb/milvus-operator:v0.5.2'
+        image: 'milvusdb/milvus-operator:v0.6.0'
         imagePullPolicy: "IfNotPresent"
         command: ["/checker"]
         args:

docs/installation/installation.md

@@ -13,15 +13,15 @@ For quick start, install with one line command:
 ```shell
 helm install milvus-operator \
   -n milvus-operator --create-namespace \
-  https://github.com/milvus-io/milvus-operator/releases/download/v0.5.2/milvus-operator-0.5.2.tgz
+  https://github.com/milvus-io/milvus-operator/releases/download/v0.6.0/milvus-operator-0.6.0.tgz
 ```
 
 If you already have `cert-manager` v1.0+ installed which is not in its default configuration, you may encounter some error with the check of cert-manager installation. you can install with special options to disable the check:
 
 ```
 helm install milvus-operator \
   -n milvus-operator --create-namespace \
-  https://github.com/milvus-io/milvus-operator/releases/download/v0.5.2/milvus-operator-0.5.2.tgz \
+  https://github.com/milvus-io/milvus-operator/releases/download/v0.6.0/milvus-operator-0.6.0.tgz \
   --set checker.disableCertManagerCheck=true
 ```
 
@@ -40,7 +40,7 @@ use helm commands to upgrade earlier milvus-operator to current version:
 
 ```shell
 helm upgrade -n milvus-operator milvus-operator --reuse-values \
-  https://github.com/milvus-io/milvus-operator/releases/download/v0.5.2/milvus-operator-0.5.2.tgz
+  https://github.com/milvus-io/milvus-operator/releases/download/v0.6.0/milvus-operator-0.6.0.tgz
 ```
 
 ## Delete operator

pkg/config/config.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	DefaultMilvusVersion   = "v2.0.2"
+	DefaultMilvusVersion   = "v2.1.0"
 	DefaultMilvusBaseImage = "milvusdb/milvus"
 	DefaultMilvusImage     = DefaultMilvusBaseImage + ":" + DefaultMilvusVersion
 	DefaultImagePullPolicy = corev1.PullIfNotPresent

test/upgrade.sh

@@ -8,8 +8,11 @@ kubectl --timeout 20m wait --for=condition=MilvusReady milvus my-release
 echo "Deploying upgrade"
 helm -n milvus-operator upgrade --wait --timeout 10m --reuse-values --set image.repository=milvus-operator,image.tag=sit milvus-operator ./charts/milvus-operator
 sleep 60
+kubectl get pods
 kubectl --timeout 10m wait --for=condition=MilvusReady milvus my-release
 # check dependencies no revision change
+helm list
 helm list |grep -v NAME |awk '{print $3}' | xargs -I{} [ {} -eq "1" ]
 # check milvus pods no restart
+kubectl get pods
 kubectl get pods |grep -v NAME |awk '{print $4}' | xargs -I{} [ {} -eq "0" ]