From 022f469daffc9410348a72f40c4ed6c09612144c Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 7 May 2021 16:06:51 +0800 Subject: [PATCH] Upgrade to v1.1.0 (#174) * Upgrade to 1.0.0 * Optional extra labels for pod (#164) Signed-off-by: quicksilver * Update README.md (#166) * Optional extra labels for pod Signed-off-by: quicksilver * Update README.md Signed-off-by: quicksilver * Add extra env variable (#172) * Add extra env variable Signed-off-by: quicksilver * Update Helm Chart version Signed-off-by: quicksilver * Upgrade milvus app version to v1.1 (#173) * Upgrade milvus app version to v1.1 Signed-off-by: quicksilver --- charts/milvus/Chart.yaml | 4 ++-- charts/milvus/README.md | 7 ++++--- charts/milvus/templates/readonly-deployment.yaml | 4 ++++ charts/milvus/templates/writable-deployment.yaml | 4 ++++ charts/milvus/values.yaml | 8 ++++++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml index ead1b3a..f0c7001 100755 --- a/charts/milvus/Chart.yaml +++ b/charts/milvus/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v1 name: milvus -appVersion: "1.0.0" +appVersion: "1.1.0" kubeVersion: "^1.10.0-0" description: Milvus is an open source similarity search engine for massive-scalefeature vectors. -version: 1.0.1 +version: 1.1.0 keywords: - milvus - elastic diff --git a/charts/milvus/README.md b/charts/milvus/README.md index 0249853..b9bbfbd 100644 --- a/charts/milvus/README.md +++ b/charts/milvus/README.md @@ -136,7 +136,7 @@ The following table lists the configurable parameters of the Milvus chart and th | `restartPolicy` | Restart policy for all containers | `Always` | | `initContainerImage` | Init container image | `alpine:3.8` | | `image.repository` | Image repository | `milvusdb/milvus` | -| `image.tag` | Image tag | `1.0.0-cpu-d030521-1ea92e` | +| `image.tag` | Image tag | `1.1.0-cpu-d050721-5e559c` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Image pull secrets | `{}` | | `image.resources` | CPU/GPU/Memory resource requests/limits | `{}` | @@ -176,11 +176,12 @@ The following table lists the configurable parameters of the Milvus chart and th | `nodeSelector` | Node labels for pod assignment | `{}` | | `tolerations` | Toleration labels for pod assignment | `[]` | | `affinity` | Affinity settings for pod assignment | `{}` | -| `podAnnotations` | Additional pod annotations | `{}` | +| `podLabels` | Optional extra labels for pod | `{}` | +| `podAnnotations` | Optional extra annotations for pod | `{}` | | `podDisruptionBudget.minAvailable` | Pod disruption minimum available | `unset` | | `podDisruptionBudget.maxUnavailable` | Pod disruption maximum unavailable | `unset` | | `mishards.image.repository` | Mishards image repository | `milvusdb/mishards` | -| `mishards.image.tag` | Mishards image tag | `1.0.0` | +| `mishards.image.tag` | Mishards image tag | `1.1.0` | | `mishards.image.pullPolicy` | Mishards image pull policy | `IfNotPresent` | | `mishards.replicas` | Number of mishards nodes | `1` | | `mishards.resources` | Mishards CPU/GPU/Memory resource requests/limits | `{}` | diff --git a/charts/milvus/templates/readonly-deployment.yaml b/charts/milvus/templates/readonly-deployment.yaml index 970fa5e..03c2106 100755 --- a/charts/milvus/templates/readonly-deployment.yaml +++ b/charts/milvus/templates/readonly-deployment.yaml @@ -93,6 +93,10 @@ spec: {{ toYaml .Values.readinessProbe | indent 10 }} resources: {{- toYaml .Values.readonly.resources | nindent 10 }} + {{- if .Values.extraEnv }} + env: +{{ toYaml .Values.extraEnv | indent 8 }} + {{- end }} volumeMounts: - name: milvus-data-disk mountPath: {{ .Values.persistence.mountPath | quote }} diff --git a/charts/milvus/templates/writable-deployment.yaml b/charts/milvus/templates/writable-deployment.yaml index c35d564..c056c68 100755 --- a/charts/milvus/templates/writable-deployment.yaml +++ b/charts/milvus/templates/writable-deployment.yaml @@ -98,6 +98,10 @@ spec: {{ toYaml .Values.readinessProbe | indent 10 }} resources: {{- toYaml .Values.image.resources | nindent 10 }} + {{- if .Values.extraEnv }} + env: +{{ toYaml .Values.extraEnv | indent 8 }} + {{- end }} volumeMounts: - name: milvus-data-disk mountPath: {{ .Values.persistence.mountPath | quote }} diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml index afc38fa..0e176d8 100755 --- a/charts/milvus/values.yaml +++ b/charts/milvus/values.yaml @@ -107,6 +107,10 @@ extraContainers: | # mountPath: /var/lib/milvus/logs # readOnly: true +extraEnv: [] + # - name: SOME_VAR + # value: 'some value' + extraVolumes: [] # - name: extras # emptyDir: {} @@ -175,7 +179,7 @@ logsPersistence: image: repository: milvusdb/milvus - tag: 1.0.0-cpu-d030521-1ea92e + tag: 1.1.0-cpu-d050721-5e559c pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -222,7 +226,7 @@ serviceAccounts: mishards: image: repository: milvusdb/mishards - tag: 1.0.0 + tag: 1.1.0 pullPolicy: IfNotPresent replicas: 1