Bladeren bron

[bitnami/milvus] :arrow_up: Major release: Milvus 2.6.0 architecture update (#35416)

* [bitnami/milvus] Release 15.0.17 updating components versions

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/milvus] Release 15.0.17 updating components versions

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/milvus] Release 15.0.17 updating components versions

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/milvus] Release 15.0.17 updating components versions

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* [bitnami/milvus] Release 15.0.17 updating components versions

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Milvus 2.6 major

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Fix cypress tests

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Remove coordinator grpc port

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Apply suggestions from code review

Co-authored-by: Juan Ariza Toledano <juan.ariza@broadcom.com>
Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Fix values.yaml existing typos

Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

---------

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com>
Co-authored-by: Miguel Ruiz <miguel.ruiz@broadcom.com>
Co-authored-by: Juan Ariza Toledano <juan.ariza@broadcom.com>
Bitnami Bot 1 maand geleden
bovenliggende
commit
add327965d
68 gewijzigde bestanden met toevoegingen van 1053 en 6707 verwijderingen
  1. 1 1
      .vib/milvus/cypress/cypress/e2e/milvus.cy.js
  2. 3 20
      .vib/milvus/goss/goss.yaml
  3. 2 30
      .vib/milvus/runtime-parameters.yaml
  4. 7 2
      bitnami/milvus/CHANGELOG.md
  5. 6 6
      bitnami/milvus/Chart.lock
  6. 6 6
      bitnami/milvus/Chart.yaml
  7. 306 750
      bitnami/milvus/README.md
  8. 5 14
      bitnami/milvus/templates/NOTES.txt
  9. 36 156
      bitnami/milvus/templates/_helpers.tpl
  10. 4 4
      bitnami/milvus/templates/coordinator/configmap.yaml
  11. 82 84
      bitnami/milvus/templates/coordinator/deployment.yaml
  12. 5 5
      bitnami/milvus/templates/coordinator/extra-configmap.yaml
  13. 12 12
      bitnami/milvus/templates/coordinator/hpa.yaml
  14. 21 26
      bitnami/milvus/templates/coordinator/networkpolicy.yaml
  15. 9 9
      bitnami/milvus/templates/coordinator/pdb.yaml
  16. 6 6
      bitnami/milvus/templates/coordinator/service-account.yaml
  17. 64 0
      bitnami/milvus/templates/coordinator/service.yaml
  18. 51 0
      bitnami/milvus/templates/coordinator/servicemonitor.yaml
  19. 12 12
      bitnami/milvus/templates/coordinator/vpa.yaml
  20. 0 254
      bitnami/milvus/templates/data-coordinator/deployment.yaml
  21. 0 21
      bitnami/milvus/templates/data-coordinator/extra-configmap.yaml
  22. 0 43
      bitnami/milvus/templates/data-coordinator/hpa.yaml
  23. 0 120
      bitnami/milvus/templates/data-coordinator/networkpolicy.yaml
  24. 0 30
      bitnami/milvus/templates/data-coordinator/pdb.yaml
  25. 0 20
      bitnami/milvus/templates/data-coordinator/service-account.yaml
  26. 0 73
      bitnami/milvus/templates/data-coordinator/service.yaml
  27. 0 51
      bitnami/milvus/templates/data-coordinator/servicemonitor.yaml
  28. 0 45
      bitnami/milvus/templates/data-coordinator/vpa.yaml
  29. 4 8
      bitnami/milvus/templates/data-node/networkpolicy.yaml
  30. 0 20
      bitnami/milvus/templates/index-coordinator/configmap.yaml
  31. 0 254
      bitnami/milvus/templates/index-coordinator/deployment.yaml
  32. 0 21
      bitnami/milvus/templates/index-coordinator/extra-configmap.yaml
  33. 0 119
      bitnami/milvus/templates/index-coordinator/networkpolicy.yaml
  34. 0 73
      bitnami/milvus/templates/index-coordinator/service.yaml
  35. 0 51
      bitnami/milvus/templates/index-coordinator/servicemonitor.yaml
  36. 0 43
      bitnami/milvus/templates/index-node/hpa.yaml
  37. 0 30
      bitnami/milvus/templates/index-node/pdb.yaml
  38. 0 73
      bitnami/milvus/templates/index-node/service.yaml
  39. 0 51
      bitnami/milvus/templates/index-node/servicemonitor.yaml
  40. 4 8
      bitnami/milvus/templates/proxy/networkpolicy.yaml
  41. 0 20
      bitnami/milvus/templates/query-coordinator/configmap.yaml
  42. 0 254
      bitnami/milvus/templates/query-coordinator/deployment.yaml
  43. 0 43
      bitnami/milvus/templates/query-coordinator/hpa.yaml
  44. 0 116
      bitnami/milvus/templates/query-coordinator/networkpolicy.yaml
  45. 0 30
      bitnami/milvus/templates/query-coordinator/pdb.yaml
  46. 0 20
      bitnami/milvus/templates/query-coordinator/service-account.yaml
  47. 0 73
      bitnami/milvus/templates/query-coordinator/service.yaml
  48. 0 51
      bitnami/milvus/templates/query-coordinator/servicemonitor.yaml
  49. 0 45
      bitnami/milvus/templates/query-coordinator/vpa.yaml
  50. 4 8
      bitnami/milvus/templates/query-node/networkpolicy.yaml
  51. 0 20
      bitnami/milvus/templates/root-coordinator/configmap.yaml
  52. 0 21
      bitnami/milvus/templates/root-coordinator/extra-configmap.yaml
  53. 0 20
      bitnami/milvus/templates/root-coordinator/service-account.yaml
  54. 0 73
      bitnami/milvus/templates/root-coordinator/service.yaml
  55. 0 51
      bitnami/milvus/templates/root-coordinator/servicemonitor.yaml
  56. 0 45
      bitnami/milvus/templates/root-coordinator/vpa.yaml
  57. 4 4
      bitnami/milvus/templates/streaming-node/configmap.yaml
  58. 83 83
      bitnami/milvus/templates/streaming-node/deployment.yaml
  59. 5 5
      bitnami/milvus/templates/streaming-node/extra-configmap.yaml
  60. 12 12
      bitnami/milvus/templates/streaming-node/hpa.yaml
  61. 22 26
      bitnami/milvus/templates/streaming-node/networkpolicy.yaml
  62. 9 9
      bitnami/milvus/templates/streaming-node/pdb.yaml
  63. 6 6
      bitnami/milvus/templates/streaming-node/service-account.yaml
  64. 73 0
      bitnami/milvus/templates/streaming-node/service.yaml
  65. 51 0
      bitnami/milvus/templates/streaming-node/servicemonitor.yaml
  66. 12 12
      bitnami/milvus/templates/streaming-node/vpa.yaml
  67. 31 1529
      bitnami/milvus/values.schema.json
  68. 95 1580
      bitnami/milvus/values.yaml

+ 1 - 1
.vib/milvus/cypress/cypress/e2e/milvus.cy.js

@@ -32,6 +32,6 @@ it('allows to create a collection', () => {
     cy.get('button[type="submit"]').contains('Import').click({force: true});
     // Check sample data table contains at least 1 entry
     cy.get('button').contains('Query').click({force: true});
-    cy.get('td [type="checkbox"]');
+    cy.get('tr [type="checkbox"]');
   });
 });

+ 3 - 20
.vib/milvus/goss/goss.yaml

@@ -2,15 +2,7 @@
 # SPDX-License-Identifier: APACHE-2.0
 
 http:
-  http://milvus-data-coordinator:{{ .Vars.dataCoord.service.ports.metrics }}/metrics:
-    status: 200
-    body:
-      - milvus_num_node
-  http://milvus-query-coordinator:{{ .Vars.queryCoord.service.ports.metrics }}/metrics:
-    status: 200
-    body:
-      - milvus_num_node
-  http://milvus-root-coordinator:{{ .Vars.rootCoord.service.ports.metrics }}/metrics:
+  http://milvus-coordinator:{{ .Vars.coordinator.service.ports.metrics }}/metrics:
     status: 200
     body:
       - milvus_num_node
@@ -22,7 +14,7 @@ http:
     status: 200
     body:
       - milvus_num_node
-  http://milvus-index-node:{{ .Vars.indexNode.service.ports.metrics }}/metrics:
+  http://milvus-streaming-node:{{ .Vars.streamingNode.service.ports.metrics }}/metrics:
     status: 200
     body:
       - milvus_num_node
@@ -37,22 +29,13 @@ http:
     body:
       - milvus_num_node
 addr:
-  tcp://milvus-data-coordinator:{{ .Vars.dataCoord.service.ports.grpc }}:
-    reachable: true
-    timeout: 500
-  tcp://milvus-query-coordinator:{{ .Vars.queryCoord.service.ports.grpc }}:
-    reachable: true
-    timeout: 500
-  tcp://milvus-root-coordinator:{{ .Vars.rootCoord.service.ports.grpc }}:
-    reachable: true
-    timeout: 500
   tcp://milvus-data-node:{{ .Vars.dataNode.service.ports.grpc }}:
     reachable: true
     timeout: 500
   tcp://milvus-query-node:{{ .Vars.queryNode.service.ports.grpc }}:
     reachable: true
     timeout: 500
-  tcp://milvus-index-node:{{ .Vars.indexNode.service.ports.grpc }}:
+  tcp://milvus-streaming-node:{{ .Vars.streamingNode.service.ports.grpc }}:
     reachable: true
     timeout: 500
   tcp://milvus-proxy:{{ .Vars.proxy.service.ports.grpc }}:

+ 2 - 30
.vib/milvus/runtime-parameters.yaml

@@ -32,42 +32,14 @@ proxy:
     create: true
   automountServiceAccountToken: true
 
-dataCoord:
+coordinator:
   enabled: true
   metrics:
     enabled: true
   service:
     ports:
-      grpc: 8004
-      metrics: 8005
-
-rootCoord:
-  enabled: true
-  metrics:
-    enabled: true
-  service:
-    ports:
-      grpc: 8006
       metrics: 8007
 
-indexCoord:
-  enabled: true
-  metrics:
-    enabled: true
-  service:
-    ports:
-      grpc: 8008
-      metrics: 8009
-
-queryCoord:
-  enabled: true
-  metrics:
-    enabled: true
-  service:
-    ports:
-      grpc: 8010
-      metrics: 8011
-
 dataNode:
   enabled: true
   metrics:
@@ -86,7 +58,7 @@ queryNode:
       grpc: 8014
       metrics: 8015
 
-indexNode:
+streamingNode:
   enabled: true
   metrics:
     enabled: true

+ 7 - 2
bitnami/milvus/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
-## 15.0.16 (2025-08-05)
+## 16.0.0 (2025-08-13)
 
-* [bitnami/milvus] :zap: :arrow_up: Update dependency references ([#35405](https://github.com/bitnami/charts/pull/35405))
+* [bitnami/milvus] :arrow_up: Major release: Milvus 2.6.0 architecture update ([#35416](https://github.com/bitnami/charts/pull/35416))
+
+## <small>15.0.16 (2025-08-05)</small>
+
+* [bitnami/*] docs: update BSI warning on charts' notes (#35340) ([07483a5](https://github.com/bitnami/charts/commit/07483a5ed964b409266dc025e4b55bf2eb0f621c)), closes [#35340](https://github.com/bitnami/charts/issues/35340)
+* [bitnami/milvus] :zap: :arrow_up: Update dependency references (#35405) ([4b59236](https://github.com/bitnami/charts/commit/4b59236cdf9c27d3c46f4ebd505e2e2d09a3d2ea)), closes [#35405](https://github.com/bitnami/charts/issues/35405)
 
 ## <small>15.0.15 (2025-07-21)</small>
 

+ 6 - 6
bitnami/milvus/Chart.lock

@@ -1,15 +1,15 @@
 dependencies:
 - name: etcd
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 12.0.1
+  version: 12.0.16
 - name: kafka
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 32.2.12
+  version: 32.3.11
 - name: minio
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 17.0.1
+  version: 17.0.16
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.31.1
-digest: sha256:2704e238d9b6f9628aeed634adbfd5ba2c80b9b799a96039b2d29b456873b31c
-generated: "2025-06-04T08:48:31.940112+02:00"
+  version: 2.31.3
+digest: sha256:d0fd3dda2ecdb80ee4da9d2c1dcd673f57492f085183cd4d8fdcd8d93c058bdb
+generated: "2025-08-07T19:24:55.856235807Z"

+ 6 - 6
bitnami/milvus/Chart.yaml

@@ -5,17 +5,17 @@ annotations:
   category: Infrastructure
   images: |
     - name: attu
-      image: docker.io/bitnami/attu:2.5.12-debian-12-r10
+      image: docker.io/bitnami/attu:2.5.12-debian-12-r18
     - name: milvus
-      image: docker.io/bitnami/milvus:2.5.16-debian-12-r0
+      image: docker.io/bitnami/milvus:2.6.0-debian-12-r1
     - name: os-shell
-      image: docker.io/bitnami/os-shell:12-debian-12-r49
+      image: docker.io/bitnami/os-shell:12-debian-12-r50
     - name: pymilvus
-      image: docker.io/bitnami/pymilvus:2.5.14-debian-12-r8
+      image: docker.io/bitnami/pymilvus:2.6.0-debian-12-r5
   licenses: Apache-2.0
   tanzuCategory: service
 apiVersion: v2
-appVersion: 2.5.16
+appVersion: 2.6.0
 dependencies:
 - condition: etcd.enabled
   name: etcd
@@ -51,4 +51,4 @@ maintainers:
 name: milvus
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/milvus
-version: 15.0.16
+version: 16.0.0

File diff suppressed because it is too large
+ 306 - 750
bitnami/milvus/README.md


+ 5 - 14
bitnami/milvus/templates/NOTES.txt

@@ -29,23 +29,14 @@ Installed components:
   {{- if .Values.proxy.enabled }}
   * proxy
   {{- end }}
-  {{- if .Values.dataCoord.enabled }}
-  * data-coordinator
-  {{- end }}
-  {{- if .Values.indexCoord.enabled }}
-  * index-coordinator
-  {{- end }}
-  {{- if .Values.queryCoord.enabled }}
-  * query-coordinator
-  {{- end }}
-  {{- if .Values.rootCoord.enabled }}
-  * root-coordinator
+  {{- if .Values.coordinator.enabled }}
+  * coordinator
   {{- end }}
   {{- if .Values.dataNode.enabled }}
   * data-node
   {{- end }}
-  {{- if .Values.indexNode.enabled }}
-  * index-node
+  {{- if .Values.streamingNode.enabled }}
+  * streaming-node
   {{- end }}
   {{- if .Values.queryNode.enabled }}
   * query-node
@@ -120,6 +111,6 @@ Check the upstream Milvus documentation: https://milvus.io/docs
 {{- include "milvus.validateValues" . }}
 
 {{- end }}
-{{- include "common.warnings.resources" (dict "sections" (list "attu" "dataCoord" "dataNode" "indexCoord" "indexNode" "initJob" "proxy" "queryCoord" "queryNode" "rootCoord" "waitContainer") "context" $) }}
+{{- include "common.warnings.resources" (dict "sections" (list "attu" "coordinator" "dataNode" "queryNode" "streamingNode" "initJob" "proxy" "waitContainer") "context" $) }}
 {{- include "common.warnings.modifiedImages" (dict "images" (list .Values.milvus.image .Values.initJob.image .Values.attu.image .Values.waitContainer.image) "context" $) }}
 {{- include "common.errors.insecureImages" (dict "images" (list .Values.milvus.image .Values.initJob.image .Values.attu.image .Values.waitContainer.image) "context" $) }}

+ 36 - 156
bitnami/milvus/templates/_helpers.tpl

@@ -32,162 +32,42 @@ Return the proper Wait container image name
 {{- end -}}
 
 {{/*
-Return the proper Milvus Data Coordinator fullname
+Return the proper Milvus Coordinator fullname
 */}}
-{{- define "milvus.data-coordinator.fullname" -}}
-{{- printf "%s-%s" (include "common.names.fullname" .) "data-coordinator" | trunc 63 | trimSuffix "-" -}}
+{{- define "milvus.coordinator.fullname" -}}
+{{- printf "%s-%s" (include "common.names.fullname" .) "coordinator" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
-Name of the Milvus Data Coordinator service account to use
+Name of the Milvus Coordinator service account to use
 */}}
-{{- define "milvus.data-coordinator.serviceAccountName" -}}
-{{- if .Values.dataCoord.serviceAccount.create -}}
-    {{ default (printf "%s" (include "milvus.data-coordinator.fullname" .)) .Values.dataCoord.serviceAccount.name }}
+{{- define "milvus.coordinator.serviceAccountName" -}}
+{{- if .Values.coordinator.serviceAccount.create -}}
+    {{- default (printf "%s" (include "milvus.coordinator.fullname" .)) .Values.coordinator.serviceAccount.name -}}
 {{- else -}}
-    {{ default "default" .Values.dataCoord.serviceAccount.name }}
+    {{- default "default" .Values.coordinator.serviceAccount.name -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Get the configuration configmap for Milvus Data Coordinator
+Get the extra configuration configmap for Milvus Coordinator
 */}}
-{{- define "milvus.data-coordinator.configmapName" -}}
-{{- if .Values.dataCoord.existingConfigMap -}}
-    {{- .Values.dataCoord.existingConfigMap -}}
+{{- define "milvus.coordinator.configmapName" -}}
+{{- if .Values.coordinator.existingConfigMap -}}
+    {{- .Values.coordinator.existingConfigMap -}}
 {{- else }}
-    {{- include "milvus.data-coordinator.fullname" . -}}
+    {{- include "milvus.coordinator.fullname" . -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Get the extra configuration configmap for Milvus Data Coordinator
+Get the extra configuration configmap for Milvus Coordinator
 */}}
-{{- define "milvus.data-coordinator.extraConfigmapName" -}}
-{{- if .Values.dataCoord.extraConfigExistingConfigMap -}}
-    {{- include "common.tplvalues.render" (dict "value" .Value.dataCoord.extraConfigExistingConfigMap "context" $) -}}
+{{- define "milvus.coordinator.extraConfigmapName" -}}
+{{- if .Values.coordinator.extraConfigExistingConfigMap -}}
+    {{- include "common.tplvalues.render" (dict "value" .Value.coordinator.extraConfigExistingConfigMap "context" $) -}}
 {{- else -}}
-    {{- printf "%s-extra" (include "milvus.data-coordinator.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper Milvus Index Coordinator fullname
-*/}}
-{{- define "milvus.index-coordinator.fullname" -}}
-{{- printf "%s-%s" (include "common.names.fullname" .) "index-coordinator" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Name of the Milvus Index Coordinator service account to use
-*/}}
-{{- define "milvus.index-coordinator.serviceAccountName" -}}
-{{- if .Values.indexCoord.serviceAccount.create -}}
-    {{ default (printf "%s" (include "milvus.index-coordinator.fullname" .)) .Values.indexCoord.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.indexCoord.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the extra configuration configmap for Milvus Index Coordinator
-*/}}
-{{- define "milvus.index-coordinator.configmapName" -}}
-{{- if .Values.indexCoord.existingConfigMap -}}
-    {{- .Values.indexCoord.existingConfigMap -}}
-{{- else }}
-    {{- include "milvus.index-coordinator.fullname" . -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the extra configuration configmap for Milvus Index Coordinator
-*/}}
-{{- define "milvus.index-coordinator.extraConfigmapName" -}}
-{{- if .Values.indexCoord.extraConfigExistingConfigMap -}}
-    {{- include "common.tplvalues.render" (dict "value" .Value.indexCoord.extraConfigExistingConfigMap "context" $) -}}
-{{- else -}}
-    {{- printf "%s-extra" (include "milvus.index-coordinator.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper Milvus Query Coordinator fullname
-*/}}
-{{- define "milvus.query-coordinator.fullname" -}}
-{{- printf "%s-%s" (include "common.names.fullname" .) "query-coordinator" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Name of the Milvus Query Coordinator service account to use
-*/}}
-{{- define "milvus.query-coordinator.serviceAccountName" -}}
-{{- if .Values.queryCoord.serviceAccount.create -}}
-    {{ default (printf "%s" (include "milvus.query-coordinator.fullname" .)) .Values.queryCoord.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.queryCoord.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the configuration configmap for Milvus Query Coordinator
-*/}}
-{{- define "milvus.query-coordinator.configmapName" -}}
-{{- if .Values.queryCoord.existingConfigMap -}}
-    {{- .Values.queryCoord.existingConfigMap -}}
-{{- else }}
-    {{- include "milvus.query-coordinator.fullname" . -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the extra configuration configmap for Milvus Query Coordinator
-*/}}
-{{- define "milvus.query-coordinator.extraConfigmapName" -}}
-{{- if .Values.queryCoord.extraConfigExistingConfigMap -}}
-    {{- include "common.tplvalues.render" (dict "value" .Value.queryCoord.extraConfigExistingConfigMap "context" $) -}}
-{{- else -}}
-    {{- printf "%s-extra" (include "milvus.query-coordinator.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper Milvus Root Coordinator fullname
-*/}}
-{{- define "milvus.root-coordinator.fullname" -}}
-{{- printf "%s-%s" (include "common.names.fullname" .) "root-coordinator" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Name of the Milvus Root Coordinator service account to use
-*/}}
-{{- define "milvus.root-coordinator.serviceAccountName" -}}
-{{- if .Values.rootCoord.serviceAccount.create -}}
-    {{- default (printf "%s" (include "milvus.root-coordinator.fullname" .)) .Values.rootCoord.serviceAccount.name -}}
-{{- else -}}
-    {{- default "default" .Values.rootCoord.serviceAccount.name -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the extra configuration configmap for Milvus Root Coordinator
-*/}}
-{{- define "milvus.root-coordinator.configmapName" -}}
-{{- if .Values.rootCoord.existingConfigMap -}}
-    {{- .Values.rootCoord.existingConfigMap -}}
-{{- else }}
-    {{- include "milvus.root-coordinator.fullname" . -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the extra configuration configmap for Milvus Root Coordinator
-*/}}
-{{- define "milvus.root-coordinator.extraConfigmapName" -}}
-{{- if .Values.rootCoord.extraConfigExistingConfigMap -}}
-    {{- include "common.tplvalues.render" (dict "value" .Value.rootCoord.extraConfigExistingConfigMap "context" $) -}}
-{{- else -}}
-    {{- printf "%s-extra" (include "milvus.root-coordinator.fullname" .) -}}
+    {{- printf "%s-extra" (include "milvus.coordinator.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
@@ -234,40 +114,40 @@ Get the extra configuration configmap for Milvus Data Node
 {{/*
 Return the proper Milvus Index node fullname
 */}}
-{{- define "milvus.index-node.fullname" -}}
-{{- printf "%s-%s" (include "common.names.fullname" .) "index-node" | trunc 63 | trimSuffix "-" -}}
+{{- define "milvus.streaming-node.fullname" -}}
+{{- printf "%s-%s" (include "common.names.fullname" .) "streaming-node" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
-Name of the Milvus Index Node service account to use
+Name of the Milvus Streaming Node service account to use
 */}}
-{{- define "milvus.index-node.serviceAccountName" -}}
-{{- if .Values.indexNode.serviceAccount.create -}}
-    {{ default (printf "%s" (include "milvus.index-node.fullname" .)) .Values.indexNode.serviceAccount.name }}
+{{- define "milvus.streaming-node.serviceAccountName" -}}
+{{- if .Values.streamingNode.serviceAccount.create -}}
+    {{ default (printf "%s" (include "milvus.streaming-node.fullname" .)) .Values.streamingNode.serviceAccount.name }}
 {{- else -}}
-    {{ default "default" .Values.indexNode.serviceAccount.name }}
+    {{ default "default" .Values.streamingNode.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Get the configuration configmap for Milvus Index Node
+Get the configuration configmap for Milvus Streaming Node
 */}}
-{{- define "milvus.index-node.configmapName" -}}
-{{- if .Values.indexNode.existingConfigMap -}}
-    {{- .Values.indexNode.existingConfigMap -}}
+{{- define "milvus.streaming-node.configmapName" -}}
+{{- if .Values.streamingNode.existingConfigMap -}}
+    {{- .Values.streamingNode.existingConfigMap -}}
 {{- else }}
-    {{- include "milvus.index-node.fullname" . -}}
+    {{- include "milvus.streaming-node.fullname" . -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Get the extra configuration configmap for Milvus Index Node
+Get the extra configuration configmap for Milvus Streaming Node
 */}}
-{{- define "milvus.index-node.extraConfigmapName" -}}
-{{- if .Values.indexNode.extraConfigExistingConfigMap -}}
-    {{- include "common.tplvalues.render" (dict "value" .Value.indexNode.extraConfigExistingConfigMap "context" $) -}}
+{{- define "milvus.streaming-node.extraConfigmapName" -}}
+{{- if .Values.streamingNode.extraConfigExistingConfigMap -}}
+    {{- include "common.tplvalues.render" (dict "value" .Value.streamingNode.extraConfigExistingConfigMap "context" $) -}}
 {{- else -}}
-    {{- printf "%s-extra" (include "milvus.index-node.fullname" .) -}}
+    {{- printf "%s-extra" (include "milvus.streaming-node.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
@@ -1210,7 +1090,7 @@ Compile all warnings into a single message.
 Function to validate the controller deployment
 */}}
 {{- define "milvus.validateValues.controllers" -}}
-{{- if not (or .Values.dataCoord.enabled .Values.rootCoord.enabled .Values.indexCoord.enabled .Values.queryCoord.enabled .Values.dataNode.enabled .Values.queryNode.enabled .Values.indexNode.enabled) -}}
+{{- if not (or .Values.coordinator.enabled .Values.dataNode.enabled .Values.queryNode.enabled .Values.streamingNode.enabled) -}}
 milvus: Missing controllers. At least one controller should be enabled.
 {{- end -}}
 {{- end -}}

+ 4 - 4
bitnami/milvus/templates/index-node/configmap.yaml → bitnami/milvus/templates/coordinator/configmap.yaml

@@ -3,11 +3,11 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if not .Values.indexNode.existingConfigMap }}
+{{- if not .Values.coordinator.existingConfigMap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
+  name: {{ template "milvus.coordinator.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
@@ -15,6 +15,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  03_index_node_default.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.defaultConfig "context" $) | nindent 4 }}
+  03_coordinator_default.yaml: |
+    {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.defaultConfig "context" $) | nindent 4 }}
 {{- end }}

+ 82 - 84
bitnami/milvus/templates/root-coordinator/deployment.yaml → bitnami/milvus/templates/coordinator/deployment.yaml

@@ -3,161 +3,159 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.rootCoord.enabled }}
+{{- if .Values.coordinator.enabled }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
+  name: {{ template "milvus.coordinator.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
+    app.kubernetes.io/component: coordinator
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.rootCoord.autoscaling.hpa.enabled }}
-  replicas: {{ .Values.rootCoord.replicaCount }}
+  {{- if not .Values.coordinator.autoscaling.hpa.enabled }}
+  replicas: {{ .Values.coordinator.replicaCount }}
   {{- end }}
-  {{- if .Values.rootCoord.updateStrategy }}
-  strategy: {{- toYaml .Values.rootCoord.updateStrategy | nindent 4 }}
+  {{- if .Values.coordinator.updateStrategy }}
+  strategy: {{- toYaml .Values.coordinator.updateStrategy | nindent 4 }}
   {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.podLabels .Values.commonLabels ) "context" . ) }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: root-coordinator
+      app.kubernetes.io/component: coordinator
   template:
     metadata:
       annotations:
         checksum/common-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/common-config-extra: {{ include (print $.Template.BasePath "/extra-configmap.yaml") . | sha256sum }}
-        checksum/config-extra: {{ include (print $.Template.BasePath "/root-coordinator/extra-configmap.yaml") . | sha256sum }}
-        {{- if .Values.rootCoord.podAnnotations }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.podAnnotations "context" $) | nindent 8 }}
+        checksum/config-extra: {{ include (print $.Template.BasePath "/coordinator/extra-configmap.yaml") . | sha256sum }}
+        {{- if .Values.coordinator.podAnnotations }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
       labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
         app.kubernetes.io/part-of: milvus
-        app.kubernetes.io/component: root-coordinator
+        app.kubernetes.io/component: coordinator
     spec:
       enableServiceLinks: {{ .Values.enableServiceLinks }}
-      serviceAccountName: {{ template "milvus.root-coordinator.serviceAccountName" . }}
+      serviceAccountName: {{ template "milvus.coordinator.serviceAccountName" . }}
       {{- include "milvus.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.rootCoord.automountServiceAccountToken }}
-      {{- if .Values.rootCoord.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.hostAliases "context" $) | nindent 8 }}
+      automountServiceAccountToken: {{ .Values.coordinator.automountServiceAccountToken }}
+      {{- if .Values.coordinator.hostAliases }}
+      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.hostAliases "context" $) | nindent 8 }}
       {{- end }}
-      {{- if .Values.rootCoord.affinity }}
-      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.rootCoord.affinity "context" $) | nindent 8 }}
+      {{- if .Values.coordinator.affinity }}
+      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.coordinator.affinity "context" $) | nindent 8 }}
       {{- else }}
       affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.rootCoord.podAffinityPreset "component" "root-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.rootCoord.podAntiAffinityPreset "component" "root-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.rootCoord.nodeAffinityPreset.type "key" .Values.rootCoord.nodeAffinityPreset.key "values" .Values.rootCoord.nodeAffinityPreset.values) | nindent 10 }}
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.coordinator.podAffinityPreset "component" "coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.coordinator.podAntiAffinityPreset "component" "coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.coordinator.nodeAffinityPreset.type "key" .Values.coordinator.nodeAffinityPreset.key "values" .Values.coordinator.nodeAffinityPreset.values) | nindent 10 }}
       {{- end }}
-      {{- if .Values.rootCoord.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.rootCoord.nodeSelector "context" $) | nindent 8 }}
+      {{- if .Values.coordinator.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.coordinator.nodeSelector "context" $) | nindent 8 }}
       {{- end }}
-      {{- if .Values.rootCoord.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.tolerations "context" .) | nindent 8 }}
+      {{- if .Values.coordinator.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.tolerations "context" .) | nindent 8 }}
       {{- end }}
-      {{- if .Values.rootCoord.runtimeClassName }}
-      runtimeClassName: {{ .Values.rootCoord.runtimeClassName | quote }}
+      {{- if .Values.coordinator.runtimeClassName }}
+      runtimeClassName: {{ .Values.coordinator.runtimeClassName | quote }}
       {{- end }}
-      {{- if .Values.rootCoord.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.topologySpreadConstraints "context" .) | nindent 8 }}
+      {{- if .Values.coordinator.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.topologySpreadConstraints "context" .) | nindent 8 }}
       {{- end }}
-      {{- if .Values.rootCoord.priorityClassName }}
-      priorityClassName: {{ .Values.rootCoord.priorityClassName | quote }}
+      {{- if .Values.coordinator.priorityClassName }}
+      priorityClassName: {{ .Values.coordinator.priorityClassName | quote }}
       {{- end }}
-      {{- if .Values.rootCoord.schedulerName }}
-      schedulerName: {{ .Values.rootCoord.schedulerName }}
+      {{- if .Values.coordinator.schedulerName }}
+      schedulerName: {{ .Values.coordinator.schedulerName }}
       {{- end }}
-      {{- if .Values.rootCoord.podSecurityContext.enabled }}
-      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.rootCoord.podSecurityContext "context" $) | nindent 8 }}
+      {{- if .Values.coordinator.podSecurityContext.enabled }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.coordinator.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       initContainers:
-        {{- if .Values.rootCoord.enableDefaultInitContainers }}
+        {{- if .Values.coordinator.enableDefaultInitContainers }}
         {{- include "milvus.waitForETCDInitContainer" . | nindent 8 }}
         {{- include "milvus.waitForKafkaInitContainer" . | nindent 8 }}
         {{- include "milvus.waitForS3InitContainer" . | nindent 8 }}
-        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "rootCoord" "context" $) | nindent 8 }}
+        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "coordinator" "context" $) | nindent 8 }}
         {{- end }}
-        {{- if .Values.rootCoord.initContainers }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.initContainers "context" $) | nindent 8 }}
+        {{- if .Values.coordinator.initContainers }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.initContainers "context" $) | nindent 8 }}
         {{- end }}
       containers:
         - name: milvus
           image: {{ template "milvus.image" . }}
           imagePullPolicy: {{ .Values.milvus.image.pullPolicy }}
-          {{- if .Values.rootCoord.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.rootCoord.containerSecurityContext "context" $) | nindent 12 }}
+          {{- if .Values.coordinator.containerSecurityContext.enabled }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.coordinator.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.rootCoord.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.command "context" $) | nindent 12 }}
+          {{- else if .Values.coordinator.command }}
+          command: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.command "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.rootCoord.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.args "context" $) | nindent 12 }}
+          {{- else if .Values.coordinator.args }}
+          args: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.args "context" $) | nindent 12 }}
           {{- else }}
           args:
             - run
-            - rootcoord
+            - mixcoord
           {{- end }}
           env:
             - name: METRICS_PORT
-              value: {{ .Values.rootCoord.containerPorts.metrics | quote }}
-            {{- if .Values.rootCoord.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.extraEnvVars "context" $) | nindent 12 }}
+              value: {{ .Values.coordinator.containerPorts.metrics | quote }}
+            {{- if .Values.coordinator.extraEnvVars }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
-            {{- if .Values.rootCoord.extraEnvVarsCM }}
+            {{- if .Values.coordinator.extraEnvVarsCM }}
             - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.rootCoord.extraEnvVarsCM "context" $) }}
+                name: {{ include "common.tplvalues.render" (dict "value" .Values.coordinator.extraEnvVarsCM "context" $) }}
             {{- end }}
-            {{- if .Values.rootCoord.extraEnvVarsSecret }}
+            {{- if .Values.coordinator.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.rootCoord.extraEnvVarsSecret "context" $) }}
+                name: {{ include "common.tplvalues.render" (dict "value" .Values.coordinator.extraEnvVarsSecret "context" $) }}
             {{- end }}
           ports:
-            - containerPort: {{ .Values.rootCoord.containerPorts.grpc }}
-              name: grpc
-            - containerPort: {{ .Values.rootCoord.containerPorts.metrics }}
+            - containerPort: {{ .Values.coordinator.containerPorts.metrics }}
               name: http-metrics
-          {{- if .Values.rootCoord.resources }}
-          resources: {{- toYaml .Values.rootCoord.resources | nindent 12 }}
-          {{- else if ne .Values.rootCoord.resourcesPreset "none" }}
-          resources: {{- include "common.resources.preset" (dict "type" .Values.rootCoord.resourcesPreset) | nindent 12 }}
+          {{- if .Values.coordinator.resources }}
+          resources: {{- toYaml .Values.coordinator.resources | nindent 12 }}
+          {{- else if ne .Values.coordinator.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.coordinator.resourcesPreset) | nindent 12 }}
           {{- end }}
           {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.rootCoord.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.rootCoord.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rootCoord.livenessProbe "enabled") "context" $) | nindent 12 }}
+          {{- if .Values.coordinator.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.customLivenessProbe "context" $) | nindent 12 }}
+          {{- else if .Values.coordinator.livenessProbe.enabled }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.coordinator.livenessProbe "enabled") "context" $) | nindent 12 }}
             tcpSocket:
               port: http-metrics
           {{- end }}
-          {{- if .Values.rootCoord.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.rootCoord.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rootCoord.readinessProbe "enabled") "context" $) | nindent 12 }}
+          {{- if .Values.coordinator.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.customReadinessProbe "context" $) | nindent 12 }}
+          {{- else if .Values.coordinator.readinessProbe.enabled }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.coordinator.readinessProbe "enabled") "context" $) | nindent 12 }}
             httpGet:
               path: /healthz
               port: http-metrics
           {{- end }}
-          {{- if .Values.rootCoord.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.rootCoord.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rootCoord.startupProbe "enabled") "context" $) | nindent 12 }}
+          {{- if .Values.coordinator.customStartupProbe }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.customStartupProbe "context" $) | nindent 12 }}
+          {{- else if .Values.coordinator.startupProbe.enabled }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.coordinator.startupProbe "enabled") "context" $) | nindent 12 }}
             tcpSocket:
               port: http-metrics
           {{- end }}
           {{- end }}
-          {{- if .Values.rootCoord.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.lifecycleHooks "context" $) | nindent 12 }}
+          {{- if .Values.coordinator.lifecycleHooks }}
+          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.lifecycleHooks "context" $) | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: empty-dir
@@ -188,11 +186,11 @@ spec:
               mountPath: /opt/bitnami/milvus/configs/cert/minio/client
               readOnly: true
             {{- end }}
-          {{- if .Values.rootCoord.extraVolumeMounts }}
-          {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- if .Values.coordinator.extraVolumeMounts }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
-        {{- if .Values.rootCoord.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.rootCoord.sidecars "context" $) | nindent 8 }}
+        {{- if .Values.coordinator.sidecars }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.coordinator.sidecars "context" $) | nindent 8 }}
         {{- end }}
       volumes:
         - name: empty-dir
@@ -224,11 +222,11 @@ spec:
         {{- end }}
         - name: component-config-default
           configMap:
-            name: {{ template "milvus.root-coordinator.configmapName" . }}
-        {{- if or .Values.rootCoord.extraConfig .Values.rootCoord.extraConfigExistingConfigMap }}
+            name: {{ template "milvus.coordinator.configmapName" . }}
+        {{- if or .Values.coordinator.extraConfig .Values.coordinator.extraConfigExistingConfigMap }}
         - name: component-extra-config
           configMap:
-            name: {{ template "milvus.root-coordinator.extraConfigmapName" . }}
+            name: {{ template "milvus.coordinator.extraConfigmapName" . }}
         {{- end }}
         {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
         - name: etcd-client-certs
@@ -248,7 +246,7 @@ spec:
             secretName: {{ .Values.externalS3.tls.existingSecret }}
             defaultMode: 256
         {{- end }}
-        {{- if .Values.rootCoord.extraVolumes }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.extraVolumes "context" $) | nindent 8 }}
+        {{- if .Values.coordinator.extraVolumes }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
 {{- end }}

+ 5 - 5
bitnami/milvus/templates/index-node/extra-configmap.yaml → bitnami/milvus/templates/coordinator/extra-configmap.yaml

@@ -3,19 +3,19 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.indexNode.extraConfig (not .Values.indexNode.extraConfigExistingConfigMap) }}
+{{- if and .Values.coordinator.extraConfig (not .Values.coordinator.extraConfigExistingConfigMap) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-extra" (include "milvus.index-node.fullname" .) }}
+  name: {{ printf "%s-extra" (include "milvus.coordinator.fullname" .) }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
+    app.kubernetes.io/component: coordinator
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  04_index_node_extra.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.extraConfig "context" $) | nindent 4 }}
+  04_coordinator_extra.yaml: |
+    {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.extraConfig "context" $) | nindent 4 }}
 {{- end }}

+ 12 - 12
bitnami/milvus/templates/root-coordinator/hpa.yaml → bitnami/milvus/templates/coordinator/hpa.yaml

@@ -3,41 +3,41 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.rootCoord.autoscaling.hpa.enabled }}
+{{- if .Values.coordinator.autoscaling.hpa.enabled }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
+  name: {{ template "milvus.coordinator.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-  {{- if or .Values.commonAnnotations .Values.rootCoord.autoscaling.hpa.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
+    app.kubernetes.io/component: coordinator
+  {{- if or .Values.commonAnnotations .Values.coordinator.autoscaling.hpa.annotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
   scaleTargetRef:
     apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
     kind: Deployment
-    name: {{ template "milvus.root-coordinator.fullname" . }}
-  minReplicas: {{ .Values.rootCoord.autoscaling.hpa.minReplicas }}
-  maxReplicas: {{ .Values.rootCoord.autoscaling.hpa.maxReplicas }}
+    name: {{ template "milvus.coordinator.fullname" . }}
+  minReplicas: {{ .Values.coordinator.autoscaling.hpa.minReplicas }}
+  maxReplicas: {{ .Values.coordinator.autoscaling.hpa.maxReplicas }}
   metrics:
-    {{- if .Values.rootCoord.autoscaling.hpa.targetCPU }}
+    {{- if .Values.coordinator.autoscaling.hpa.targetCPU }}
     - type: Resource
       resource:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.rootCoord.autoscaling.hpa.targetCPU }}
+          averageUtilization: {{ .Values.coordinator.autoscaling.hpa.targetCPU }}
     {{- end }}
-    {{- if .Values.rootCoord.autoscaling.hpa.targetMemory }}
+    {{- if .Values.coordinator.autoscaling.hpa.targetMemory }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.rootCoord.autoscaling.hpa.targetMemory }}
+          averageUtilization: {{ .Values.coordinator.autoscaling.hpa.targetMemory }}
     {{- end }}
 {{- end }}

+ 21 - 26
bitnami/milvus/templates/root-coordinator/networkpolicy.yaml → bitnami/milvus/templates/coordinator/networkpolicy.yaml

@@ -3,28 +3,28 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.rootCoord.networkPolicy.enabled }}
+{{- if .Values.coordinator.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
 metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
+  name: {{ template "milvus.coordinator.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
+    app.kubernetes.io/component: coordinator
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.podLabels .Values.commonLabels ) "context" . ) }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.podLabels .Values.commonLabels ) "context" . ) }}
   podSelector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: root-coordinator
+      app.kubernetes.io/component: coordinator
   policyTypes:
     - Ingress
     - Egress
-  {{- if .Values.rootCoord.networkPolicy.allowExternalEgress }}
+  {{- if .Values.coordinator.networkPolicy.allowExternalEgress }}
   egress:
     - {}
   {{- else }}
@@ -37,13 +37,9 @@ spec:
           protocol: TCP
     # Allow outbound connections to other cluster pods
     - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
         - port: {{ .Values.queryNode.containerPorts.grpc }}
         - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
+        - port: {{ .Values.streamingNode.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpcInternal }}
       to:
@@ -54,7 +50,7 @@ spec:
         - port: {{ include "milvus.s3.port" . }}
       {{- if .Values.minio.enabled }}
         - port: {{ .Values.minio.containerPorts.api }}
-      to: 
+      to:
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: minio
@@ -63,7 +59,7 @@ spec:
     # Allow outbound connections to etcd
     - ports:
         - port: {{ include "milvus.etcd.port" . }}
-      to: 
+      to:
         {{- if .Values.etcd.enabled }}
         - podSelector:
             matchLabels:
@@ -73,44 +69,43 @@ spec:
     # Allow outbound connections to kafka
     - ports:
         - port: {{ include "milvus.kafka.port" . }}
-      to: 
+      to:
         {{- if .Values.kafka.enabled }}
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: kafka
               app.kubernetes.io/instance: {{ .Release.Name }}
         {{- end }}
-    {{- if .Values.rootCoord.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.rootCoord.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
+    {{- if .Values.coordinator.networkPolicy.extraEgress }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.coordinator.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
     {{- end }}
   {{- end }}
   ingress:
     - ports:
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
-        {{- if .Values.rootCoord.metrics.enabled }}
-        - port: {{ .Values.rootCoord.containerPorts.metrics }}
+        {{- if .Values.coordinator.metrics.enabled }}
+        - port: {{ .Values.coordinator.containerPorts.metrics }}
         {{- end }}
-      {{- if not .Values.rootCoord.networkPolicy.allowExternal }}
+      {{- if not .Values.coordinator.networkPolicy.allowExternal }}
       from:
         - podSelector:
             matchLabels:
               {{ template "common.names.fullname" . }}-client: "true"
-        {{- if .Values.rootCoord.networkPolicy.ingressNSMatchLabels }}
+        {{- if .Values.coordinator.networkPolicy.ingressNSMatchLabels }}
         - namespaceSelector:
             matchLabels:
-              {{- range $key, $value := .Values.rootCoord.networkPolicy.ingressNSMatchLabels }}
+              {{- range $key, $value := .Values.coordinator.networkPolicy.ingressNSMatchLabels }}
               {{ $key | quote }}: {{ $value | quote }}
               {{- end }}
-          {{- if .Values.rootCoord.networkPolicy.ingressNSPodMatchLabels }}
+          {{- if .Values.coordinator.networkPolicy.ingressNSPodMatchLabels }}
           podSelector:
             matchLabels:
-              {{- range $key, $value := .Values.rootCoord.networkPolicy.ingressNSPodMatchLabels }}
+              {{- range $key, $value := .Values.coordinator.networkPolicy.ingressNSPodMatchLabels }}
               {{ $key | quote }}: {{ $value | quote }}
               {{- end }}
           {{- end }}
         {{- end }}
       {{- end }}
-    {{- if .Values.rootCoord.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.rootCoord.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
+    {{- if .Values.coordinator.networkPolicy.extraIngress }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.coordinator.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}

+ 9 - 9
bitnami/milvus/templates/root-coordinator/pdb.yaml → bitnami/milvus/templates/coordinator/pdb.yaml

@@ -3,28 +3,28 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.rootCoord.enabled .Values.rootCoord.pdb.create }}
+{{- if and .Values.coordinator.enabled .Values.coordinator.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
+  name: {{ template "milvus.coordinator.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
+    app.kubernetes.io/component: coordinator
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.rootCoord.pdb.minAvailable }}
-  minAvailable: {{ .Values.rootCoord.pdb.minAvailable }}
+  {{- if .Values.coordinator.pdb.minAvailable }}
+  minAvailable: {{ .Values.coordinator.pdb.minAvailable }}
   {{- end }}
-  {{- if or .Values.rootCoord.pdb.maxUnavailable (not .Values.rootCoord.pdb.minAvailable) }}
-  maxUnavailable: {{ .Values.rootCoord.pdb.maxUnavailable | default 1 }}
+  {{- if or .Values.coordinator.pdb.maxUnavailable (not .Values.coordinator.pdb.minAvailable) }}
+  maxUnavailable: {{ .Values.coordinator.pdb.maxUnavailable | default 1 }}
   {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.podLabels .Values.commonLabels ) "context" . ) }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: root-coordinator
+      app.kubernetes.io/component: coordinator
 {{- end }}

+ 6 - 6
bitnami/milvus/templates/index-node/service-account.yaml → bitnami/milvus/templates/coordinator/service-account.yaml

@@ -3,18 +3,18 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.indexNode.serviceAccount.create }}
+{{- if .Values.coordinator.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "milvus.index-node.serviceAccountName" . }}
+  name: {{ include "milvus.coordinator.serviceAccountName" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
-  {{- if or .Values.indexNode.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
+    app.kubernetes.io/component: coordinator
+  {{- if or .Values.coordinator.serviceAccount.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
-automountServiceAccountToken: {{ .Values.indexNode.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ .Values.coordinator.serviceAccount.automountServiceAccountToken }}
 {{- end }}

+ 64 - 0
bitnami/milvus/templates/coordinator/service.yaml

@@ -0,0 +1,64 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if and .Values.coordinator.enabled (or .Values.coordinator.metrics.enabled .Values.coordinator.service.extraPorts)}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "milvus.coordinator.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: milvus
+    app.kubernetes.io/component: coordinator
+  {{- if or .Values.commonAnnotations .Values.coordinator.service.annotations (and .Values.coordinator.metrics.enabled .Values.coordinator.metrics.annotations) }}
+  annotations:
+    {{- if or .Values.coordinator.service.annotations .Values.commonAnnotations }}
+    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.service.annotations .Values.commonAnnotations ) "context" . ) }}
+    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
+    {{- end }}
+    {{- if and .Values.coordinator.metrics.enabled .Values.coordinator.metrics.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.coordinator.metrics.annotations "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  type: {{ .Values.coordinator.service.type }}
+  {{- if .Values.coordinator.service.sessionAffinity }}
+  sessionAffinity: {{ .Values.coordinator.service.sessionAffinity }}
+  {{- end }}
+  {{- if .Values.coordinator.service.sessionAffinityConfig }}
+  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.service.sessionAffinityConfig "context" $) | nindent 4 }}
+  {{- end }}
+  {{- if .Values.coordinator.service.clusterIP }}
+  clusterIP: {{ .Values.coordinator.service.clusterIP }}
+  {{- end }}
+  {{- if (or (eq .Values.coordinator.service.type "LoadBalancer") (eq .Values.coordinator.service.type "NodePort")) }}
+  externalTrafficPolicy: {{ .Values.coordinator.service.externalTrafficPolicy | quote }}
+  {{- end }}
+  {{ if eq .Values.coordinator.service.type "LoadBalancer" }}
+  loadBalancerSourceRanges: {{ .Values.coordinator.service.loadBalancerSourceRanges }}
+  {{ end }}
+  {{- if (and (eq .Values.coordinator.service.type "LoadBalancer") (not (empty .Values.coordinator.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.coordinator.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    {{- if .Values.coordinator.metrics.enabled }}
+    - name: http-metrics
+      port: {{ .Values.coordinator.service.ports.metrics }}
+      targetPort: http-metrics
+      protocol: TCP
+      {{- if (and (or (eq .Values.coordinator.service.type "NodePort") (eq .Values.coordinator.service.type "LoadBalancer")) (not (empty .Values.coordinator.service.nodePorts.metrics))) }}
+      nodePort: {{ .Values.coordinator.service.nodePorts.metrics }}
+      {{- else if eq .Values.coordinator.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
+    {{- end }}
+    {{- if .Values.coordinator.service.extraPorts }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.service.extraPorts "context" $) | nindent 4 }}
+    {{- end }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.podLabels .Values.commonLabels ) "context" . ) }}
+  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: milvus
+    app.kubernetes.io/component: coordinator
+{{- end }}

+ 51 - 0
bitnami/milvus/templates/coordinator/servicemonitor.yaml

@@ -0,0 +1,51 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if and .Values.coordinator.enabled .Values.coordinator.metrics.enabled .Values.coordinator.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "milvus.coordinator.fullname" . }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.coordinator.metrics.serviceMonitor.namespace | quote }}
+  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: milvus
+    app.kubernetes.io/component: coordinator
+  {{- if or .Values.commonAnnotations .Values.coordinator.metrics.serviceMonitor.annotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.coordinator.metrics.serviceMonitor.jobLabel }}
+  jobLabel: {{ .Values.coordinator.metrics.serviceMonitor.jobLabel }}
+  {{- end }}
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
+      {{- if .Values.coordinator.metrics.serviceMonitor.selector }}
+      {{- include "common.tplvalues.render" (dict "value" .Values.coordinator.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
+      {{- end }}
+      app.kubernetes.io/part-of: milvus
+      app.kubernetes.io/component: coordinator
+  endpoints:
+    - port: http-metrics
+      {{- if .Values.coordinator.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.coordinator.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.coordinator.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.coordinator.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.coordinator.metrics.serviceMonitor.honorLabels }}
+      honorLabels: {{ .Values.coordinator.metrics.serviceMonitor.honorLabels }}
+      {{- end }}
+      {{- if .Values.coordinator.metrics.serviceMonitor.metricRelabelings }}
+      metricRelabelings: {{- toYaml .Values.coordinator.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
+      {{- end }}
+      {{- if .Values.coordinator.metrics.serviceMonitor.relabelings }}
+      relabelings: {{- toYaml .Values.coordinator.metrics.serviceMonitor.relabelings | nindent 6 }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ include "common.names.namespace" . | quote }}
+{{- end }}

+ 12 - 12
bitnami/milvus/templates/index-node/vpa.yaml → bitnami/milvus/templates/coordinator/vpa.yaml

@@ -3,42 +3,42 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.indexNode.autoscaling.vpa.enabled }}
+{{- if and .Values.coordinator.enabled .Values.coordinator.autoscaling.vpa.enabled (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) }}
 apiVersion: {{ include "common.capabilities.vpa.apiVersion" . }}
 kind: VerticalPodAutoscaler
 metadata:
-  name: {{ include "milvus.index-node.fullname" . }}
+  name: {{ include "milvus.coordinator.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
-  {{- if or .Values.indexNode.autoscaling.vpa.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
+    app.kubernetes.io/component: coordinator
+  {{- if or .Values.coordinator.autoscaling.vpa.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.coordinator.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
   resourcePolicy:
     containerPolicies:
-    - containerName: milvus-index-node
-      {{- with .Values.indexNode.autoscaling.vpa.controlledResources }}
+    - containerName: milvus-coordinator
+      {{- with .Values.coordinator.autoscaling.vpa.controlledResources }}
       controlledResources:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.indexNode.autoscaling.vpa.maxAllowed }}
+      {{- with .Values.coordinator.autoscaling.vpa.maxAllowed }}
       maxAllowed:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.indexNode.autoscaling.vpa.minAllowed }}
+      {{- with .Values.coordinator.autoscaling.vpa.minAllowed }}
       minAllowed:
         {{- toYaml . | nindent 8 }}
       {{- end }}
   targetRef:
     apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
     kind: Deployment
-    name: {{ include "milvus.index-node.fullname" . }}
-  {{- if .Values.indexNode.autoscaling.vpa.updatePolicy }}
+    name: {{ include "milvus.coordinator.fullname" . }}
+  {{- if .Values.coordinator.autoscaling.vpa.updatePolicy }}
   updatePolicy:
-    {{- with .Values.indexNode.autoscaling.vpa.updatePolicy.updateMode }}
+    {{- with .Values.coordinator.autoscaling.vpa.updatePolicy.updateMode }}
     updateMode: {{ . }}
     {{- end }}
   {{- end }}

+ 0 - 254
bitnami/milvus/templates/data-coordinator/deployment.yaml

@@ -1,254 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.dataCoord.enabled }}
-apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-kind: Deployment
-metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if not .Values.dataCoord.autoscaling.hpa.enabled }}
-  replicas: {{ .Values.dataCoord.replicaCount }}
-  {{- end }}
-  {{- if .Values.dataCoord.updateStrategy }}
-  strategy: {{- toYaml .Values.dataCoord.updateStrategy | nindent 4 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: data-coordinator
-  template:
-    metadata:
-      annotations:
-        checksum/common-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/common-config-extra: {{ include (print $.Template.BasePath "/extra-configmap.yaml") . | sha256sum }}
-        checksum/config-extra: {{ include (print $.Template.BasePath "/data-coordinator/extra-configmap.yaml") . | sha256sum }}
-        {{- if .Values.dataCoord.podAnnotations }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.podAnnotations "context" $) | nindent 8 }}
-        {{- end }}
-      labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
-        app.kubernetes.io/part-of: milvus
-        app.kubernetes.io/component: data-coordinator
-    spec:
-      enableServiceLinks: {{ .Values.enableServiceLinks }}
-      serviceAccountName: {{ template "milvus.data-coordinator.serviceAccountName" . }}
-      {{- include "milvus.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.dataCoord.automountServiceAccountToken }}
-      {{- if .Values.dataCoord.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.hostAliases "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.dataCoord.affinity }}
-      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.dataCoord.affinity "context" $) | nindent 8 }}
-      {{- else }}
-      affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.dataCoord.podAffinityPreset "component" "data-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.dataCoord.podAntiAffinityPreset "component" "data-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.dataCoord.nodeAffinityPreset.type "key" .Values.dataCoord.nodeAffinityPreset.key "values" .Values.dataCoord.nodeAffinityPreset.values) | nindent 10 }}
-      {{- end }}
-      {{- if .Values.dataCoord.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.dataCoord.nodeSelector "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.dataCoord.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.tolerations "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.dataCoord.runtimeClassName }}
-      runtimeClassName: {{ .Values.dataCoord.runtimeClassName | quote }}
-      {{- end }}
-      {{- if .Values.dataCoord.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.topologySpreadConstraints "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.dataCoord.priorityClassName }}
-      priorityClassName: {{ .Values.dataCoord.priorityClassName | quote }}
-      {{- end }}
-      {{- if .Values.dataCoord.schedulerName }}
-      schedulerName: {{ .Values.dataCoord.schedulerName }}
-      {{- end }}
-      {{- if .Values.dataCoord.podSecurityContext.enabled }}
-      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.dataCoord.podSecurityContext "context" $) | nindent 8 }}
-      {{- end }}
-      initContainers:
-        {{- if .Values.dataCoord.enableDefaultInitContainers }}
-        {{- include "milvus.waitForETCDInitContainer" . | nindent 8 }}
-        {{- include "milvus.waitForKafkaInitContainer" . | nindent 8 }}
-        {{- include "milvus.waitForS3InitContainer" . | nindent 8 }}
-        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "dataCoord" "context" $) | nindent 8 }}
-        {{- end }}
-        {{- if .Values.dataCoord.initContainers }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.initContainers "context" $) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: milvus
-          image: {{ template "milvus.image" . }}
-          imagePullPolicy: {{ .Values.milvus.image.pullPolicy }}
-          {{- if .Values.dataCoord.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.dataCoord.containerSecurityContext "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.dataCoord.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.command "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.dataCoord.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.args "context" $) | nindent 12 }}
-          {{- else }}
-          args:
-            - run
-            - datacoord
-          {{- end }}
-          env:
-            - name: METRICS_PORT
-              value: {{ .Values.dataCoord.containerPorts.metrics | quote }}
-            {{- if .Values.dataCoord.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          envFrom:
-            {{- if .Values.dataCoord.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.dataCoord.extraEnvVarsCM "context" $) }}
-            {{- end }}
-            {{- if .Values.dataCoord.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.dataCoord.extraEnvVarsSecret "context" $) }}
-            {{- end }}
-          ports:
-            - containerPort: {{ .Values.dataCoord.containerPorts.grpc }}
-              name: grpc
-            - containerPort: {{ .Values.dataCoord.containerPorts.metrics }}
-              name: http-metrics
-          {{- if .Values.dataCoord.resources }}
-          resources: {{- toYaml .Values.dataCoord.resources | nindent 12 }}
-          {{- else if ne .Values.dataCoord.resourcesPreset "none" }}
-          resources: {{- include "common.resources.preset" (dict "type" .Values.dataCoord.resourcesPreset) | nindent 12 }}
-          {{- end }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.dataCoord.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.dataCoord.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dataCoord.livenessProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.dataCoord.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.dataCoord.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dataCoord.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /healthz
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.dataCoord.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.dataCoord.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dataCoord.startupProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- end }}
-          {{- if .Values.dataCoord.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            - name: empty-dir
-              mountPath: /opt/bitnami/milvus/configs
-              subPath: app-rendered-conf-dir
-            - name: empty-dir
-              mountPath: /tmp
-              subPath: tmp-dir
-            - name: empty-dir
-              mountPath: /opt/bitnami/milvus/tmp
-              subPath: app-tmp-dir
-              # We are using a s3 backend, so this data dir is temporary
-            - name: empty-dir
-              mountPath: /bitnami/milvus/data
-              subPath: app-data-dir
-            {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
-            - name: etcd-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/etcd/client
-              readOnly: true
-            {{- end }}
-            {{- if and (not .Values.kafka.enabled) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.existingSecret }}
-            - name: kafka-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/kafka/client
-              readOnly: true
-            {{- end }}
-            {{- if and (not .Values.minio.enabled) .Values.externalS3.tls.enabled .Values.externalS3.tls.existingSecret }}
-            - name: minio-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/minio/client
-              readOnly: true
-            {{- end }}
-          {{- if .Values.dataCoord.extraVolumeMounts }}
-          {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.extraVolumeMounts "context" $) | nindent 12 }}
-          {{- end }}
-        {{- if .Values.dataCoord.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.dataCoord.sidecars "context" $) | nindent 8 }}
-        {{- end }}
-      volumes:
-        - name: empty-dir
-          emptyDir: {}
-        - name: config-common
-          configMap:
-            name: {{ template "milvus.configmapName" . }}
-        {{- if and .Values.usePasswordFiles (or (include "milvus.s3.deployed" .) (and (include "milvus.kafka.deployed" .) (or (include "milvus.kafka.authEnabled" .) (and .Values.externalKafka.tls.enabled .Values.externalKafka.tls.keyPassword .Values.externalKafka.tls.existingSecret)))) }}
-        - name: milvus-secrets
-          projected:
-            sources:
-              {{- if and (include "milvus.kafka.deployed" .) (include "milvus.kafka.authEnabled" .)}}
-              - secret:
-                  name: {{ include "milvus.kafka.secretName" . }}
-              {{- end }}
-              {{- if and (include "milvus.kafka.deployed" .) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.keyPassword .Values.externalKafka.tls.existingSecret }}
-              - secret:
-                  name: {{ printf "%s-external-kafka-tls-passwords" (include "common.names.fullname" .) }}
-              {{- end }}
-              {{- if (include "milvus.s3.deployed" .) }}
-              - secret:
-                  name: {{ include "milvus.s3.secretName" . }}
-              {{- end }}
-        {{- end }}
-        {{- if or .Values.milvus.extraConfig .Values.milvus.extraConfigExistingConfigMap }}
-        - name: extra-config-common
-          configMap:
-            name: {{ template "milvus.extraConfigmapName" . }}
-        {{- end }}
-        - name: component-config-default
-          configMap:
-            name: {{ template "milvus.data-coordinator.configmapName" . }}
-        {{- if or .Values.dataCoord.extraConfig .Values.dataCoord.extraConfigExistingConfigMap }}
-        - name: component-extra-config
-          configMap:
-            name: {{ template "milvus.data-coordinator.extraConfigmapName" . }}
-        {{- end }}
-        {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
-        - name: etcd-client-certs
-          secret:
-            secretName: {{ .Values.externalEtcd.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if and (not .Values.kafka.enabled) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.existingSecret }}
-        - name: kafka-client-certs
-          secret:
-            secretName: {{ .Values.externalKafka.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if and (not .Values.minio.enabled) .Values.externalS3.tls.enabled .Values.externalS3.tls.existingSecret }}
-        - name: minio-client-certs
-          secret:
-            secretName: {{ .Values.externalS3.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if .Values.dataCoord.extraVolumes }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.extraVolumes "context" $) | nindent 8 }}
-        {{- end }}
-{{- end }}

