Merge pull request #131 from LoveEachDay/fix-upgrade-error-with-strea…

…ming-node Fix upgrade error with --reuse-values
zilliztech · Oct 17, 2024 · e46de96 · e46de96
2 parents ee94899 + 4119748
commit e46de96
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
@@ -3,7 +3,7 @@ name: milvus
 appVersion: "2.4.13"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
-version: 4.2.13
+version: 4.2.14
 keywords:
   - milvus
   - elastic

diff --git a/charts/milvus/templates/datacoord-deployment.yaml b/charts/milvus/templates/datacoord-deployment.yaml
@@ -73,7 +73,7 @@ spec:
         args: [ "milvus", "run", "datacoord" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/datanode-deployment.yaml b/charts/milvus/templates/datanode-deployment.yaml
@@ -69,7 +69,7 @@ spec:
         args: [ "milvus", "run", "datanode" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/indexcoord-deployment.yaml b/charts/milvus/templates/indexcoord-deployment.yaml
@@ -73,7 +73,7 @@ spec:
         args: [ "milvus", "run", "indexcoord" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/indexnode-deployment.yaml b/charts/milvus/templates/indexnode-deployment.yaml
@@ -68,7 +68,7 @@ spec:
         args: [ "milvus", "run", "indexnode" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/mixcoord-deployment.yaml b/charts/milvus/templates/mixcoord-deployment.yaml
@@ -73,7 +73,7 @@ spec:
         args: [ "milvus", "run", "mixture", "-rootcoord", "-querycoord", "-datacoord", "-indexcoord" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/proxy-deployment.yaml b/charts/milvus/templates/proxy-deployment.yaml
@@ -69,7 +69,7 @@ spec:
         args: [ "milvus", "run", "proxy" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/querycoord-deployment.yaml b/charts/milvus/templates/querycoord-deployment.yaml
@@ -73,7 +73,7 @@ spec:
         args: [ "milvus", "run", "querycoord" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/querynode-deployment.yaml b/charts/milvus/templates/querynode-deployment.yaml
@@ -68,7 +68,7 @@ spec:
         args: [ "milvus", "run", "querynode" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/rootcoord-deployment.yaml b/charts/milvus/templates/rootcoord-deployment.yaml
@@ -73,7 +73,7 @@ spec:
         args: [ "milvus", "run", "rootcoord" ]
         {{- end }}
         env:
-        {{- if .Values.streaming.enabled }}
+        {{- if and .Values.streaming .Values.streaming.enabled }}
         - name: MILVUS_STREAMING_SERVICE_ENABLED
           value: "1"
         {{- end }}

diff --git a/charts/milvus/templates/streamingnode-deployment.yaml b/charts/milvus/templates/streamingnode-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.streaming.enabled .Values.cluster.enabled }}
+{{- if and .Values.streaming .Values.streaming.enabled .Values.cluster.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/charts/milvus/templates/streamingnode-svc.yaml b/charts/milvus/templates/streamingnode-svc.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.metrics.enabled }}
-{{- if and .Values.streaming.enabled .Values.cluster.enabled }}
+{{- if and .Values.streaming .Values.streaming.enabled .Values.cluster.enabled }}
 apiVersion: v1
 kind: Service
 metadata: