From 15910c20483149ae7559275a96aeb7370f5744af Mon Sep 17 00:00:00 2001 From: Chen Rao <45187622+chenraoCR@users.noreply.github.com> Date: Fri, 17 Nov 2023 19:22:33 +0800 Subject: [PATCH] [bitnami/milvus] Fixup milvus & externalS3 couldn't be deployed in the same namespace (bitnami#20396) (#20500) * [bitnami/milvus] Fixup milvus & externalS3 couldn't be deployed in the same namespace (bitnami#20396) Signed-off-by: Chen Rao * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Chen Rao Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/milvus/Chart.yaml | 2 +- bitnami/milvus/README.md | 25 ++++++++++--------- bitnami/milvus/templates/attu/deployment.yaml | 3 +++ .../data-coordinator/deployment.yaml | 3 +++ .../templates/data-node/deployment.yaml | 3 +++ .../index-coordinator/deployment.yaml | 3 +++ .../templates/index-node/deployment.yaml | 3 +++ .../milvus/templates/proxy/deployment.yaml | 3 +++ .../query-coordinator/deployment.yaml | 3 +++ .../templates/query-node/deployment.yaml | 3 +++ .../root-coordinator/deployment.yaml | 3 +++ bitnami/milvus/values.schema.json | 5 ++++ bitnami/milvus/values.yaml | 6 +++++ 13 files changed, 52 insertions(+), 13 deletions(-) diff --git a/bitnami/milvus/Chart.yaml b/bitnami/milvus/Chart.yaml index 46168a82c0..2213bc3f3a 100644 --- a/bitnami/milvus/Chart.yaml +++ b/bitnami/milvus/Chart.yaml @@ -48,4 +48,4 @@ maintainers: name: milvus sources: - https://github.com/bitnami/charts/tree/main/bitnami/milvus -version: 5.0.0 +version: 5.1.0 diff --git a/bitnami/milvus/README.md b/bitnami/milvus/README.md index 4653e708ca..02b2792e07 100644 --- a/bitnami/milvus/README.md +++ b/bitnami/milvus/README.md @@ -68,18 +68,19 @@ The command removes all the Kubernetes components associated with the chart and ### Common parameters -| Name | Description | Value | -| ------------------------ | --------------------------------------------------------------------------------------- | --------------- | -| `kubeVersion` | Override Kubernetes version | `""` | -| `nameOverride` | String to partially override common.names.fullname | `""` | -| `fullnameOverride` | String to fully override common.names.fullname | `""` | -| `commonLabels` | Labels to add to all deployed objects | `{}` | -| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | -| `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | -| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | -| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | -| `diagnosticMode.command` | Command to override all containers in the deployments/statefulsets | `["sleep"]` | -| `diagnosticMode.args` | Args to override all containers in the deployments/statefulsets | `["infinity"]` | +| Name | Description | Value | +| ------------------------ | ----------------------------------------------------------------------------------------- | --------------- | +| `kubeVersion` | Override Kubernetes version | `""` | +| `nameOverride` | String to partially override common.names.fullname | `""` | +| `fullnameOverride` | String to fully override common.names.fullname | `""` | +| `commonLabels` | Labels to add to all deployed objects | `{}` | +| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | +| `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | +| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | +| `enableServiceLinks` | Whether information about services should be injected into all pods' environment variable | `false` | +| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | +| `diagnosticMode.command` | Command to override all containers in the deployments/statefulsets | `["sleep"]` | +| `diagnosticMode.args` | Args to override all containers in the deployments/statefulsets | `["infinity"]` | ### Common Milvus Parameters diff --git a/bitnami/milvus/templates/attu/deployment.yaml b/bitnami/milvus/templates/attu/deployment.yaml index 1070a06f99..e68486f05a 100644 --- a/bitnami/milvus/templates/attu/deployment.yaml +++ b/bitnami/milvus/templates/attu/deployment.yaml @@ -38,6 +38,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: attu spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.attu.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.attu.hostAliases }} diff --git a/bitnami/milvus/templates/data-coordinator/deployment.yaml b/bitnami/milvus/templates/data-coordinator/deployment.yaml index 75f1dc3057..bb43f9ab54 100644 --- a/bitnami/milvus/templates/data-coordinator/deployment.yaml +++ b/bitnami/milvus/templates/data-coordinator/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: data-coordinator spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.data-coordinator.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.dataCoord.hostAliases }} diff --git a/bitnami/milvus/templates/data-node/deployment.yaml b/bitnami/milvus/templates/data-node/deployment.yaml index 385ca494af..cc33310962 100644 --- a/bitnami/milvus/templates/data-node/deployment.yaml +++ b/bitnami/milvus/templates/data-node/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: data-node spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.data-node.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.dataNode.hostAliases }} diff --git a/bitnami/milvus/templates/index-coordinator/deployment.yaml b/bitnami/milvus/templates/index-coordinator/deployment.yaml index 4959d480e1..65b0cf1d41 100644 --- a/bitnami/milvus/templates/index-coordinator/deployment.yaml +++ b/bitnami/milvus/templates/index-coordinator/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: index-coordinator spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.index-coordinator.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.indexCoord.hostAliases }} diff --git a/bitnami/milvus/templates/index-node/deployment.yaml b/bitnami/milvus/templates/index-node/deployment.yaml index be872b45ed..33c720f61b 100644 --- a/bitnami/milvus/templates/index-node/deployment.yaml +++ b/bitnami/milvus/templates/index-node/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: index-node spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.index-node.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.indexNode.hostAliases }} diff --git a/bitnami/milvus/templates/proxy/deployment.yaml b/bitnami/milvus/templates/proxy/deployment.yaml index a2323e526a..5d6e5e2da8 100644 --- a/bitnami/milvus/templates/proxy/deployment.yaml +++ b/bitnami/milvus/templates/proxy/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: proxy spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.proxy.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.proxy.hostAliases }} diff --git a/bitnami/milvus/templates/query-coordinator/deployment.yaml b/bitnami/milvus/templates/query-coordinator/deployment.yaml index 1f4d384496..e12a89fe89 100644 --- a/bitnami/milvus/templates/query-coordinator/deployment.yaml +++ b/bitnami/milvus/templates/query-coordinator/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: query-coordinator spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.query-coordinator.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.queryCoord.hostAliases }} diff --git a/bitnami/milvus/templates/query-node/deployment.yaml b/bitnami/milvus/templates/query-node/deployment.yaml index 9159c3f924..2494702141 100644 --- a/bitnami/milvus/templates/query-node/deployment.yaml +++ b/bitnami/milvus/templates/query-node/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: query-node spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.query-node.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.queryNode.hostAliases }} diff --git a/bitnami/milvus/templates/root-coordinator/deployment.yaml b/bitnami/milvus/templates/root-coordinator/deployment.yaml index 6c1ad9d0a0..aeb2543e12 100644 --- a/bitnami/milvus/templates/root-coordinator/deployment.yaml +++ b/bitnami/milvus/templates/root-coordinator/deployment.yaml @@ -40,6 +40,9 @@ spec: app.kubernetes.io/part-of: milvus app.kubernetes.io/component: root-coordinator spec: + {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} serviceAccountName: {{ template "milvus.root-coordinator.serviceAccountName" . }} {{- include "milvus.imagePullSecrets" . | nindent 6 }} {{- if .Values.rootCoord.hostAliases }} diff --git a/bitnami/milvus/values.schema.json b/bitnami/milvus/values.schema.json index e950ec8ba3..d3a77e9df2 100644 --- a/bitnami/milvus/values.schema.json +++ b/bitnami/milvus/values.schema.json @@ -59,6 +59,11 @@ "default": [], "items": {} }, + "enableServiceLinks": { + "type": "boolean", + "description": "Whether information about services should be injected into all pods' environment variable", + "default": true + }, "diagnosticMode": { "type": "object", "properties": { diff --git a/bitnami/milvus/values.yaml b/bitnami/milvus/values.yaml index 771564643a..4e460ea1c1 100644 --- a/bitnami/milvus/values.yaml +++ b/bitnami/milvus/values.yaml @@ -45,6 +45,12 @@ clusterDomain: cluster.local ## extraDeploy: [] +## @param enableServiceLinks Whether information about services should be injected into all pods' environment variable +## The environment variables injected by service links are not used, but can lead to slow boot times or slow running of the scripts when there are many services in the current namespace. +## If you experience slow pod startups or slow running of the scripts you probably want to set this to `false`. +## +enableServiceLinks: false + ## Enable diagnostic mode in the deployments/statefulsets ## diagnosticMode: