From a42492e040c604354f3e90e258d1d09b2bb50a70 Mon Sep 17 00:00:00 2001 From: haorenfsa Date: Wed, 27 Nov 2024 18:50:57 +0800 Subject: [PATCH] milvus default to v2.4.17, bump version Signed-off-by: haorenfsa --- Makefile | 8 +++--- README.md | 10 +++---- charts/milvus-operator/Chart.yaml | 4 +-- charts/milvus-operator/values.yaml | 2 +- deploy/manifests/deployment.yaml | 28 +++++++++---------- .../security/encryption-in-transit.md | 2 +- docs/installation/installation.md | 10 +++---- pkg/config/config.go | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 22a2a3fd..73fc5c90 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ IMG ?= milvusdb/milvus-operator:dev-latest TOOL_IMG ?= milvus-config-tool:dev-latest SIT_IMG ?= milvus-operator:sit -VERSION ?= 1.1.2 +VERSION ?= 1.1.3 TOOL_VERSION ?= 1.0.0 MILVUS_HELM_VERSION ?= milvus-4.2.13 RELEASE_IMG ?= milvusdb/milvus-operator:v$(VERSION) @@ -234,7 +234,7 @@ sit-prepare-operator-images: sit-prepare-images: sit-prepare-operator-images @echo "Preparing images" - docker pull milvusdb/milvus:v2.4.15 + docker pull milvusdb/milvus:v2.4.17 # docker pull -q apachepulsar/pulsar:2.8.2 docker pull -q bitnami/kafka:3.1.0-debian-10-r52 @@ -251,7 +251,7 @@ sit-load-operator-images: sit-load-images: sit-load-operator-images @echo "Loading images" - kind load docker-image milvusdb/milvus:v2.4.15 + kind load docker-image milvusdb/milvus:v2.4.17 # 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} @@ -260,7 +260,7 @@ sit-load-images: sit-load-operator-images 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.4.15 + docker rmi milvusdb/milvus:v2.4.17 # 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 diff --git a/README.md b/README.md index 3730ae7b..0480f0b2 100644 --- a/README.md +++ b/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.1.2/deploy/manifests/deployment.yaml +kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.1.3/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: +Versions, v2.4.17 `[1]`, 2.9.5 / 3.1.0, 3.5.14, RELEASE.2023-03-20T20-16-18Z --> |Components| Milvus| Pulsar / Kafka| Etcd| MinIO| |---|---|---|---|---| -|Versions| v2.4.15 `[1]`| 2.9.5`[2]` / 3.1.0 | 3.5.14 |RELEASE.2023-03-20T20-16-18Z| +|Versions| v2.4.17 `[1]`| 2.9.5`[2]` / 3.1.0 | 3.5.14 |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.1.2/milvus-operator-1.1.2.tgz + https://github.com/zilliztech/milvus-operator/releases/download/v1.1.3/milvus-operator-1.1.3.tgz ``` Or use kubectl & raw manifests: ```shell -kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.1.2/deploy/manifests/deployment.yaml +kubectl apply -f https://raw.githubusercontent.com/zilliztech/milvus-operator/v1.1.3/deploy/manifests/deployment.yaml ``` diff --git a/charts/milvus-operator/Chart.yaml b/charts/milvus-operator/Chart.yaml index e4bc89bf..6e4d60d6 100644 --- a/charts/milvus-operator/Chart.yaml +++ b/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.1.2 +version: 1.1.3 # 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.1.2" +appVersion: "1.1.3" maintainers: - name: zilliztech diff --git a/charts/milvus-operator/values.yaml b/charts/milvus-operator/values.yaml index 5d9820e1..ba7a9242 100644 --- a/charts/milvus-operator/values.yaml +++ b/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: "v1.1.2" + tag: "v1.1.3" # 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 diff --git a/deploy/manifests/deployment.yaml b/deploy/manifests/deployment.yaml index 06963766..416b5c94 100644 --- a/deploy/manifests/deployment.yaml +++ b/deploy/manifests/deployment.yaml @@ -11,10 +11,10 @@ metadata: name: "milvus-operator-checker" namespace: "milvus-operator" labels: - helm.sh/chart: milvus-operator-1.1.2 + helm.sh/chart: milvus-operator-1.1.3 app.kubernetes.io/name: milvus-operator app.kubernetes.io/instance: milvus-operator - app.kubernetes.io/version: "1.1.2" + app.kubernetes.io/version: "1.1.3" app.kubernetes.io/managed-by: Helm --- # Source: milvus-operator/templates/serviceaccount.yaml @@ -24,10 +24,10 @@ metadata: name: "milvus-operator" namespace: "milvus-operator" labels: - helm.sh/chart: milvus-operator-1.1.2 + helm.sh/chart: milvus-operator-1.1.3 app.kubernetes.io/name: milvus-operator app.kubernetes.io/instance: milvus-operator - app.kubernetes.io/version: "1.1.2" + app.kubernetes.io/version: "1.1.3" app.kubernetes.io/managed-by: Helm --- # Source: milvus-operator/templates/crds.yaml @@ -15154,10 +15154,10 @@ kind: Service metadata: labels: service-kind: metrics - helm.sh/chart: milvus-operator-1.1.2 + helm.sh/chart: milvus-operator-1.1.3 app.kubernetes.io/name: milvus-operator app.kubernetes.io/instance: milvus-operator - app.kubernetes.io/version: "1.1.2" + app.kubernetes.io/version: "1.1.3" app.kubernetes.io/managed-by: Helm name: 'milvus-operator-metrics-service' namespace: "milvus-operator" @@ -15175,10 +15175,10 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: milvus-operator-1.1.2 + helm.sh/chart: milvus-operator-1.1.3 app.kubernetes.io/name: milvus-operator app.kubernetes.io/instance: milvus-operator - app.kubernetes.io/version: "1.1.2" + app.kubernetes.io/version: "1.1.3" app.kubernetes.io/managed-by: Helm name: 'milvus-operator-webhook-service' namespace: "milvus-operator" @@ -15197,10 +15197,10 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - helm.sh/chart: milvus-operator-1.1.2 + helm.sh/chart: milvus-operator-1.1.3 app.kubernetes.io/name: milvus-operator app.kubernetes.io/instance: milvus-operator - app.kubernetes.io/version: "1.1.2" + app.kubernetes.io/version: "1.1.3" app.kubernetes.io/managed-by: Helm name: "milvus-operator" namespace: "milvus-operator" @@ -15230,7 +15230,7 @@ spec: - --leader-elect command: - /manager - image: 'milvusdb/milvus-operator:v1.1.2' + image: 'milvusdb/milvus-operator:v1.1.3' imagePullPolicy: "IfNotPresent" livenessProbe: httpGet: @@ -15287,10 +15287,10 @@ metadata: annotations: {} labels: - helm.sh/chart: milvus-operator-1.1.2 + helm.sh/chart: milvus-operator-1.1.3 app.kubernetes.io/name: milvus-operator app.kubernetes.io/instance: milvus-operator - app.kubernetes.io/version: "1.1.2" + app.kubernetes.io/version: "1.1.3" app.kubernetes.io/managed-by: Helm name: "milvus-operator-checker" namespace: "milvus-operator" @@ -15304,7 +15304,7 @@ spec: restartPolicy: OnFailure containers: - name: checker - image: 'milvusdb/milvus-operator:v1.1.2' + image: 'milvusdb/milvus-operator:v1.1.3' imagePullPolicy: "IfNotPresent" command: ["/checker"] args: diff --git a/docs/administration/security/encryption-in-transit.md b/docs/administration/security/encryption-in-transit.md index 24d3f511..72ad92d3 100644 --- a/docs/administration/security/encryption-in-transit.md +++ b/docs/administration/security/encryption-in-transit.md @@ -546,4 +546,4 @@ print(f"\nList connections:") print(connections.list_connections()) ``` -See [example_tls1.py](https://github.com/milvus-io/pymilvus/blob/master/examples/example_tls1.py) and [example_tls2.py](https://github.com/milvus-io/pymilvus/blob/master/examples/example_tls2.py) for more information. +See [example_tls1.py](https://github.com/milvus-io/pymilvus/blob/master/examples/cert/example_tls1.py) and [example_tls2.py](https://github.com/milvus-io/pymilvus/blob/master/examples/cert/example_tls2.py) for more information. diff --git a/docs/installation/installation.md b/docs/installation/installation.md index e1922174..3c3478fc 100644 --- a/docs/installation/installation.md +++ b/docs/installation/installation.md @@ -12,7 +12,7 @@ For quick start, install with one line command: ```shell helm install milvus-operator \ -n milvus-operator --create-namespace \ - https://github.com/zilliztech/milvus-operator/releases/download/v1.1.2/milvus-operator-1.1.2.tgz + https://github.com/zilliztech/milvus-operator/releases/download/v1.1.3/milvus-operator-1.1.3.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: @@ -20,7 +20,7 @@ If you already have `cert-manager` v1.0+ installed which is not in its default c ``` helm install milvus-operator \ -n milvus-operator --create-namespace \ - https://github.com/zilliztech/milvus-operator/releases/download/v1.1.2/milvus-operator-1.1.2.tgz \ + https://github.com/zilliztech/milvus-operator/releases/download/v1.1.3/milvus-operator-1.1.3.tgz \ --set checker.disableCertManagerCheck=true ``` @@ -39,7 +39,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/zilliztech/milvus-operator/releases/download/v1.1.2/milvus-operator-1.1.2.tgz + https://github.com/zilliztech/milvus-operator/releases/download/v1.1.3/milvus-operator-1.1.3.tgz ``` ## Delete operator @@ -62,7 +62,7 @@ If you don't want to use helm you can also install with kubectl and raw manifest ## Installation It is recommended to install the milvus operator with a newest stable version ```shell -kubectl apply -f https://github.com/zilliztech/milvus-operator/v1.1.2/deploy/manifests/deployment.yaml +kubectl apply -f https://github.com/zilliztech/milvus-operator/v1.1.3/deploy/manifests/deployment.yaml ``` Check the installed operators: @@ -85,7 +85,7 @@ Same as installation, you can update the milvus operator with a newer version by Delete the milvus operator stack by the deployment manifest: ```shell -kubectl delete -f https://github.com/zilliztech/milvus-operator/v1.1.2/deploy/manifests/deployment.yaml +kubectl delete -f https://github.com/zilliztech/milvus-operator/v1.1.3/deploy/manifests/deployment.yaml ``` Or delete the milvus operator stack by using makefile: diff --git a/pkg/config/config.go b/pkg/config/config.go index 9a7202ad..18c28f9b 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,7 +8,7 @@ import ( ) const ( - DefaultMilvusVersion = "v2.4.15" + DefaultMilvusVersion = "v2.4.17" DefaultMilvusBaseImage = "milvusdb/milvus" DefaultMilvusImage = DefaultMilvusBaseImage + ":" + DefaultMilvusVersion DefaultImagePullPolicy = corev1.PullIfNotPresent