+ 0 - 21
bitnami/milvus/templates/data-coordinator/extra-configmap.yaml

@@ -1,21 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.dataCoord.extraConfig (not .Values.dataCoord.extraConfigExistingConfigMap) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-extra" (include "milvus.data-coordinator.fullname" .) }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  04_data_coordinator_extra.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.extraConfig "context" $) | nindent 4 }}
-{{- end }}

+ 0 - 43
bitnami/milvus/templates/data-coordinator/hpa.yaml

@@ -1,43 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.dataCoord.autoscaling.hpa.enabled }}
-apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if or .Values.commonAnnotations .Values.dataCoord.autoscaling.hpa.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  scaleTargetRef:
-    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: Deployment
-    name: {{ template "milvus.data-coordinator.fullname" . }}
-  minReplicas: {{ .Values.dataCoord.autoscaling.hpa.minReplicas }}
-  maxReplicas: {{ .Values.dataCoord.autoscaling.hpa.maxReplicas }}
-  metrics:
-    {{- if .Values.dataCoord.autoscaling.hpa.targetCPU }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.dataCoord.autoscaling.hpa.targetCPU }}
-    {{- end }}
-    {{- if .Values.dataCoord.autoscaling.hpa.targetMemory }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.dataCoord.autoscaling.hpa.targetMemory }}
-    {{- end }}
-{{- end }}

+ 0 - 120
bitnami/milvus/templates/data-coordinator/networkpolicy.yaml

@@ -1,120 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.dataCoord.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  podSelector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: data-coordinator
-  policyTypes:
-    - Ingress
-    - Egress
-  {{- if .Values.attu.networkPolicy.allowExternalEgress }}
-  egress:
-    - {}
-  {{- else }}
-  egress:
-    # Allow dns resolution
-    - ports:
-        - port: 53
-          protocol: UDP
-        - port: 53
-          protocol: TCP
-    # Allow outbound connections to other cluster pods
-    - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
-        - port: {{ .Values.queryNode.containerPorts.grpc }}
-        - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
-        - port: {{ .Values.proxy.containerPorts.grpc }}
-        - port: {{ .Values.proxy.containerPorts.grpcInternal }}
-      to:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 14 }}
-              app.kubernetes.io/part-of: milvus
-    # Allow outbound connections to S3
-    - ports:
-        - port: {{ include "milvus.s3.port" . }}
-      {{- if .Values.minio.enabled }}
-        - port: {{ .Values.minio.containerPorts.api }}
-      to: 
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: minio
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    # Allow outbound connections to etcd
-    - ports:
-        - port: {{ include "milvus.etcd.port" . }}
-      to: 
-        {{- if .Values.etcd.enabled }}
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: etcd
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    # Allow outbound connections to kafka
-    - ports:
-        - port: {{ include "milvus.kafka.port" . }}
-      to: 
-        {{- if .Values.kafka.enabled }}
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: kafka
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    {{- if .Values.dataCoord.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.dataCoord.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-  ingress:
-    - ports:
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        {{- if .Values.dataCoord.metrics.enabled }}
-        - port: {{ .Values.dataCoord.containerPorts.metrics }}
-        {{- end }}
-      {{- if not .Values.dataCoord.networkPolicy.allowExternal }}
-      from:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 14 }}
-              app.kubernetes.io/part-of: milvus
-        - podSelector:
-            matchLabels:
-              {{ template "common.names.fullname" . }}-client: "true"
-        {{- if .Values.dataCoord.networkPolicy.ingressNSMatchLabels }}
-        - namespaceSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.dataCoord.networkPolicy.ingressNSMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- if .Values.dataCoord.networkPolicy.ingressNSPodMatchLabels }}
-          podSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.dataCoord.networkPolicy.ingressNSPodMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- end }}
-        {{- end }}
-      {{- end }}
-    {{- if .Values.dataCoord.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.dataCoord.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
-    {{- end }}
-{{- end }}

+ 0 - 30
bitnami/milvus/templates/data-coordinator/pdb.yaml

@@ -1,30 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.dataCoord.enabled .Values.dataCoord.pdb.create }}
-apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
-kind: PodDisruptionBudget
-metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.dataCoord.pdb.minAvailable }}
-  minAvailable: {{ .Values.dataCoord.pdb.minAvailable }}
-  {{- end }}
-  {{- if or .Values.dataCoord.pdb.maxUnavailable (not .Values.dataCoord.pdb.minAvailable) }}
-  maxUnavailable: {{ .Values.dataCoord.pdb.maxUnavailable | default 1 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: data-coordinator
-{{- end }}

+ 0 - 20
bitnami/milvus/templates/data-coordinator/service-account.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.dataCoord.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "milvus.data-coordinator.serviceAccountName" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if or .Values.dataCoord.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.dataCoord.serviceAccount.automountServiceAccountToken }}
-{{- end }}

+ 0 - 73
bitnami/milvus/templates/data-coordinator/service.yaml

@@ -1,73 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.dataCoord.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if or .Values.commonAnnotations .Values.dataCoord.service.annotations (and .Values.dataCoord.metrics.enabled .Values.dataCoord.metrics.annotations) }}
-  annotations:
-    {{- if or .Values.dataCoord.service.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.service.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    {{- if and .Values.dataCoord.metrics.enabled .Values.dataCoord.metrics.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.dataCoord.metrics.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-spec:
-  type: {{ .Values.dataCoord.service.type }}
-  {{- if .Values.dataCoord.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.dataCoord.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.dataCoord.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.dataCoord.service.clusterIP }}
-  clusterIP: {{ .Values.dataCoord.service.clusterIP }}
-  {{- end }}
-  {{- if (or (eq .Values.dataCoord.service.type "LoadBalancer") (eq .Values.dataCoord.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.dataCoord.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{ if eq .Values.dataCoord.service.type "LoadBalancer" }}
-  loadBalancerSourceRanges: {{ .Values.dataCoord.service.loadBalancerSourceRanges }}
-  {{ end }}
-  {{- if (and (eq .Values.dataCoord.service.type "LoadBalancer") (not (empty .Values.dataCoord.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.dataCoord.service.loadBalancerIP }}
-  {{- end }}
-  ports:
-    - name: grpc
-      port: {{ .Values.dataCoord.service.ports.grpc }}
-      targetPort: grpc
-      protocol: TCP
-      {{- if (and (or (eq .Values.dataCoord.service.type "NodePort") (eq .Values.dataCoord.service.type "LoadBalancer")) (not (empty .Values.dataCoord.service.nodePorts.grpc))) }}
-      nodePort: {{ .Values.dataCoord.service.nodePorts.grpc }}
-      {{- else if eq .Values.dataCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.dataCoord.metrics.enabled }}
-    - name: http-metrics
-      port: {{ .Values.dataCoord.service.ports.metrics }}
-      targetPort: http-metrics
-      protocol: TCP
-      {{- if (and (or (eq .Values.dataCoord.service.type "NodePort") (eq .Values.dataCoord.service.type "LoadBalancer")) (not (empty .Values.dataCoord.service.nodePorts.metrics))) }}
-      nodePort: {{ .Values.dataCoord.service.nodePorts.metrics }}
-      {{- else if eq .Values.dataCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.dataCoord.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-{{- end }}

+ 0 - 51
bitnami/milvus/templates/data-coordinator/servicemonitor.yaml

@@ -1,51 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.dataCoord.enabled .Values.dataCoord.metrics.enabled .Values.dataCoord.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
-  namespace: {{ default (include "common.names.namespace" .) .Values.dataCoord.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if or .Values.commonAnnotations .Values.dataCoord.metrics.serviceMonitor.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.dataCoord.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.dataCoord.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
-      {{- if .Values.dataCoord.metrics.serviceMonitor.selector }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
-      {{- end }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: data-coordinator
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.dataCoord.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.dataCoord.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.dataCoord.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.dataCoord.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.dataCoord.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.dataCoord.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-      {{- if .Values.dataCoord.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- toYaml .Values.dataCoord.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
-      {{- end }}
-      {{- if .Values.dataCoord.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- toYaml .Values.dataCoord.metrics.serviceMonitor.relabelings | nindent 6 }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ include "common.names.namespace" . | quote }}
-{{- end }}

+ 0 - 45
bitnami/milvus/templates/data-coordinator/vpa.yaml

@@ -1,45 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.dataCoord.autoscaling.vpa.enabled }}
-apiVersion: {{ include "common.capabilities.vpa.apiVersion" . }}
-kind: VerticalPodAutoscaler
-metadata:
-  name: {{ include "milvus.data-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: data-coordinator
-  {{- if or .Values.dataCoord.autoscaling.vpa.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.dataCoord.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  resourcePolicy:
-    containerPolicies:
-    - containerName: milvus-data-coordinator
-      {{- with .Values.dataCoord.autoscaling.vpa.controlledResources }}
-      controlledResources:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.dataCoord.autoscaling.vpa.maxAllowed }}
-      maxAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.dataCoord.autoscaling.vpa.minAllowed }}
-      minAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-  targetRef:
-    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: Deployment
-    name: {{ include "milvus.data-coordinator.fullname" . }}
-  {{- if .Values.dataCoord.autoscaling.vpa.updatePolicy }}
-  updatePolicy:
-    {{- with .Values.dataCoord.autoscaling.vpa.updatePolicy.updateMode }}
-    updateMode: {{ . }}
-    {{- end }}
-  {{- end }}
-{{- end }}

+ 4 - 8
bitnami/milvus/templates/data-node/networkpolicy.yaml

@@ -37,13 +37,9 @@ spec:
           protocol: TCP
     # Allow outbound connections to other cluster pods
     - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
         - port: {{ .Values.queryNode.containerPorts.grpc }}
         - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
+        - port: {{ .Values.streamingNode.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpcInternal }}
       to:
@@ -54,7 +50,7 @@ spec:
         - port: {{ include "milvus.s3.port" . }}
       {{- if .Values.minio.enabled }}
         - port: {{ .Values.minio.containerPorts.api }}
-      to: 
+      to:
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: minio
@@ -63,7 +59,7 @@ spec:
     # Allow outbound connections to etcd
     - ports:
         - port: {{ include "milvus.etcd.port" . }}
-      to: 
+      to:
         {{- if .Values.etcd.enabled }}
         - podSelector:
             matchLabels:
@@ -73,7 +69,7 @@ spec:
     # Allow outbound connections to kafka
     - ports:
         - port: {{ include "milvus.kafka.port" . }}
-      to: 
+      to:
         {{- if .Values.kafka.enabled }}
         - podSelector:
             matchLabels:

+ 0 - 20
bitnami/milvus/templates/index-coordinator/configmap.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if not .Values.indexCoord.existingConfigMap }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  03_index_coordinator_default.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.defaultConfig "context" $) | nindent 4 }}
-{{- end }}

+ 0 - 254
bitnami/milvus/templates/index-coordinator/deployment.yaml

@@ -1,254 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.indexCoord.enabled }}
-apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-kind: Deployment
-metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if not .Values.indexCoord.autoscaling.hpa.enabled }}
-  replicas: {{ .Values.indexCoord.replicaCount }}
-  {{- end }}
-  {{- if .Values.indexCoord.updateStrategy }}
-  strategy: {{- toYaml .Values.indexCoord.updateStrategy | nindent 4 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-coordinator
-  template:
-    metadata:
-      annotations:
-        checksum/common-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/common-config-extra: {{ include (print $.Template.BasePath "/extra-configmap.yaml") . | sha256sum }}
-        checksum/config-extra: {{ include (print $.Template.BasePath "/index-coordinator/extra-configmap.yaml") . | sha256sum }}
-        {{- if .Values.indexCoord.podAnnotations }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.podAnnotations "context" $) | nindent 8 }}
-        {{- end }}
-      labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
-        app.kubernetes.io/part-of: milvus
-        app.kubernetes.io/component: index-coordinator
-    spec:
-      enableServiceLinks: {{ .Values.enableServiceLinks }}
-      serviceAccountName: {{ template "milvus.index-coordinator.serviceAccountName" . }}
-      {{- include "milvus.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.indexCoord.automountServiceAccountToken }}
-      {{- if .Values.indexCoord.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.hostAliases "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.indexCoord.affinity }}
-      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.indexCoord.affinity "context" $) | nindent 8 }}
-      {{- else }}
-      affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.indexCoord.podAffinityPreset "component" "index-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.indexCoord.podAntiAffinityPreset "component" "index-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.indexCoord.nodeAffinityPreset.type "key" .Values.indexCoord.nodeAffinityPreset.key "values" .Values.indexCoord.nodeAffinityPreset.values) | nindent 10 }}
-      {{- end }}
-      {{- if .Values.indexCoord.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.indexCoord.nodeSelector "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.indexCoord.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.tolerations "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.indexCoord.runtimeClassName }}
-      runtimeClassName: {{ .Values.indexCoord.runtimeClassName | quote }}
-      {{- end }}
-      {{- if .Values.indexCoord.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.topologySpreadConstraints "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.indexCoord.priorityClassName }}
-      priorityClassName: {{ .Values.indexCoord.priorityClassName | quote }}
-      {{- end }}
-      {{- if .Values.indexCoord.schedulerName }}
-      schedulerName: {{ .Values.indexCoord.schedulerName }}
-      {{- end }}
-      {{- if .Values.indexCoord.podSecurityContext.enabled }}
-      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.indexCoord.podSecurityContext "context" $) | nindent 8 }}
-      {{- end }}
-      initContainers:
-        {{- if .Values.indexCoord.enableDefaultInitContainers }}
-        {{- include "milvus.waitForETCDInitContainer" . | nindent 8 }}
-        {{- include "milvus.waitForKafkaInitContainer" . | nindent 8 }}
-        {{- include "milvus.waitForS3InitContainer" . | nindent 8 }}
-        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "indexCoord" "context" $) | nindent 8 }}
-        {{- end }}
-        {{- if .Values.indexCoord.initContainers }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.initContainers "context" $) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: milvus
-          image: {{ template "milvus.image" . }}
-          imagePullPolicy: {{ .Values.milvus.image.pullPolicy }}
-          {{- if .Values.indexCoord.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.indexCoord.containerSecurityContext "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.indexCoord.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.command "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.indexCoord.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.args "context" $) | nindent 12 }}
-          {{- else }}
-          args:
-            - run
-            - indexcoord
-          {{- end }}
-          env:
-            - name: METRICS_PORT
-              value: {{ .Values.indexCoord.containerPorts.metrics | quote }}
-            {{- if .Values.indexCoord.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          envFrom:
-            {{- if .Values.indexCoord.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.indexCoord.extraEnvVarsCM "context" $) }}
-            {{- end }}
-            {{- if .Values.indexCoord.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.indexCoord.extraEnvVarsSecret "context" $) }}
-            {{- end }}
-          ports:
-            - containerPort: {{ .Values.indexCoord.containerPorts.grpc }}
-              name: grpc
-            - containerPort: {{ .Values.indexCoord.containerPorts.metrics }}
-              name: http-metrics
-          {{- if .Values.indexCoord.resources }}
-          resources: {{- toYaml .Values.indexCoord.resources | nindent 12 }}
-          {{- else if ne .Values.indexCoord.resourcesPreset "none" }}
-          resources: {{- include "common.resources.preset" (dict "type" .Values.indexCoord.resourcesPreset) | nindent 12 }}
-          {{- end }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.indexCoord.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.indexCoord.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.indexCoord.livenessProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.indexCoord.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.indexCoord.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.indexCoord.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /healthz
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.indexCoord.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.indexCoord.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.indexCoord.startupProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- end }}
-          {{- if .Values.indexCoord.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            - name: empty-dir
-              mountPath: /opt/bitnami/milvus/configs
-              subPath: app-rendered-conf-dir
-            - name: empty-dir
-              mountPath: /tmp
-              subPath: tmp-dir
-            - name: empty-dir
-              mountPath: /opt/bitnami/milvus/tmp
-              subPath: app-tmp-dir
-              # We are using a s3 backend, so this data dir is temporary
-            - name: empty-dir
-              mountPath: /bitnami/milvus/data
-              subPath: app-data-dir
-            {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
-            - name: etcd-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/etcd/client
-              readOnly: true
-            {{- end }}
-            {{- if and (not .Values.kafka.enabled) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.existingSecret }}
-            - name: kafka-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/kafka/client
-              readOnly: true
-            {{- end }}
-            {{- if and (not .Values.minio.enabled) .Values.externalS3.tls.enabled .Values.externalS3.tls.existingSecret }}
-            - name: minio-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/minio/client
-              readOnly: true
-            {{- end }}
-          {{- if .Values.indexCoord.extraVolumeMounts }}
-          {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.extraVolumeMounts "context" $) | nindent 12 }}
-          {{- end }}
-        {{- if .Values.indexCoord.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.indexCoord.sidecars "context" $) | nindent 8 }}
-        {{- end }}
-      volumes:
-        - name: empty-dir
-          emptyDir: {}
-        - name: config-common
-          configMap:
-            name: {{ template "milvus.configmapName" . }}
-        {{- if and .Values.usePasswordFiles (or (include "milvus.s3.deployed" .) (and (include "milvus.kafka.deployed" .) (or (include "milvus.kafka.authEnabled" .) (and .Values.externalKafka.tls.enabled .Values.externalKafka.tls.keyPassword .Values.externalKafka.tls.existingSecret)))) }}
-        - name: milvus-secrets
-          projected:
-            sources:
-              {{- if and (include "milvus.kafka.deployed" .) (include "milvus.kafka.authEnabled" .)}}
-              - secret:
-                  name: {{ include "milvus.kafka.secretName" . }}
-              {{- end }}
-              {{- if and (include "milvus.kafka.deployed" .) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.keyPassword .Values.externalKafka.tls.existingSecret }}
-              - secret:
-                  name: {{ printf "%s-external-kafka-tls-passwords" (include "common.names.fullname" .) }}
-              {{- end }}
-              {{- if (include "milvus.s3.deployed" .) }}
-              - secret:
-                  name: {{ include "milvus.s3.secretName" . }}
-              {{- end }}
-        {{- end }}
-        {{- if or .Values.milvus.extraConfig .Values.milvus.extraConfigExistingConfigMap }}
-        - name: extra-config-common
-          configMap:
-            name: {{ template "milvus.extraConfigmapName" . }}
-        {{- end }}
-        - name: component-config-default
-          configMap:
-            name: {{ template "milvus.index-coordinator.configmapName" . }}
-        {{- if or .Values.indexCoord.extraConfig .Values.indexCoord.extraConfigExistingConfigMap }}
-        - name: component-extra-config
-          configMap:
-            name: {{ template "milvus.index-coordinator.extraConfigmapName" . }}
-        {{- end }}
-        {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
-        - name: etcd-client-certs
-          secret:
-            secretName: {{ .Values.externalEtcd.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if and (not .Values.kafka.enabled) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.existingSecret }}
-        - name: kafka-client-certs
-          secret:
-            secretName: {{ .Values.externalKafka.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if and (not .Values.minio.enabled) .Values.externalS3.tls.enabled .Values.externalS3.tls.existingSecret }}
-        - name: minio-client-certs
-          secret:
-            secretName: {{ .Values.externalS3.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if .Values.indexCoord.extraVolumes }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.extraVolumes "context" $) | nindent 8 }}
-        {{- end }}
-{{- end }}

