From 196a13ea1415374487340c119e76847f82160035 Mon Sep 17 00:00:00 2001 From: yellow-shine Date: Thu, 8 Aug 2024 19:04:10 +0800 Subject: [PATCH] Bump to 2.4.7 (#114) * bump etcd to 3.5.14-r1 Signed-off-by: Yellow Shine * use headless Signed-off-by: Yellow Shine * bump milvus version to v2.4.7 Signed-off-by: Yellow Shine --------- Signed-off-by: Yellow Shine --- charts/milvus/Chart.yaml | 4 ++-- charts/milvus/README.md | 2 +- charts/milvus/templates/config.tpl | 18 ++++++++++++++---- charts/milvus/values.yaml | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml index 7ec00e3..308308f 100644 --- a/charts/milvus/Chart.yaml +++ b/charts/milvus/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v1 name: milvus -appVersion: "2.4.6" +appVersion: "2.4.7" kubeVersion: "^1.10.0-0" description: Milvus is an open-source vector database built to power AI applications and vector similarity search. -version: 4.2.2 +version: 4.2.3 keywords: - milvus - elastic diff --git a/charts/milvus/README.md b/charts/milvus/README.md index 64102d6..b0d0ed6 100644 --- a/charts/milvus/README.md +++ b/charts/milvus/README.md @@ -263,7 +263,7 @@ The following table lists the configurable parameters of the Milvus Service and |-------------------------------------------|-----------------------------------------------|---------------------------------------------------------| | `cluster.enabled` | Enable or disable Milvus Cluster mode | `true` | | `image.all.repository` | Image repository | `milvusdb/milvus` | -| `image.all.tag` | Image tag | `v2.4.6` | +| `image.all.tag` | Image tag | `v2.4.7` | | `image.all.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.all.pullSecrets` | Image pull secrets | `{}` | | `image.tools.repository` | Config image repository | `milvusdb/milvus-config-tool` | diff --git a/charts/milvus/templates/config.tpl b/charts/milvus/templates/config.tpl index 23d24b8..91153e7 100644 --- a/charts/milvus/templates/config.tpl +++ b/charts/milvus/templates/config.tpl @@ -10,6 +10,18 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. + +{{- $etcdReleaseName := "" -}} +{{- if contains .Values.etcd.name .Release.Name }} + {{- $etcdReleaseName = printf "%s" .Release.Name -}} +{{- else }} + {{- $etcdReleaseName = printf "%s-%s" .Release.Name .Values.etcd.name -}} +{{- end }} + +{{- $etcdPort := .Values.etcd.service.port }} + +{{- $namespace := .Release.Namespace }} + etcd: {{- if .Values.externalEtcd.enabled }} endpoints: @@ -18,10 +30,8 @@ etcd: {{- end }} {{- else }} endpoints: -{{- if contains .Values.etcd.name .Release.Name }} - - {{ .Release.Name }}:{{ .Values.etcd.service.port }} -{{- else }} - - {{ .Release.Name }}-{{ .Values.etcd.name }}:{{ .Values.etcd.service.port }} +{{- range $i := until ( .Values.etcd.replicaCount | int ) }} + - {{ $etcdReleaseName }}-{{ $i }}.{{ $etcdReleaseName }}-headless.{{ $namespace }}.svc.cluster.local:{{ $etcdPort }} {{- end }} {{- end }} diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml index cac1928..c1c4bf4 100644 --- a/charts/milvus/values.yaml +++ b/charts/milvus/values.yaml @@ -11,7 +11,7 @@ cluster: image: all: repository: milvusdb/milvus - tag: v2.4.6 + tag: v2.4.7 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -569,7 +569,7 @@ etcd: create: false image: repository: "milvusdb/etcd" - tag: "3.5.5-r4" + tag: "3.5.14-r1" pullPolicy: IfNotPresent service: