milvus default to 2.5.5, etcd default to 3.5.18

Signed-off-by: haorenfsa <[email protected]>

Makefile

@@ -3,9 +3,9 @@
 IMG ?= milvusdb/milvus-operator:dev-latest
 TOOL_IMG ?= milvus-config-tool:dev-latest
 SIT_IMG ?= milvus-operator:sit
-VERSION ?= 1.2.1
+VERSION ?= 1.2.2
 TOOL_VERSION ?= 1.0.0
-MILVUS_HELM_VERSION ?= milvus-4.2.36
+MILVUS_HELM_VERSION ?= milvus-4.2.40
 RELEASE_IMG ?= milvusdb/milvus-operator:v$(VERSION)
 TOOL_RELEASE_IMG ?= milvusdb/milvus-config-tool:v$(TOOL_VERSION)
 KIND_CLUSTER ?= kind
@@ -214,7 +214,7 @@ dev-cert-apply: dev-cert
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2)
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
@@ -234,11 +234,11 @@ sit-prepare-operator-images:
 
 sit-prepare-images: sit-prepare-operator-images
 	@echo "Preparing images"
-	docker pull milvusdb/milvus:v2.5.4
+	docker pull milvusdb/milvus:v2.5.5
 
 	# docker pull -q apachepulsar/pulsar:2.8.2
 	docker pull -q bitnami/kafka:3.1.0-debian-10-r52
-	docker pull -q milvusdb/etcd:3.5.14-r1
+	docker pull -q milvusdb/etcd:3.5.18-r1
 	docker pull -q minio/minio:RELEASE.2023-03-20T20-16-18Z
 	docker pull -q bitnami/pymilvus:2.4.6
 
@@ -251,19 +251,19 @@ sit-load-operator-images:
 
 sit-load-images: sit-load-operator-images
 	@echo "Loading images"
-	kind load docker-image milvusdb/milvus:v2.5.4
+	kind load docker-image milvusdb/milvus:v2.5.5
 	# kind load docker-image apachepulsar/pulsar:2.8.2 --name $(KIND_CLUSTER)
 	kind load docker-image bitnami/kafka:3.1.0-debian-10-r52 --name $(KIND_CLUSTER)
-	kind load docker-image milvusdb/etcd:3.5.14-r1 --name $(KIND_CLUSTER)
+	kind load docker-image milvusdb/etcd:3.5.18-r1 --name $(KIND_CLUSTER)
 	kind load docker-image minio/minio:RELEASE.2023-03-20T20-16-18Z --name $(KIND_CLUSTER)
 	kind load docker-image bitnami/pymilvus:2.4.6 --name $(KIND_CLUSTER)
 
 sit-load-and-cleanup-images: sit-load-images
 	@echo "Clean up some big images to save disk space in github action"
-	docker rmi milvusdb/milvus:v2.5.4
+	docker rmi milvusdb/milvus:v2.5.5
 	# docker rmi apachepulsar/pulsar:2.8.2
 	docker rmi bitnami/kafka:3.1.0-debian-10-r52
-	docker rmi milvusdb/etcd:3.5.14-r1
+	docker rmi milvusdb/etcd:3.5.18-r1
 	docker rmi minio/minio:RELEASE.2023-03-20T20-16-18Z
 
 sit-generate-manifest:

README.md

@@ -78,7 +78,7 @@ helm -n milvus-operator upgrade --install --create-namespace milvus-operator mil
 Or with kubectl & raw manifests:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.2.1/deploy/manifests/deployment.yaml
+kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.2.2/deploy/manifests/deployment.yaml
 ```
 
 For more infomation Check [Installation Instructions](docs/installation/installation.md)
@@ -96,11 +96,11 @@ Versions of the underlying components are listed below:
 
 <!-- source csv for table
 Components, Milvus, Pulsar / Kafka, Etcd, MinIO
-Versions, v2.5.4 `[1]`, 3.0.7 / 3.1.0, 3.5.16, RELEASE.2023-03-20T20-16-18Z -->
+Versions, v2.5.5 `[1]`, 3.0.7 / 3.1.0, 3.5.18, RELEASE.2023-03-20T20-16-18Z -->
 
 |Components| Milvus| Pulsar / Kafka| Etcd| MinIO|
 |---|---|---|---|---|
-|Versions| v2.5.4 `[1]`| 3.0.7`[2]` / 3.1.0 | 3.5.16 |RELEASE.2023-03-20T20-16-18Z|
+|Versions| v2.5.5 `[1]`| 3.0.7`[2]` / 3.1.0 | 3.5.18 |RELEASE.2023-03-20T20-16-18Z|
 
 
 > `[1]` Version of milvus is the default version we will use, you can set it to other version. The Compatibility with milvus releases is showed below.
@@ -135,11 +135,11 @@ Use helm:
 ```shell
 helm upgrade --install milvus-operator \
   -n milvus-operator --create-namespace \
-  https://github.com/zilliztech/milvus-operator/releases/download/v1.2.1/milvus-operator-1.2.1.tgz
+  https://github.com/zilliztech/milvus-operator/releases/download/v1.2.2/milvus-operator-1.2.2.tgz
 ```
 
 Or use kubectl & raw manifests:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.2.1/deploy/manifests/deployment.yaml
+kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.2.2/deploy/manifests/deployment.yaml
 ```

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: 1.2.1
+version: 1.2.2
 
 # 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: "1.2.1"
+appVersion: "1.2.2"
 
 dependencies:
   - name: cert-manager

charts/milvus-operator/templates/clusterrole.yaml

@@ -82,57 +82,7 @@ rules:
   - milvus.io
   resources:
   - milvusclusters
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - milvus.io
-  resources:
-  - milvusclusters/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - milvus.io
-  resources:
-  - milvusclusters/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - milvus.io
-  resources:
   - milvuses
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - milvus.io
-  resources:
-  - milvuses/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - milvus.io
-  resources:
-  - milvuses/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - milvus.io
-  resources:
   - milvusupgrades
   verbs:
   - create
@@ -145,12 +95,16 @@ rules:
 - apiGroups:
   - milvus.io
   resources:
+  - milvusclusters/finalizers
+  - milvuses/finalizers
   - milvusupgrades/finalizers
   verbs:
   - update
 - apiGroups:
   - milvus.io
   resources:
+  - milvusclusters/status
+  - milvuses/status
   - milvusupgrades/status
   verbs:
   - get