+ 0 - 21
bitnami/milvus/templates/index-coordinator/extra-configmap.yaml

@@ -1,21 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.indexCoord.extraConfig (not .Values.indexCoord.extraConfigExistingConfigMap) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-extra" (include "milvus.index-coordinator.fullname" .) }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  04_index_coordinator_extra.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.extraConfig "context" $) | nindent 4 }}
-{{- end }}

+ 0 - 119
bitnami/milvus/templates/index-coordinator/networkpolicy.yaml

@@ -1,119 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.indexCoord.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  podSelector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-coordinator
-  policyTypes:
-    - Ingress
-    - Egress
-  {{- if .Values.indexCoord.networkPolicy.allowExternalEgress }}
-  egress:
-    - {}
-  {{- else }}
-  egress:
-    # Allow dns resolution
-    - ports:
-        - port: 53
-          protocol: UDP
-        - port: 53
-          protocol: TCP
-    # Allow outbound connections to other cluster pods
-    - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
-        - port: {{ .Values.queryNode.containerPorts.grpc }}
-        - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
-        - port: {{ .Values.proxy.containerPorts.grpc }}
-        - port: {{ .Values.proxy.containerPorts.grpcInternal }}
-      to:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 14 }}
-    # Allow outbound connections to S3
-    - ports:
-        - port: {{ include "milvus.s3.port" . }}
-      {{- if .Values.minio.enabled }}
-        - port: {{ .Values.minio.containerPorts.api }}
-      to: 
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: minio
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    # Allow outbound connections to etcd
-    - ports:
-        - port: {{ include "milvus.etcd.port" . }}
-      to: 
-        {{- if .Values.etcd.enabled }}
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: etcd
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    # Allow outbound connections to kafka
-    - ports:
-        - port: {{ include "milvus.kafka.port" . }}
-      to: 
-        {{- if .Values.kafka.enabled }}
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: kafka
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    {{- if .Values.indexCoord.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.indexCoord.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-  ingress:
-    - ports:
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        {{- if .Values.indexCoord.metrics.enabled }}
-        - port: {{ .Values.indexCoord.containerPorts.metrics }}
-        {{- end }}
-      {{- if not .Values.indexCoord.networkPolicy.allowExternal }}
-      from:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 14 }}
-              app.kubernetes.io/part-of: milvus
-        - podSelector:
-            matchLabels:
-              {{ template "common.names.fullname" . }}-client: "true"
-        {{- if .Values.indexCoord.networkPolicy.ingressNSMatchLabels }}
-        - namespaceSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.indexCoord.networkPolicy.ingressNSMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- if .Values.indexCoord.networkPolicy.ingressNSPodMatchLabels }}
-          podSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.indexCoord.networkPolicy.ingressNSPodMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- end }}
-        {{- end }}
-      {{- end }}
-    {{- if .Values.indexCoord.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.indexCoord.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
-    {{- end }}
-{{- end }}

+ 0 - 73
bitnami/milvus/templates/index-coordinator/service.yaml

@@ -1,73 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.indexCoord.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if or .Values.commonAnnotations .Values.indexCoord.service.annotations (and .Values.indexCoord.metrics.enabled .Values.indexCoord.metrics.annotations) }}
-  annotations:
-    {{- if or .Values.indexCoord.service.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.service.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    {{- if and .Values.indexCoord.metrics.enabled .Values.indexCoord.metrics.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.indexCoord.metrics.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-spec:
-  type: {{ .Values.indexCoord.service.type }}
-  {{- if .Values.indexCoord.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.indexCoord.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.indexCoord.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.indexCoord.service.clusterIP }}
-  clusterIP: {{ .Values.indexCoord.service.clusterIP }}
-  {{- end }}
-  {{- if (or (eq .Values.indexCoord.service.type "LoadBalancer") (eq .Values.indexCoord.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.indexCoord.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{ if eq .Values.indexCoord.service.type "LoadBalancer" }}
-  loadBalancerSourceRanges: {{ .Values.indexCoord.service.loadBalancerSourceRanges }}
-  {{ end }}
-  {{- if (and (eq .Values.indexCoord.service.type "LoadBalancer") (not (empty .Values.indexCoord.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.indexCoord.service.loadBalancerIP }}
-  {{- end }}
-  ports:
-    - name: grpc
-      port: {{ .Values.indexCoord.service.ports.grpc }}
-      targetPort: grpc
-      protocol: TCP
-      {{- if (and (or (eq .Values.indexCoord.service.type "NodePort") (eq .Values.indexCoord.service.type "LoadBalancer")) (not (empty .Values.indexCoord.service.nodePorts.grpc))) }}
-      nodePort: {{ .Values.indexCoord.service.nodePorts.grpc }}
-      {{- else if eq .Values.indexCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.indexCoord.metrics.enabled }}
-    - name: http-metrics
-      port: {{ .Values.indexCoord.service.ports.metrics }}
-      targetPort: http-metrics
-      protocol: TCP
-      {{- if (and (or (eq .Values.indexCoord.service.type "NodePort") (eq .Values.indexCoord.service.type "LoadBalancer")) (not (empty .Values.indexCoord.service.nodePorts.metrics))) }}
-      nodePort: {{ .Values.indexCoord.service.nodePorts.metrics }}
-      {{- else if eq .Values.indexCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.indexCoord.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-{{- end }}

+ 0 - 51
bitnami/milvus/templates/index-coordinator/servicemonitor.yaml

@@ -1,51 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.indexCoord.enabled .Values.indexCoord.metrics.enabled .Values.indexCoord.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
-  namespace: {{ default (include "common.names.namespace" .) .Values.indexCoord.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if or .Values.commonAnnotations .Values.indexCoord.metrics.serviceMonitor.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.indexCoord.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.indexCoord.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
-      {{- if .Values.indexCoord.metrics.serviceMonitor.selector }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.indexCoord.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
-      {{- end }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-coordinator
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.indexCoord.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.indexCoord.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.indexCoord.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.indexCoord.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.indexCoord.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.indexCoord.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-      {{- if .Values.indexCoord.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- toYaml .Values.indexCoord.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
-      {{- end }}
-      {{- if .Values.indexCoord.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- toYaml .Values.indexCoord.metrics.serviceMonitor.relabelings | nindent 6 }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ include "common.names.namespace" . | quote }}
-{{- end }}

+ 0 - 43
bitnami/milvus/templates/index-node/hpa.yaml

@@ -1,43 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.indexNode.autoscaling.hpa.enabled }}
-apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
-  {{- if or .Values.commonAnnotations .Values.indexNode.autoscaling.hpa.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  scaleTargetRef:
-    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: Deployment
-    name: {{ template "milvus.index-node.fullname" . }}
-  minReplicas: {{ .Values.indexNode.autoscaling.hpa.minReplicas }}
-  maxReplicas: {{ .Values.indexNode.autoscaling.hpa.maxReplicas }}
-  metrics:
-    {{- if .Values.indexNode.autoscaling.hpa.targetCPU }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.indexNode.autoscaling.hpa.targetCPU }}
-    {{- end }}
-    {{- if .Values.indexNode.autoscaling.hpa.targetMemory }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.indexNode.autoscaling.hpa.targetMemory }}
-    {{- end }}
-{{- end }}

+ 0 - 30
bitnami/milvus/templates/index-node/pdb.yaml

@@ -1,30 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.indexNode.enabled .Values.indexNode.pdb.create }}
-apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
-kind: PodDisruptionBudget
-metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.indexNode.pdb.minAvailable }}
-  minAvailable: {{ .Values.indexNode.pdb.minAvailable }}
-  {{- end }}
-  {{- if or .Values.indexNode.pdb.maxUnavailable (not .Values.indexNode.pdb.minAvailable) }}
-  maxUnavailable: {{ .Values.indexNode.pdb.maxUnavailable | default 1 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-node
-{{- end }}

+ 0 - 73
bitnami/milvus/templates/index-node/service.yaml

@@ -1,73 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.indexNode.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
- {{- if or .Values.commonAnnotations .Values.indexNode.service.annotations (and .Values.indexNode.metrics.enabled .Values.indexNode.metrics.annotations) }}
-  annotations:
-    {{- if or .Values.indexNode.service.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.service.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    {{- if and .Values.indexNode.metrics.enabled .Values.indexNode.metrics.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.indexNode.metrics.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-spec:
-  type: {{ .Values.indexNode.service.type }}
-  {{- if .Values.indexNode.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.indexNode.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.indexNode.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.indexNode.service.clusterIP }}
-  clusterIP: {{ .Values.indexNode.service.clusterIP }}
-  {{- end }}
-  {{- if (or (eq .Values.indexNode.service.type "LoadBalancer") (eq .Values.indexNode.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.indexNode.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{ if eq .Values.indexNode.service.type "LoadBalancer" }}
-  loadBalancerSourceRanges: {{ .Values.indexNode.service.loadBalancerSourceRanges }}
-  {{ end }}
-  {{- if (and (eq .Values.indexNode.service.type "LoadBalancer") (not (empty .Values.indexNode.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.indexNode.service.loadBalancerIP }}
-  {{- end }}
-  ports:
-    - name: grpc
-      port: {{ .Values.indexNode.service.ports.grpc }}
-      targetPort: grpc
-      protocol: TCP
-      {{- if (and (or (eq .Values.indexNode.service.type "NodePort") (eq .Values.indexNode.service.type "LoadBalancer")) (not (empty .Values.indexNode.service.nodePorts.grpc))) }}
-      nodePort: {{ .Values.indexNode.service.nodePorts.grpc }}
-      {{- else if eq .Values.indexNode.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.indexNode.metrics.enabled }}
-    - name: http-metrics
-      port: {{ .Values.indexNode.service.ports.metrics }}
-      targetPort: http-metrics
-      protocol: TCP
-      {{- if (and (or (eq .Values.indexNode.service.type "NodePort") (eq .Values.indexNode.service.type "LoadBalancer")) (not (empty .Values.indexNode.service.nodePorts.metrics))) }}
-      nodePort: {{ .Values.indexNode.service.nodePorts.metrics }}
-      {{- else if eq .Values.indexNode.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.indexNode.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
-{{- end }}

+ 0 - 51
bitnami/milvus/templates/index-node/servicemonitor.yaml

@@ -1,51 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.indexNode.enabled .Values.indexNode.metrics.enabled .Values.indexNode.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
-  namespace: {{ default (include "common.names.namespace" .) .Values.indexNode.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
-  {{- if or .Values.commonAnnotations .Values.indexNode.metrics.serviceMonitor.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.indexNode.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.indexNode.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
-      {{- if .Values.indexNode.metrics.serviceMonitor.selector }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
-      {{- end }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-node
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.indexNode.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.indexNode.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.indexNode.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.indexNode.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.indexNode.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.indexNode.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-      {{- if .Values.indexNode.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- toYaml .Values.indexNode.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
-      {{- end }}
-      {{- if .Values.indexNode.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- toYaml .Values.indexNode.metrics.serviceMonitor.relabelings | nindent 6 }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ include "common.names.namespace" . | quote }}
-{{- end }}

+ 4 - 8
bitnami/milvus/templates/proxy/networkpolicy.yaml

@@ -37,13 +37,9 @@ spec:
           protocol: TCP
     # Allow outbound connections to other cluster pods
     - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
         - port: {{ .Values.queryNode.containerPorts.grpc }}
         - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
+        - port: {{ .Values.streamingNode.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpcInternal }}
       to:
@@ -54,7 +50,7 @@ spec:
         - port: {{ include "milvus.s3.port" . }}
       {{- if .Values.minio.enabled }}
         - port: {{ .Values.minio.containerPorts.api }}
-      to: 
+      to:
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: minio
@@ -63,7 +59,7 @@ spec:
     # Allow outbound connections to etcd
     - ports:
         - port: {{ include "milvus.etcd.port" . }}
-      to: 
+      to:
         {{- if .Values.etcd.enabled }}
         - podSelector:
             matchLabels:
@@ -73,7 +69,7 @@ spec:
     # Allow outbound connections to kafka
     - ports:
         - port: {{ include "milvus.kafka.port" . }}
-      to: 
+      to:
         {{- if .Values.kafka.enabled }}
         - podSelector:
             matchLabels:

+ 0 - 20
bitnami/milvus/templates/query-coordinator/configmap.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if not .Values.queryCoord.existingConfigMap }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  03_query_coordinator_default.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.defaultConfig "context" $) | nindent 4 }}
-{{- end }}

+ 0 - 254
bitnami/milvus/templates/query-coordinator/deployment.yaml

@@ -1,254 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.queryCoord.enabled }}
-apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-kind: Deployment
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if not .Values.queryCoord.autoscaling.hpa.enabled }}
-  replicas: {{ .Values.queryCoord.replicaCount }}
-  {{- end }}
-  {{- if .Values.queryCoord.updateStrategy }}
-  strategy: {{- toYaml .Values.queryCoord.updateStrategy | nindent 4 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: query-coordinator
-  template:
-    metadata:
-      annotations:
-        checksum/common-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/common-config-extra: {{ include (print $.Template.BasePath "/extra-configmap.yaml") . | sha256sum }}
-        checksum/config-extra: {{ include (print $.Template.BasePath "/query-coordinator/extra-configmap.yaml") . | sha256sum }}
-        {{- if .Values.queryCoord.podAnnotations }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.podAnnotations "context" $) | nindent 8 }}
-        {{- end }}
-      labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
-        app.kubernetes.io/part-of: milvus
-        app.kubernetes.io/component: query-coordinator
-    spec:
-      enableServiceLinks: {{ .Values.enableServiceLinks }}
-      serviceAccountName: {{ template "milvus.query-coordinator.serviceAccountName" . }}
-      {{- include "milvus.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.queryCoord.automountServiceAccountToken }}
-      {{- if .Values.queryCoord.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.hostAliases "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.queryCoord.affinity }}
-      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.queryCoord.affinity "context" $) | nindent 8 }}
-      {{- else }}
-      affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.queryCoord.podAffinityPreset "component" "query-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.queryCoord.podAntiAffinityPreset "component" "query-coordinator" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.queryCoord.nodeAffinityPreset.type "key" .Values.queryCoord.nodeAffinityPreset.key "values" .Values.queryCoord.nodeAffinityPreset.values) | nindent 10 }}
-      {{- end }}
-      {{- if .Values.queryCoord.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.queryCoord.nodeSelector "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.queryCoord.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.tolerations "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.queryCoord.runtimeClassName }}
-      runtimeClassName: {{ .Values.queryCoord.runtimeClassName | quote }}
-      {{- end }}
-      {{- if .Values.queryCoord.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.topologySpreadConstraints "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.queryCoord.priorityClassName }}
-      priorityClassName: {{ .Values.queryCoord.priorityClassName | quote }}
-      {{- end }}
-      {{- if .Values.queryCoord.schedulerName }}
-      schedulerName: {{ .Values.queryCoord.schedulerName }}
-      {{- end }}
-      {{- if .Values.queryCoord.podSecurityContext.enabled }}
-      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.queryCoord.podSecurityContext "context" $) | nindent 8 }}
-      {{- end }}
-      initContainers:
-        {{- if .Values.queryCoord.enableDefaultInitContainers }}
-        {{- include "milvus.waitForETCDInitContainer" . | nindent 8 }}
-        {{- include "milvus.waitForKafkaInitContainer" . | nindent 8 }}
-        {{- include "milvus.waitForS3InitContainer" . | nindent 8 }}
-        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "queryCoord" "context" $) | nindent 8 }}
-        {{- end }}
-        {{- if .Values.queryCoord.initContainers }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.initContainers "context" $) | nindent 8 }}
-        {{- end }}
-      containers:
-        - name: milvus
-          image: {{ template "milvus.image" . }}
-          imagePullPolicy: {{ .Values.milvus.image.pullPolicy }}
-          {{- if .Values.queryCoord.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.queryCoord.containerSecurityContext "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.queryCoord.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.command "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.queryCoord.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.args "context" $) | nindent 12 }}
-          {{- else }}
-          args:
-            - run
-            - querycoord
-          {{- end }}
-          env:
-            - name: METRICS_PORT
-              value: {{ .Values.queryCoord.containerPorts.metrics | quote }}
-            {{- if .Values.queryCoord.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          envFrom:
-            {{- if .Values.queryCoord.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.queryCoord.extraEnvVarsCM "context" $) }}
-            {{- end }}
-            {{- if .Values.queryCoord.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.queryCoord.extraEnvVarsSecret "context" $) }}
-            {{- end }}
-          ports:
-            - containerPort: {{ .Values.queryCoord.containerPorts.grpc }}
-              name: grpc
-            - containerPort: {{ .Values.queryCoord.containerPorts.metrics }}
-              name: http-metrics
-          {{- if .Values.queryCoord.resources }}
-          resources: {{- toYaml .Values.queryCoord.resources | nindent 12 }}
-          {{- else if ne .Values.queryCoord.resourcesPreset "none" }}
-          resources: {{- include "common.resources.preset" (dict "type" .Values.queryCoord.resourcesPreset) | nindent 12 }}
-          {{- end }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.queryCoord.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.queryCoord.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryCoord.livenessProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.queryCoord.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.queryCoord.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryCoord.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /healthz
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.queryCoord.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.queryCoord.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.queryCoord.startupProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- end }}
-          {{- if .Values.queryCoord.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            - name: empty-dir
-              mountPath: /opt/bitnami/milvus/configs
-              subPath: app-rendered-conf-dir
-            - name: empty-dir
-              mountPath: /tmp
-              subPath: tmp-dir
-            - name: empty-dir
-              mountPath: /opt/bitnami/milvus/tmp
-              subPath: app-tmp-dir
-              # We are using a s3 backend, so this data dir is temporary
-            - name: empty-dir
-              mountPath: /bitnami/milvus/data
-              subPath: app-data-dir
-            {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
-            - name: etcd-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/etcd/client
-              readOnly: true
-            {{- end }}
-            {{- if and (not .Values.kafka.enabled) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.existingSecret }}
-            - name: kafka-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/kafka/client
-              readOnly: true
-            {{- end }}
-            {{- if and (not .Values.minio.enabled) .Values.externalS3.tls.enabled .Values.externalS3.tls.existingSecret }}
-            - name: minio-client-certs
-              mountPath: /opt/bitnami/milvus/configs/cert/minio/client
-              readOnly: true
-            {{- end }}
-          {{- if .Values.queryCoord.extraVolumeMounts }}
-          {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.extraVolumeMounts "context" $) | nindent 12 }}
-          {{- end }}
-        {{- if .Values.queryCoord.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.queryCoord.sidecars "context" $) | nindent 8 }}
-        {{- end }}
-      volumes:
-        - name: empty-dir
-          emptyDir: {}
-        - name: config-common
-          configMap:
-            name: {{ template "milvus.configmapName" . }}
-        {{- if and .Values.usePasswordFiles (or (include "milvus.s3.deployed" .) (and (include "milvus.kafka.deployed" .) (or (include "milvus.kafka.authEnabled" .) (and .Values.externalKafka.tls.enabled .Values.externalKafka.tls.keyPassword .Values.externalKafka.tls.existingSecret)))) }}
-        - name: milvus-secrets
-          projected:
-            sources:
-              {{- if and (include "milvus.kafka.deployed" .) (include "milvus.kafka.authEnabled" .)}}
-              - secret:
-                  name: {{ include "milvus.kafka.secretName" . }}
-              {{- end }}
-              {{- if and (include "milvus.kafka.deployed" .) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.keyPassword .Values.externalKafka.tls.existingSecret }}
-              - secret:
-                  name: {{ printf "%s-external-kafka-tls-passwords" (include "common.names.fullname" .) }}
-              {{- end }}
-              {{- if (include "milvus.s3.deployed" .) }}
-              - secret:
-                  name: {{ include "milvus.s3.secretName" . }}
-              {{- end }}
-        {{- end }}
-        {{- if or .Values.milvus.extraConfig .Values.milvus.extraConfigExistingConfigMap }}
-        - name: extra-config-common
-          configMap:
-            name: {{ template "milvus.extraConfigmapName" . }}
-        {{- end }}
-        - name: component-config-default
-          configMap:
-            name: {{ template "milvus.query-coordinator.configmapName" . }}
-        {{- if or .Values.queryCoord.extraConfig .Values.queryCoord.extraConfigExistingConfigMap }}
-        - name: component-extra-config
-          configMap:
-            name: {{ template "milvus.query-coordinator.extraConfigmapName" . }}
-        {{- end }}
-        {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
-        - name: etcd-client-certs
-          secret:
-            secretName: {{ .Values.externalEtcd.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if and (not .Values.kafka.enabled) .Values.externalKafka.tls.enabled .Values.externalKafka.tls.existingSecret }}
-        - name: kafka-client-certs
-          secret:
-            secretName: {{ .Values.externalKafka.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if and (not .Values.minio.enabled) .Values.externalS3.tls.enabled .Values.externalS3.tls.existingSecret }}
-        - name: minio-client-certs
-          secret:
-            secretName: {{ .Values.externalS3.tls.existingSecret }}
-            defaultMode: 256
-        {{- end }}
-        {{- if .Values.queryCoord.extraVolumes }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.extraVolumes "context" $) | nindent 8 }}
-        {{- end }}
-{{- end }}

+ 0 - 43
bitnami/milvus/templates/query-coordinator/hpa.yaml

@@ -1,43 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.queryCoord.autoscaling.hpa.enabled }}
-apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if or .Values.commonAnnotations .Values.queryCoord.autoscaling.hpa.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  scaleTargetRef:
-    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: Deployment
-    name: {{ template "milvus.query-coordinator.fullname" . }}
-  minReplicas: {{ .Values.queryCoord.autoscaling.hpa.minReplicas }}
-  maxReplicas: {{ .Values.queryCoord.autoscaling.hpa.maxReplicas }}
-  metrics:
-    {{- if .Values.queryCoord.autoscaling.hpa.targetCPU }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.queryCoord.autoscaling.hpa.targetCPU }}
-    {{- end }}
-    {{- if .Values.queryCoord.autoscaling.hpa.targetMemory }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.queryCoord.autoscaling.hpa.targetMemory }}
-    {{- end }}
-{{- end }}

+ 0 - 116
bitnami/milvus/templates/query-coordinator/networkpolicy.yaml

@@ -1,116 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.queryCoord.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  podSelector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: query-coordinator
-  policyTypes:
-    - Ingress
-    - Egress
-  {{- if .Values.queryCoord.networkPolicy.allowExternalEgress }}
-  egress:
-    - {}
-  {{- else }}
-  egress:
-    # Allow dns resolution
-    - ports:
-        - port: 53
-          protocol: UDP
-        - port: 53
-          protocol: TCP
-    # Allow outbound connections to other cluster pods
-    - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
-        - port: {{ .Values.queryNode.containerPorts.grpc }}
-        - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
-        - port: {{ .Values.proxy.containerPorts.grpc }}
-        - port: {{ .Values.proxy.containerPorts.grpcInternal }}
-      to:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 14 }}
-    # Allow outbound connections to S3
-    - ports:
-        - port: {{ include "milvus.s3.port" . }}
-      {{- if .Values.minio.enabled }}
-        - port: {{ .Values.minio.containerPorts.api }}
-      to: 
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: minio
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    # Allow outbound connections to etcd
-    - ports:
-        - port: {{ include "milvus.etcd.port" . }}
-      to: 
-        {{- if .Values.etcd.enabled }}
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: etcd
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    # Allow outbound connections to kafka
-    - ports:
-        - port: {{ include "milvus.kafka.port" . }}
-      to: 
-        {{- if .Values.kafka.enabled }}
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/name: kafka
-              app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- end }}
-    {{- if .Values.queryCoord.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.queryCoord.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-  ingress:
-    - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        {{- if .Values.queryCoord.metrics.enabled }}
-        - port: {{ .Values.queryCoord.containerPorts.metrics }}
-        {{- end }}
-      {{- if not .Values.queryCoord.networkPolicy.allowExternal }}
-      from:
-        - podSelector:
-            matchLabels:
-              {{ template "common.names.fullname" . }}-client: "true"
-        {{- if .Values.queryCoord.networkPolicy.ingressNSMatchLabels }}
-        - namespaceSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.queryCoord.networkPolicy.ingressNSMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- if .Values.queryCoord.networkPolicy.ingressNSPodMatchLabels }}
-          podSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.queryCoord.networkPolicy.ingressNSPodMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- end }}
-        {{- end }}
-      {{- end }}
-    {{- if .Values.queryCoord.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.queryCoord.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
-    {{- end }}
-{{- end }}

+ 0 - 30
bitnami/milvus/templates/query-coordinator/pdb.yaml

@@ -1,30 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.queryCoord.enabled .Values.queryCoord.pdb.create }}
-apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
-kind: PodDisruptionBudget
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.queryCoord.pdb.minAvailable }}
-  minAvailable: {{ .Values.queryCoord.pdb.minAvailable }}
-  {{- end }}
-  {{- if or .Values.queryCoord.pdb.maxUnavailable (not .Values.queryCoord.pdb.minAvailable) }}
-  maxUnavailable: {{ .Values.queryCoord.pdb.maxUnavailable | default 1 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: query-coordinator
-{{- end }}

+ 0 - 20
bitnami/milvus/templates/query-coordinator/service-account.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.queryCoord.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "milvus.query-coordinator.serviceAccountName" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if or .Values.queryCoord.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.queryCoord.serviceAccount.automountServiceAccountToken }}
-{{- end }}

+ 0 - 73
bitnami/milvus/templates/query-coordinator/service.yaml

@@ -1,73 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.queryCoord.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if or .Values.commonAnnotations .Values.queryCoord.service.annotations (and .Values.queryCoord.metrics.enabled .Values.queryCoord.metrics.annotations) }}
-  annotations:
-    {{- if or .Values.queryCoord.service.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.service.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    {{- if and .Values.queryCoord.metrics.enabled .Values.queryCoord.metrics.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.queryCoord.metrics.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-spec:
-  type: {{ .Values.queryCoord.service.type }}
-  {{- if .Values.queryCoord.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.queryCoord.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.queryCoord.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.queryCoord.service.clusterIP }}
-  clusterIP: {{ .Values.queryCoord.service.clusterIP }}
-  {{- end }}
-  {{- if (or (eq .Values.queryCoord.service.type "LoadBalancer") (eq .Values.queryCoord.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.queryCoord.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{ if eq .Values.queryCoord.service.type "LoadBalancer" }}
-  loadBalancerSourceRanges: {{ .Values.queryCoord.service.loadBalancerSourceRanges }}
-  {{ end }}
-  {{- if (and (eq .Values.queryCoord.service.type "LoadBalancer") (not (empty .Values.queryCoord.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.queryCoord.service.loadBalancerIP }}
-  {{- end }}
-  ports:
-    - name: grpc
-      port: {{ .Values.queryCoord.service.ports.grpc }}
-      targetPort: grpc
-      protocol: TCP
-      {{- if (and (or (eq .Values.queryCoord.service.type "NodePort") (eq .Values.queryCoord.service.type "LoadBalancer")) (not (empty .Values.queryCoord.service.nodePorts.grpc))) }}
-      nodePort: {{ .Values.queryCoord.service.nodePorts.grpc }}
-      {{- else if eq .Values.queryCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.queryCoord.metrics.enabled }}
-    - name: http-metrics
-      port: {{ .Values.queryCoord.service.ports.metrics }}
-      targetPort: http-metrics
-      protocol: TCP
-      {{- if (and (or (eq .Values.queryCoord.service.type "NodePort") (eq .Values.queryCoord.service.type "LoadBalancer")) (not (empty .Values.queryCoord.service.nodePorts.metrics))) }}
-      nodePort: {{ .Values.queryCoord.service.nodePorts.metrics }}
-      {{- else if eq .Values.queryCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.queryCoord.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-{{- end }}

+ 0 - 51
bitnami/milvus/templates/query-coordinator/servicemonitor.yaml

@@ -1,51 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.queryCoord.enabled .Values.queryCoord.metrics.enabled .Values.queryCoord.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "milvus.query-coordinator.fullname" . }}
-  namespace: {{ default (include "common.names.namespace" .) .Values.queryCoord.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if or .Values.commonAnnotations .Values.queryCoord.metrics.serviceMonitor.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.queryCoord.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.queryCoord.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
-      {{- if .Values.queryCoord.metrics.serviceMonitor.selector }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
-      {{- end }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: query-coordinator
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.queryCoord.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.queryCoord.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.queryCoord.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.queryCoord.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.queryCoord.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.queryCoord.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-      {{- if .Values.queryCoord.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- toYaml .Values.queryCoord.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
-      {{- end }}
-      {{- if .Values.queryCoord.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- toYaml .Values.queryCoord.metrics.serviceMonitor.relabelings | nindent 6 }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ include "common.names.namespace" . | quote }}
-{{- end }}

+ 0 - 45
bitnami/milvus/templates/query-coordinator/vpa.yaml

@@ -1,45 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.queryCoord.autoscaling.vpa.enabled }}
-apiVersion: {{ include "common.capabilities.vpa.apiVersion" . }}
-kind: VerticalPodAutoscaler
-metadata:
-  name: {{ include "milvus.query-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
-  {{- if or .Values.queryCoord.autoscaling.vpa.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.queryCoord.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  resourcePolicy:
-    containerPolicies:
-    - containerName: milvus-query-coordinator
-      {{- with .Values.queryCoord.autoscaling.vpa.controlledResources }}
-      controlledResources:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.queryCoord.autoscaling.vpa.maxAllowed }}
-      maxAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.queryCoord.autoscaling.vpa.minAllowed }}
-      minAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-  targetRef:
-    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: Deployment
-    name: {{ include "milvus.query-coordinator.fullname" . }}
-  {{- if .Values.queryCoord.autoscaling.vpa.updatePolicy }}
-  updatePolicy:
-    {{- with .Values.queryCoord.autoscaling.vpa.updatePolicy.updateMode }}
-    updateMode: {{ . }}
-    {{- end }}
-  {{- end }}
-{{- end }}

+ 4 - 8
bitnami/milvus/templates/query-node/networkpolicy.yaml

@@ -37,13 +37,9 @@ spec:
           protocol: TCP
     # Allow outbound connections to other cluster pods
     - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
         - port: {{ .Values.queryNode.containerPorts.grpc }}
         - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
+        - port: {{ .Values.streamingNode.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpcInternal }}
       to:
@@ -54,7 +50,7 @@ spec:
         - port: {{ include "milvus.s3.port" . }}
       {{- if .Values.minio.enabled }}
         - port: {{ .Values.minio.containerPorts.api }}
-      to: 
+      to:
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: minio
@@ -63,7 +59,7 @@ spec:
     # Allow outbound connections to etcd
     - ports:
         - port: {{ include "milvus.etcd.port" . }}
-      to: 
+      to:
         {{- if .Values.etcd.enabled }}
         - podSelector:
             matchLabels:
@@ -73,7 +69,7 @@ spec:
     # Allow outbound connections to kafka
     - ports:
         - port: {{ include "milvus.kafka.port" . }}
-      to: 
+      to:
         {{- if .Values.kafka.enabled }}
         - podSelector:
             matchLabels:

+ 0 - 20
bitnami/milvus/templates/root-coordinator/configmap.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if not .Values.rootCoord.existingConfigMap }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  03_root_coordinator_default.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.defaultConfig "context" $) | nindent 4 }}
-{{- end }}

+ 0 - 21
bitnami/milvus/templates/root-coordinator/extra-configmap.yaml

@@ -1,21 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.rootCoord.extraConfig (not .Values.rootCoord.extraConfigExistingConfigMap) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-extra" (include "milvus.root-coordinator.fullname" .) }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  04_root_coordinator_extra.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.extraConfig "context" $) | nindent 4 }}
-{{- end }}

+ 0 - 20
bitnami/milvus/templates/root-coordinator/service-account.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.rootCoord.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "milvus.root-coordinator.serviceAccountName" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-  {{- if or .Values.rootCoord.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.rootCoord.serviceAccount.automountServiceAccountToken }}
-{{- end }}

+ 0 - 73
bitnami/milvus/templates/root-coordinator/service.yaml

@@ -1,73 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.rootCoord.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-  {{- if or .Values.commonAnnotations .Values.rootCoord.service.annotations (and .Values.rootCoord.metrics.enabled .Values.rootCoord.metrics.annotations) }}
-  annotations:
-    {{- if or .Values.rootCoord.service.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.service.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    {{- if and .Values.rootCoord.metrics.enabled .Values.rootCoord.metrics.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.rootCoord.metrics.annotations "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-spec:
-  type: {{ .Values.rootCoord.service.type }}
-  {{- if .Values.rootCoord.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.rootCoord.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.rootCoord.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.rootCoord.service.clusterIP }}
-  clusterIP: {{ .Values.rootCoord.service.clusterIP }}
-  {{- end }}
-  {{- if (or (eq .Values.rootCoord.service.type "LoadBalancer") (eq .Values.rootCoord.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.rootCoord.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{ if eq .Values.rootCoord.service.type "LoadBalancer" }}
-  loadBalancerSourceRanges: {{ .Values.rootCoord.service.loadBalancerSourceRanges }}
-  {{ end }}
-  {{- if (and (eq .Values.rootCoord.service.type "LoadBalancer") (not (empty .Values.rootCoord.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.rootCoord.service.loadBalancerIP }}
-  {{- end }}
-  ports:
-    - name: grpc
-      port: {{ .Values.rootCoord.service.ports.grpc }}
-      targetPort: grpc
-      protocol: TCP
-      {{- if (and (or (eq .Values.rootCoord.service.type "NodePort") (eq .Values.rootCoord.service.type "LoadBalancer")) (not (empty .Values.rootCoord.service.nodePorts.grpc))) }}
-      nodePort: {{ .Values.rootCoord.service.nodePorts.grpc }}
-      {{- else if eq .Values.rootCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.rootCoord.metrics.enabled }}
-    - name: http-metrics
-      port: {{ .Values.rootCoord.service.ports.metrics }}
-      targetPort: http-metrics
-      protocol: TCP
-      {{- if (and (or (eq .Values.rootCoord.service.type "NodePort") (eq .Values.rootCoord.service.type "LoadBalancer")) (not (empty .Values.rootCoord.service.nodePorts.metrics))) }}
-      nodePort: {{ .Values.rootCoord.service.nodePorts.metrics }}
-      {{- else if eq .Values.rootCoord.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.rootCoord.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-{{- end }}

+ 0 - 51
bitnami/milvus/templates/root-coordinator/servicemonitor.yaml

@@ -1,51 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.rootCoord.enabled .Values.rootCoord.metrics.enabled .Values.rootCoord.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "milvus.root-coordinator.fullname" . }}
-  namespace: {{ default (include "common.names.namespace" .) .Values.rootCoord.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-  {{- if or .Values.commonAnnotations .Values.rootCoord.metrics.serviceMonitor.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.rootCoord.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.rootCoord.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
-      {{- if .Values.rootCoord.metrics.serviceMonitor.selector }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.rootCoord.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
-      {{- end }}
-      app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: root-coordinator
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.rootCoord.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.rootCoord.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.rootCoord.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.rootCoord.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.rootCoord.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.rootCoord.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-      {{- if .Values.rootCoord.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- toYaml .Values.rootCoord.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
-      {{- end }}
-      {{- if .Values.rootCoord.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- toYaml .Values.rootCoord.metrics.serviceMonitor.relabelings | nindent 6 }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ include "common.names.namespace" . | quote }}
-{{- end }}

+ 0 - 45
bitnami/milvus/templates/root-coordinator/vpa.yaml

@@ -1,45 +0,0 @@
-{{- /*
-Copyright Broadcom, Inc. All Rights Reserved.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.rootCoord.autoscaling.vpa.enabled }}
-apiVersion: {{ include "common.capabilities.vpa.apiVersion" . }}
-kind: VerticalPodAutoscaler
-metadata:
-  name: {{ include "milvus.root-coordinator.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: root-coordinator
-  {{- if or .Values.rootCoord.autoscaling.vpa.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.rootCoord.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  resourcePolicy:
-    containerPolicies:
-    - containerName: milvus-root-coordinator
-      {{- with .Values.rootCoord.autoscaling.vpa.controlledResources }}
-      controlledResources:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.rootCoord.autoscaling.vpa.maxAllowed }}
-      maxAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.rootCoord.autoscaling.vpa.minAllowed }}
-      minAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-  targetRef:
-    apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: Deployment
-    name: {{ include "milvus.root-coordinator.fullname" . }}
-  {{- if .Values.rootCoord.autoscaling.vpa.updatePolicy }}
-  updatePolicy:
-    {{- with .Values.rootCoord.autoscaling.vpa.updatePolicy.updateMode }}
-    updateMode: {{ . }}
-    {{- end }}
-  {{- end }}
-{{- end }}

+ 4 - 4
bitnami/milvus/templates/data-coordinator/configmap.yaml → bitnami/milvus/templates/streaming-node/configmap.yaml

@@ -3,11 +3,11 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if not .Values.dataCoord.existingConfigMap }}
+{{- if and .Values.streamingNode.enabled (not .Values.streamingNode.existingConfigMap) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "milvus.data-coordinator.fullname" . }}
+  name: {{ template "milvus.streaming-node.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
@@ -15,6 +15,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  03_data_coordinator_default.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.dataCoord.defaultConfig "context" $) | nindent 4 }}
+  03_streaming_node_default.yaml: |
+    {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.defaultConfig "context" $) | nindent 4 }}
 {{- end }}

+ 83 - 83
bitnami/milvus/templates/index-node/deployment.yaml → bitnami/milvus/templates/streaming-node/deployment.yaml

@@ -3,161 +3,161 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.indexNode.enabled }}
+{{- if .Values.streamingNode.enabled }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
+  name: {{ template "milvus.streaming-node.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
+    app.kubernetes.io/component: streaming-node
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.indexNode.autoscaling.hpa.enabled }}
-  replicas: {{ .Values.indexNode.replicaCount }}
+  {{- if not .Values.streamingNode.autoscaling.hpa.enabled }}
+  replicas: {{ .Values.streamingNode.replicaCount }}
   {{- end }}
-  {{- if .Values.indexNode.updateStrategy }}
-  strategy: {{- toYaml .Values.indexNode.updateStrategy | nindent 4 }}
+  {{- if .Values.streamingNode.updateStrategy }}
+  strategy: {{- toYaml .Values.streamingNode.updateStrategy | nindent 4 }}
   {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.podLabels .Values.commonLabels ) "context" . ) }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-node
+      app.kubernetes.io/component: streaming-node
   template:
     metadata:
       annotations:
         checksum/common-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/common-config-extra: {{ include (print $.Template.BasePath "/extra-configmap.yaml") . | sha256sum }}
-        checksum/config-extra: {{ include (print $.Template.BasePath "/index-node/extra-configmap.yaml") . | sha256sum }}
-        {{- if .Values.indexNode.podAnnotations }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.podAnnotations "context" $) | nindent 8 }}
+        checksum/config-extra: {{ include (print $.Template.BasePath "/streaming-node/extra-configmap.yaml") . | sha256sum }}
+        {{- if .Values.streamingNode.podAnnotations }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
       labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
         app.kubernetes.io/part-of: milvus
-        app.kubernetes.io/component: index-node
+        app.kubernetes.io/component: streaming-node
     spec:
       enableServiceLinks: {{ .Values.enableServiceLinks }}
-      serviceAccountName: {{ template "milvus.index-node.serviceAccountName" . }}
+      serviceAccountName: {{ template "milvus.streaming-node.serviceAccountName" . }}
       {{- include "milvus.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.indexNode.automountServiceAccountToken }}
-      {{- if .Values.indexNode.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.hostAliases "context" $) | nindent 8 }}
+      automountServiceAccountToken: {{ .Values.streamingNode.automountServiceAccountToken }}
+      {{- if .Values.streamingNode.hostAliases }}
+      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.hostAliases "context" $) | nindent 8 }}
       {{- end }}
-      {{- if .Values.indexNode.affinity }}
-      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.indexNode.affinity "context" $) | nindent 8 }}
+      {{- if .Values.streamingNode.affinity }}
+      affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.streamingNode.affinity "context" $) | nindent 8 }}
       {{- else }}
       affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.indexNode.podAffinityPreset "component" "index-node" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.indexNode.podAntiAffinityPreset "component" "index-node" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.indexNode.nodeAffinityPreset.type "key" .Values.indexNode.nodeAffinityPreset.key "values" .Values.indexNode.nodeAffinityPreset.values) | nindent 10 }}
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.streamingNode.podAffinityPreset "component" "streaming-node" "customLabels" $podLabels "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.streamingNode.podAntiAffinityPreset "component" "streaming-node" "customLabels" $podLabels "context" $) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.streamingNode.nodeAffinityPreset.type "key" .Values.streamingNode.nodeAffinityPreset.key "values" .Values.streamingNode.nodeAffinityPreset.values) | nindent 10 }}
       {{- end }}
-      {{- if .Values.indexNode.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.indexNode.nodeSelector "context" $) | nindent 8 }}
+      {{- if .Values.streamingNode.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.streamingNode.nodeSelector "context" $) | nindent 8 }}
       {{- end }}
-      {{- if .Values.indexNode.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.tolerations "context" .) | nindent 8 }}
+      {{- if .Values.streamingNode.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.tolerations "context" .) | nindent 8 }}
       {{- end }}
-      {{- if .Values.indexNode.runtimeClassName }}
-      runtimeClassName: {{ .Values.indexNode.runtimeClassName | quote }}
+      {{- if .Values.streamingNode.runtimeClassName }}
+      runtimeClassName: {{ .Values.streamingNode.runtimeClassName | quote }}
       {{- end }}
-      {{- if .Values.indexNode.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.topologySpreadConstraints "context" .) | nindent 8 }}
+      {{- if .Values.streamingNode.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.topologySpreadConstraints "context" .) | nindent 8 }}
       {{- end }}
-      {{- if .Values.indexNode.priorityClassName }}
-      priorityClassName: {{ .Values.indexNode.priorityClassName | quote }}
+      {{- if .Values.streamingNode.priorityClassName }}
+      priorityClassName: {{ .Values.streamingNode.priorityClassName | quote }}
       {{- end }}
-      {{- if .Values.indexNode.schedulerName }}
-      schedulerName: {{ .Values.indexNode.schedulerName }}
+      {{- if .Values.streamingNode.schedulerName }}
+      schedulerName: {{ .Values.streamingNode.schedulerName }}
       {{- end }}
-      {{- if .Values.indexNode.podSecurityContext.enabled }}
-      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.indexNode.podSecurityContext "context" $) | nindent 8 }}
+      {{- if .Values.streamingNode.podSecurityContext.enabled }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.streamingNode.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       initContainers:
-        {{- if .Values.indexNode.enableDefaultInitContainers }}
+        {{- if .Values.streamingNode.enableDefaultInitContainers }}
         {{- include "milvus.waitForETCDInitContainer" . | nindent 8 }}
         {{- include "milvus.waitForKafkaInitContainer" . | nindent 8 }}
         {{- include "milvus.waitForS3InitContainer" . | nindent 8 }}
-        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "indexNode" "context" $) | nindent 8 }}
+        {{- include "milvus.prepareMilvusInitContainer" (dict "component" "streamingNode" "context" $) | nindent 8 }}
         {{- end }}
-        {{- if .Values.indexNode.initContainers }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.initContainers "context" $) | nindent 8 }}
+        {{- if .Values.streamingNode.initContainers }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.initContainers "context" $) | nindent 8 }}
         {{- end }}
       containers:
         - name: milvus
           image: {{ template "milvus.image" . }}
           imagePullPolicy: {{ .Values.milvus.image.pullPolicy }}
-          {{- if .Values.indexNode.containerSecurityContext.enabled }}
-          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.indexNode.containerSecurityContext "context" $) | nindent 12 }}
+          {{- if .Values.streamingNode.containerSecurityContext.enabled }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.streamingNode.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.indexNode.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.command "context" $) | nindent 12 }}
+          {{- else if .Values.streamingNode.command }}
+          command: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.command "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.indexNode.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.args "context" $) | nindent 12 }}
+          {{- else if .Values.streamingNode.args }}
+          args: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.args "context" $) | nindent 12 }}
           {{- else }}
           args:
             - run
-            - indexnode
+            - streamingnode
           {{- end }}
           env:
             - name: METRICS_PORT
-              value: {{ .Values.indexNode.containerPorts.metrics | quote }}
-            {{- if .Values.indexNode.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.extraEnvVars "context" $) | nindent 12 }}
+              value: {{ .Values.streamingNode.containerPorts.metrics | quote }}
+            {{- if .Values.streamingNode.extraEnvVars }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
-            {{- if .Values.indexNode.extraEnvVarsCM }}
+            {{- if .Values.streamingNode.extraEnvVarsCM }}
             - configMapRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.indexNode.extraEnvVarsCM "context" $) }}
+                name: {{ include "common.tplvalues.render" (dict "value" .Values.streamingNode.extraEnvVarsCM "context" $) }}
             {{- end }}
-            {{- if .Values.indexNode.extraEnvVarsSecret }}
+            {{- if .Values.streamingNode.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ include "common.tplvalues.render" (dict "value" .Values.indexNode.extraEnvVarsSecret "context" $) }}
+                name: {{ include "common.tplvalues.render" (dict "value" .Values.streamingNode.extraEnvVarsSecret "context" $) }}
             {{- end }}
           ports:
-            - containerPort: {{ .Values.indexNode.containerPorts.grpc }}
+            - containerPort: {{ .Values.streamingNode.containerPorts.grpc }}
               name: grpc
-            - containerPort: {{ .Values.indexNode.containerPorts.metrics }}
+            - containerPort: {{ .Values.streamingNode.containerPorts.metrics }}
               name: http-metrics
-          {{- if .Values.indexNode.resources }}
-          resources: {{- toYaml .Values.indexNode.resources | nindent 12 }}
-          {{- else if ne .Values.indexNode.resourcesPreset "none" }}
-          resources: {{- include "common.resources.preset" (dict "type" .Values.indexNode.resourcesPreset) | nindent 12 }}
+          {{- if .Values.streamingNode.resources }}
+          resources: {{- toYaml .Values.streamingNode.resources | nindent 12 }}
+          {{- else if ne .Values.streamingNode.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.streamingNode.resourcesPreset) | nindent 12 }}
           {{- end }}
           {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.indexNode.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.indexNode.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.indexNode.livenessProbe "enabled") "context" $) | nindent 12 }}
+          {{- if .Values.streamingNode.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.customLivenessProbe "context" $) | nindent 12 }}
+          {{- else if .Values.streamingNode.livenessProbe.enabled }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.streamingNode.livenessProbe "enabled") "context" $) | nindent 12 }}
             tcpSocket:
               port: http-metrics
           {{- end }}
-          {{- if .Values.indexNode.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.indexNode.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.indexNode.readinessProbe "enabled") "context" $) | nindent 12 }}
+          {{- if .Values.streamingNode.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.customReadinessProbe "context" $) | nindent 12 }}
+          {{- else if .Values.streamingNode.readinessProbe.enabled }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.streamingNode.readinessProbe "enabled") "context" $) | nindent 12 }}
             httpGet:
               path: /healthz
               port: http-metrics
           {{- end }}
-          {{- if .Values.indexNode.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.indexNode.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.indexNode.startupProbe "enabled") "context" $) | nindent 12 }}
+          {{- if .Values.streamingNode.customStartupProbe }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.customStartupProbe "context" $) | nindent 12 }}
+          {{- else if .Values.streamingNode.startupProbe.enabled }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.streamingNode.startupProbe "enabled") "context" $) | nindent 12 }}
             tcpSocket:
               port: http-metrics
           {{- end }}
           {{- end }}
-          {{- if .Values.indexNode.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.lifecycleHooks "context" $) | nindent 12 }}
+          {{- if .Values.streamingNode.lifecycleHooks }}
+          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.lifecycleHooks "context" $) | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: empty-dir
@@ -188,11 +188,11 @@ spec:
               mountPath: /opt/bitnami/milvus/configs/cert/minio/client
               readOnly: true
             {{- end }}
-          {{- if .Values.indexNode.extraVolumeMounts }}
-          {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- if .Values.streamingNode.extraVolumeMounts }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
-        {{- if .Values.indexNode.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.indexNode.sidecars "context" $) | nindent 8 }}
+        {{- if .Values.streamingNode.sidecars }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.streamingNode.sidecars "context" $) | nindent 8 }}
         {{- end }}
       volumes:
         - name: empty-dir
@@ -224,11 +224,11 @@ spec:
         {{- end }}
         - name: component-config-default
           configMap:
-            name: {{ template "milvus.index-node.configmapName" . }}
-        {{- if or .Values.indexNode.extraConfig .Values.indexNode.extraConfigExistingConfigMap }}
+            name: {{ template "milvus.streaming-node.configmapName" . }}
+        {{- if or .Values.streamingNode.extraConfig .Values.streamingNode.extraConfigExistingConfigMap }}
         - name: component-extra-config
           configMap:
-            name: {{ template "milvus.index-node.extraConfigmapName" . }}
+            name: {{ template "milvus.streaming-node.extraConfigmapName" . }}
         {{- end }}
         {{- if and (not .Values.etcd.enabled) .Values.externalEtcd.tls.enabled .Values.externalEtcd.tls.existingSecret }}
         - name: etcd-client-certs
@@ -248,7 +248,7 @@ spec:
             secretName: {{ .Values.externalS3.tls.existingSecret }}
             defaultMode: 256
         {{- end }}
-        {{- if .Values.indexNode.extraVolumes }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.indexNode.extraVolumes "context" $) | nindent 8 }}
+        {{- if .Values.streamingNode.extraVolumes }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
 {{- end }}

+ 5 - 5
bitnami/milvus/templates/query-coordinator/extra-configmap.yaml → bitnami/milvus/templates/streaming-node/extra-configmap.yaml

@@ -3,19 +3,19 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.queryCoord.extraConfig (not .Values.queryCoord.extraConfigExistingConfigMap) }}
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.extraConfig (not .Values.streamingNode.extraConfigExistingConfigMap) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-extra" (include "milvus.query-coordinator.fullname" .) }}
+  name: {{ printf "%s-extra" (include "milvus.streaming-node.fullname" .) }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: query-coordinator
+    app.kubernetes.io/component: streaming-node
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  04_query_coordinator_extra.yaml: |
-    {{- include "common.tplvalues.render" (dict "value" .Values.queryCoord.extraConfig "context" $) | nindent 4 }}
+  04_streaming_node_extra.yaml: |
+    {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.extraConfig "context" $) | nindent 4 }}
 {{- end }}

+ 12 - 12
bitnami/milvus/templates/index-coordinator/hpa.yaml → bitnami/milvus/templates/streaming-node/hpa.yaml

@@ -3,41 +3,41 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.indexCoord.autoscaling.hpa.enabled }}
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.autoscaling.hpa.enabled }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
+  name: {{ template "milvus.streaming-node.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if or .Values.commonAnnotations .Values.indexCoord.autoscaling.hpa.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
+    app.kubernetes.io/component: streaming-node
+  {{- if or .Values.commonAnnotations .Values.streamingNode.autoscaling.hpa.annotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
   scaleTargetRef:
     apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
     kind: Deployment
-    name: {{ template "milvus.index-coordinator.fullname" . }}
-  minReplicas: {{ .Values.indexCoord.autoscaling.hpa.minReplicas }}
-  maxReplicas: {{ .Values.indexCoord.autoscaling.hpa.maxReplicas }}
+    name: {{ template "milvus.streaming-node.fullname" . }}
+  minReplicas: {{ .Values.streamingNode.autoscaling.hpa.minReplicas }}
+  maxReplicas: {{ .Values.streamingNode.autoscaling.hpa.maxReplicas }}
   metrics:
-    {{- if .Values.indexCoord.autoscaling.hpa.targetCPU }}
+    {{- if .Values.streamingNode.autoscaling.hpa.targetCPU }}
     - type: Resource
       resource:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.indexCoord.autoscaling.hpa.targetCPU }}
+          averageUtilization: {{ .Values.streamingNode.autoscaling.hpa.targetCPU }}
     {{- end }}
-    {{- if .Values.indexCoord.autoscaling.hpa.targetMemory }}
+    {{- if .Values.streamingNode.autoscaling.hpa.targetMemory }}
     - type: Resource
       resource:
         name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.indexCoord.autoscaling.hpa.targetMemory }}
+          averageUtilization: {{ .Values.streamingNode.autoscaling.hpa.targetMemory }}
     {{- end }}
 {{- end }}

+ 22 - 26
bitnami/milvus/templates/index-node/networkpolicy.yaml → bitnami/milvus/templates/streaming-node/networkpolicy.yaml

@@ -3,28 +3,28 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.indexNode.networkPolicy.enabled }}
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
 metadata:
-  name: {{ template "milvus.index-node.fullname" . }}
+  name: {{ template "milvus.streaming-node.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-node
+    app.kubernetes.io/component: streaming-node
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexNode.podLabels .Values.commonLabels ) "context" . ) }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.podLabels .Values.commonLabels ) "context" . ) }}
   podSelector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-node
+      app.kubernetes.io/component: streaming-node
   policyTypes:
     - Ingress
     - Egress
-  {{- if .Values.indexNode.networkPolicy.allowExternalEgress }}
+  {{- if .Values.streamingNode.networkPolicy.allowExternalEgress }}
   egress:
     - {}
   {{- else }}
@@ -37,13 +37,9 @@ spec:
           protocol: TCP
     # Allow outbound connections to other cluster pods
     - ports:
-        - port: {{ .Values.queryCoord.containerPorts.grpc }}
-        - port: {{ .Values.dataCoord.containerPorts.grpc }}
-        - port: {{ .Values.indexCoord.containerPorts.grpc }}
-        - port: {{ .Values.rootCoord.containerPorts.grpc }}
         - port: {{ .Values.queryNode.containerPorts.grpc }}
         - port: {{ .Values.dataNode.containerPorts.grpc }}
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
+        - port: {{ .Values.streamingNode.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpc }}
         - port: {{ .Values.proxy.containerPorts.grpcInternal }}
       to:
@@ -54,7 +50,7 @@ spec:
         - port: {{ include "milvus.s3.port" . }}
       {{- if .Values.minio.enabled }}
         - port: {{ .Values.minio.containerPorts.api }}
-      to: 
+      to:
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: minio
@@ -63,7 +59,7 @@ spec:
     # Allow outbound connections to etcd
     - ports:
         - port: {{ include "milvus.etcd.port" . }}
-      to: 
+      to:
         {{- if .Values.etcd.enabled }}
         - podSelector:
             matchLabels:
@@ -73,44 +69,44 @@ spec:
     # Allow outbound connections to kafka
     - ports:
         - port: {{ include "milvus.kafka.port" . }}
-      to: 
+      to:
         {{- if .Values.kafka.enabled }}
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: kafka
               app.kubernetes.io/instance: {{ .Release.Name }}
         {{- end }}
-    {{- if .Values.indexNode.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.indexNode.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
+    {{- if .Values.streamingNode.networkPolicy.extraEgress }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.streamingNode.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
     {{- end }}
   {{- end }}
   ingress:
     - ports:
-        - port: {{ .Values.indexNode.containerPorts.grpc }}
-        {{- if .Values.indexNode.metrics.enabled }}
-        - port: {{ .Values.indexNode.containerPorts.metrics }}
+        - port: {{ .Values.streamingNode.containerPorts.grpc }}
+        {{- if .Values.streamingNode.metrics.enabled }}
+        - port: {{ .Values.streamingNode.containerPorts.metrics }}
         {{- end }}
-      {{- if not .Values.indexNode.networkPolicy.allowExternal }}
+      {{- if not .Values.streamingNode.networkPolicy.allowExternal }}
       from:
         - podSelector:
             matchLabels:
               {{ template "common.names.fullname" . }}-client: "true"
-        {{- if .Values.indexNode.networkPolicy.ingressNSMatchLabels }}
+        {{- if .Values.streamingNode.networkPolicy.ingressNSMatchLabels }}
         - namespaceSelector:
             matchLabels:
-              {{- range $key, $value := .Values.indexNode.networkPolicy.ingressNSMatchLabels }}
+              {{- range $key, $value := .Values.streamingNode.networkPolicy.ingressNSMatchLabels }}
               {{ $key | quote }}: {{ $value | quote }}
               {{- end }}
-          {{- if .Values.indexNode.networkPolicy.ingressNSPodMatchLabels }}
+          {{- if .Values.streamingNode.networkPolicy.ingressNSPodMatchLabels }}
           podSelector:
             matchLabels:
-              {{- range $key, $value := .Values.indexNode.networkPolicy.ingressNSPodMatchLabels }}
+              {{- range $key, $value := .Values.streamingNode.networkPolicy.ingressNSPodMatchLabels }}
               {{ $key | quote }}: {{ $value | quote }}
               {{- end }}
           {{- end }}
         {{- end }}
       {{- end }}
-    {{- if .Values.indexNode.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.indexNode.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
+    {{- if .Values.streamingNode.networkPolicy.extraIngress }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.streamingNode.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}

+ 9 - 9
bitnami/milvus/templates/index-coordinator/pdb.yaml → bitnami/milvus/templates/streaming-node/pdb.yaml

@@ -3,28 +3,28 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.indexCoord.enabled .Values.indexCoord.pdb.create }}
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
-  name: {{ template "milvus.index-coordinator.fullname" . }}
+  name: {{ template "milvus.streaming-node.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
+    app.kubernetes.io/component: streaming-node
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.indexCoord.pdb.minAvailable }}
-  minAvailable: {{ .Values.indexCoord.pdb.minAvailable }}
+  {{- if .Values.streamingNode.pdb.minAvailable }}
+  minAvailable: {{ .Values.streamingNode.pdb.minAvailable }}
   {{- end }}
-  {{- if or .Values.indexCoord.pdb.maxUnavailable (not .Values.indexCoord.pdb.minAvailable) }}
-  maxUnavailable: {{ .Values.indexCoord.pdb.maxUnavailable | default 1 }}
+  {{- if or .Values.streamingNode.pdb.maxUnavailable (not .Values.streamingNode.pdb.minAvailable) }}
+  maxUnavailable: {{ .Values.streamingNode.pdb.maxUnavailable | default 1 }}
   {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.podLabels .Values.commonLabels ) "context" . ) }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/part-of: milvus
-      app.kubernetes.io/component: index-coordinator
+      app.kubernetes.io/component: streaming-node
 {{- end }}

+ 6 - 6
bitnami/milvus/templates/index-coordinator/service-account.yaml → bitnami/milvus/templates/streaming-node/service-account.yaml

@@ -3,18 +3,18 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.indexCoord.serviceAccount.create }}
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "milvus.index-coordinator.serviceAccountName" . }}
+  name: {{ include "milvus.streaming-node.serviceAccountName" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if or .Values.indexCoord.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
+    app.kubernetes.io/component: streaming-node
+  {{- if or .Values.streamingNode.serviceAccount.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
-automountServiceAccountToken: {{ .Values.indexCoord.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ .Values.streamingNode.serviceAccount.automountServiceAccountToken }}
 {{- end }}

+ 73 - 0
bitnami/milvus/templates/streaming-node/service.yaml

@@ -0,0 +1,73 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if .Values.streamingNode.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "milvus.streaming-node.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: milvus
+    app.kubernetes.io/component: streaming-node
+ {{- if or .Values.commonAnnotations .Values.streamingNode.service.annotations (and .Values.streamingNode.metrics.enabled .Values.streamingNode.metrics.annotations) }}
+  annotations:
+    {{- if or .Values.streamingNode.service.annotations .Values.commonAnnotations }}
+    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.service.annotations .Values.commonAnnotations ) "context" . ) }}
+    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
+    {{- end }}
+    {{- if and .Values.streamingNode.metrics.enabled .Values.streamingNode.metrics.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.streamingNode.metrics.annotations "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  type: {{ .Values.streamingNode.service.type }}
+  {{- if .Values.streamingNode.service.sessionAffinity }}
+  sessionAffinity: {{ .Values.streamingNode.service.sessionAffinity }}
+  {{- end }}
+  {{- if .Values.streamingNode.service.sessionAffinityConfig }}
+  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.service.sessionAffinityConfig "context" $) | nindent 4 }}
+  {{- end }}
+  {{- if .Values.streamingNode.service.clusterIP }}
+  clusterIP: {{ .Values.streamingNode.service.clusterIP }}
+  {{- end }}
+  {{- if (or (eq .Values.streamingNode.service.type "LoadBalancer") (eq .Values.streamingNode.service.type "NodePort")) }}
+  externalTrafficPolicy: {{ .Values.streamingNode.service.externalTrafficPolicy | quote }}
+  {{- end }}
+  {{ if eq .Values.streamingNode.service.type "LoadBalancer" }}
+  loadBalancerSourceRanges: {{ .Values.streamingNode.service.loadBalancerSourceRanges }}
+  {{ end }}
+  {{- if (and (eq .Values.streamingNode.service.type "LoadBalancer") (not (empty .Values.streamingNode.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.streamingNode.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - name: grpc
+      port: {{ .Values.streamingNode.service.ports.grpc }}
+      targetPort: grpc
+      protocol: TCP
+      {{- if (and (or (eq .Values.streamingNode.service.type "NodePort") (eq .Values.streamingNode.service.type "LoadBalancer")) (not (empty .Values.streamingNode.service.nodePorts.grpc))) }}
+      nodePort: {{ .Values.streamingNode.service.nodePorts.grpc }}
+      {{- else if eq .Values.streamingNode.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
+    {{- if .Values.streamingNode.metrics.enabled }}
+    - name: http-metrics
+      port: {{ .Values.streamingNode.service.ports.metrics }}
+      targetPort: http-metrics
+      protocol: TCP
+      {{- if (and (or (eq .Values.streamingNode.service.type "NodePort") (eq .Values.streamingNode.service.type "LoadBalancer")) (not (empty .Values.streamingNode.service.nodePorts.metrics))) }}
+      nodePort: {{ .Values.streamingNode.service.nodePorts.metrics }}
+      {{- else if eq .Values.streamingNode.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
+    {{- end }}
+    {{- if .Values.streamingNode.service.extraPorts }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.service.extraPorts "context" $) | nindent 4 }}
+    {{- end }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.podLabels .Values.commonLabels ) "context" . ) }}
+  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: milvus
+    app.kubernetes.io/component: streaming-node
+{{- end }}

+ 51 - 0
bitnami/milvus/templates/streaming-node/servicemonitor.yaml

@@ -0,0 +1,51 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.metrics.enabled .Values.streamingNode.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "milvus.streaming-node.fullname" . }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.streamingNode.metrics.serviceMonitor.namespace | quote }}
+  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: milvus
+    app.kubernetes.io/component: streaming-node
+  {{- if or .Values.commonAnnotations .Values.streamingNode.metrics.serviceMonitor.annotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.metrics.serviceMonitor.annotations .Values.commonAnnotations ) "context" . ) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.streamingNode.metrics.serviceMonitor.jobLabel }}
+  jobLabel: {{ .Values.streamingNode.metrics.serviceMonitor.jobLabel }}
+  {{- end }}
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
+      {{- if .Values.streamingNode.metrics.serviceMonitor.selector }}
+      {{- include "common.tplvalues.render" (dict "value" .Values.streamingNode.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
+      {{- end }}
+      app.kubernetes.io/part-of: milvus
+      app.kubernetes.io/component: streaming-node
+  endpoints:
+    - port: http-metrics
+      {{- if .Values.streamingNode.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.streamingNode.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.streamingNode.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.streamingNode.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.streamingNode.metrics.serviceMonitor.honorLabels }}
+      honorLabels: {{ .Values.streamingNode.metrics.serviceMonitor.honorLabels }}
+      {{- end }}
+      {{- if .Values.streamingNode.metrics.serviceMonitor.metricRelabelings }}
+      metricRelabelings: {{- toYaml .Values.streamingNode.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
+      {{- end }}
+      {{- if .Values.streamingNode.metrics.serviceMonitor.relabelings }}
+      relabelings: {{- toYaml .Values.streamingNode.metrics.serviceMonitor.relabelings | nindent 6 }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ include "common.names.namespace" . | quote }}
+{{- end }}

+ 12 - 12
bitnami/milvus/templates/index-coordinator/vpa.yaml → bitnami/milvus/templates/streaming-node/vpa.yaml

@@ -3,42 +3,42 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) .Values.indexCoord.autoscaling.vpa.enabled }}
+{{- if and .Values.streamingNode.enabled .Values.streamingNode.autoscaling.vpa.enabled (include "common.capabilities.apiVersions.has" ( dict "version" "autoscaling.k8s.io/v1/VerticalPodAutoscaler" "context" . )) }}
 apiVersion: {{ include "common.capabilities.vpa.apiVersion" . }}
 kind: VerticalPodAutoscaler
 metadata:
-  name: {{ include "milvus.index-coordinator.fullname" . }}
+  name: {{ include "milvus.streaming-node.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: milvus
-    app.kubernetes.io/component: index-coordinator
-  {{- if or .Values.indexCoord.autoscaling.vpa.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.indexCoord.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
+    app.kubernetes.io/component: streaming-node
+  {{- if or .Values.streamingNode.autoscaling.vpa.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.streamingNode.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
   resourcePolicy:
     containerPolicies:
-    - containerName: milvus-index-coordinator
-      {{- with .Values.indexCoord.autoscaling.vpa.controlledResources }}
+    - containerName: milvus-streaming-node
+      {{- with .Values.streamingNode.autoscaling.vpa.controlledResources }}
       controlledResources:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.indexCoord.autoscaling.vpa.maxAllowed }}
+      {{- with .Values.streamingNode.autoscaling.vpa.maxAllowed }}
       maxAllowed:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.indexCoord.autoscaling.vpa.minAllowed }}
+      {{- with .Values.streamingNode.autoscaling.vpa.minAllowed }}
       minAllowed:
         {{- toYaml . | nindent 8 }}
       {{- end }}
   targetRef:
     apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
     kind: Deployment
-    name: {{ include "milvus.index-coordinator.fullname" . }}
-  {{- if .Values.indexCoord.autoscaling.vpa.updatePolicy }}
+    name: {{ include "milvus.streaming-node.fullname" . }}
+  {{- if .Values.streamingNode.autoscaling.vpa.updatePolicy }}
   updatePolicy:
-    {{- with .Values.indexCoord.autoscaling.vpa.updatePolicy.updateMode }}
+    {{- with .Values.streamingNode.autoscaling.vpa.updatePolicy.updateMode }}
     updateMode: {{ . }}
     {{- end }}
   {{- end }}

File diff suppressed because it is too large
+ 31 - 1529
bitnami/milvus/values.schema.json


File diff suppressed because it is too large
+ 95 - 1580
bitnami/milvus/values.yaml


Some files were not shown because too many files changed in this diff