From 1bed3e43130fdd33f436e534fc2206cc75261232 Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Tue, 15 Apr 2025 15:47:55 +0200 Subject: [PATCH 1/2] [IDE] Mounting Milvus secret in Python IDE + adding latest library-chart with NOTES --- charts/jupyter-pyspark/Chart.yaml | 4 ++-- charts/jupyter-pyspark/templates/secret-milvus.yaml | 1 + charts/jupyter-pyspark/templates/statefulset.yaml | 7 +++++++ charts/jupyter-pyspark/values.schema.json | 10 ++++++++++ charts/jupyter-python/Chart.yaml | 4 ++-- charts/jupyter-python/templates/secret-milvus.yaml | 1 + charts/jupyter-python/templates/statefulset.yaml | 7 +++++++ charts/jupyter-python/values.schema.json | 10 ++++++++++ charts/vscode-pyspark/Chart.yaml | 4 ++-- charts/vscode-pyspark/templates/secret-milvus.yaml | 1 + charts/vscode-pyspark/templates/statefulset.yaml | 7 +++++++ charts/vscode-pyspark/values.schema.json | 10 ++++++++++ charts/vscode-python/Chart.yaml | 4 ++-- charts/vscode-python/templates/secret-milvus.yaml | 1 + charts/vscode-python/templates/statefulset.yaml | 7 +++++++ charts/vscode-python/values.schema.json | 10 ++++++++++ charts/vscode-python/values.yaml | 4 ++++ 17 files changed, 84 insertions(+), 8 deletions(-) create mode 100644 charts/jupyter-pyspark/templates/secret-milvus.yaml create mode 100644 charts/jupyter-python/templates/secret-milvus.yaml create mode 100644 charts/vscode-pyspark/templates/secret-milvus.yaml create mode 100644 charts/vscode-python/templates/secret-milvus.yaml diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 032781b2..2a75ec2f 100644 --- a/charts/jupyter-pyspark/Chart.yaml +++ b/charts/jupyter-pyspark/Chart.yaml @@ -24,8 +24,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.9 +version: 2.2.10 dependencies: - name: library-chart - version: 1.6.13 + version: 1.6.16 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-pyspark/templates/secret-milvus.yaml b/charts/jupyter-pyspark/templates/secret-milvus.yaml new file mode 100644 index 00000000..e3f338eb --- /dev/null +++ b/charts/jupyter-pyspark/templates/secret-milvus.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretMilvus" . }} diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml index bfadd724..39508ded 100644 --- a/charts/jupyter-pyspark/templates/statefulset.yaml +++ b/charts/jupyter-pyspark/templates/statefulset.yaml @@ -47,6 +47,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} checksum/chromadb: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -278,6 +281,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameChromaDB" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + - secretRef: + name: {{ include "library-chart.secretNameMilvus" . }} + {{- end }} {{- if .Values.extraEnvVars }} - secretRef: name: {{ include "library-chart.secretNameExtraEnv" . }} diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json index c142ab4b..ac94765f 100644 --- a/charts/jupyter-pyspark/values.schema.json +++ b/charts/jupyter-pyspark/values.schema.json @@ -651,6 +651,16 @@ "title": "Discover Metaflow services", "type": "boolean", "default": true + }, + "chromadb": { + "title": "Discover ChromaDB services", + "type": "boolean", + "default": true + }, + "milvus": { + "title": "Discover Milvus services", + "type": "boolean", + "default": true } } }, diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml index 66c4d9af..f542f4de 100644 --- a/charts/jupyter-python/Chart.yaml +++ b/charts/jupyter-python/Chart.yaml @@ -22,8 +22,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.10 +version: 2.2.11 dependencies: - name: library-chart - version: 1.6.13 + version: 1.6.16 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-python/templates/secret-milvus.yaml b/charts/jupyter-python/templates/secret-milvus.yaml new file mode 100644 index 00000000..e3f338eb --- /dev/null +++ b/charts/jupyter-python/templates/secret-milvus.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretMilvus" . }} diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml index 9924ac72..75d36741 100644 --- a/charts/jupyter-python/templates/statefulset.yaml +++ b/charts/jupyter-python/templates/statefulset.yaml @@ -41,6 +41,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} checksum/chromadb: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -229,6 +232,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameChromaDB" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + - secretRef: + name: {{ include "library-chart.secretNameMilvus" . }} + {{- end }} {{- if .Values.extraEnvVars }} - secretRef: name: {{ include "library-chart.secretNameExtraEnv" . }} diff --git a/charts/jupyter-python/values.schema.json b/charts/jupyter-python/values.schema.json index ab680950..cb0bcd4e 100644 --- a/charts/jupyter-python/values.schema.json +++ b/charts/jupyter-python/values.schema.json @@ -604,6 +604,16 @@ "title": "Discover Metaflow services", "type": "boolean", "default": true + }, + "chromadb": { + "title": "Discover ChromaDB services", + "type": "boolean", + "default": true + }, + "milvus": { + "title": "Discover Milvus services", + "type": "boolean", + "default": true } } }, diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index c5778456..00e36838 100644 --- a/charts/vscode-pyspark/Chart.yaml +++ b/charts/vscode-pyspark/Chart.yaml @@ -24,8 +24,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.12 +version: 2.2.13 dependencies: - name: library-chart - version: 1.6.13 + version: 1.6.16 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/templates/secret-milvus.yaml b/charts/vscode-pyspark/templates/secret-milvus.yaml new file mode 100644 index 00000000..e3f338eb --- /dev/null +++ b/charts/vscode-pyspark/templates/secret-milvus.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretMilvus" . }} diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml index fb122906..ac3e8bbf 100644 --- a/charts/vscode-pyspark/templates/statefulset.yaml +++ b/charts/vscode-pyspark/templates/statefulset.yaml @@ -47,6 +47,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} checksum/mlflow: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -288,6 +291,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameChromaDB" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + - secretRef: + name: {{ include "library-chart.secretNameMilvus" . }} + {{- end }} {{- if .Values.extraEnvVars }} - secretRef: name: {{ include "library-chart.secretNameExtraEnv" . }} diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json index 777ba022..266f52b1 100644 --- a/charts/vscode-pyspark/values.schema.json +++ b/charts/vscode-pyspark/values.schema.json @@ -635,6 +635,16 @@ "title": "Discover Metaflow services", "type": "boolean", "default": true + }, + "chromadb": { + "title": "Discover ChromaDB services", + "type": "boolean", + "default": true + }, + "milvus": { + "title": "Discover Milvus services", + "type": "boolean", + "default": true } } }, diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml index c01743d9..65d7380a 100644 --- a/charts/vscode-python/Chart.yaml +++ b/charts/vscode-python/Chart.yaml @@ -22,8 +22,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.12 +version: 2.2.13 dependencies: - name: library-chart - version: 1.6.13 + version: 1.6.16 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-python/templates/secret-milvus.yaml b/charts/vscode-python/templates/secret-milvus.yaml new file mode 100644 index 00000000..e3f338eb --- /dev/null +++ b/charts/vscode-python/templates/secret-milvus.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretMilvus" . }} diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml index 00b2331d..cd43fc84 100644 --- a/charts/vscode-python/templates/statefulset.yaml +++ b/charts/vscode-python/templates/statefulset.yaml @@ -41,6 +41,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} checksum/chromadb: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -228,6 +231,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameChromaDB" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} + - secretRef: + name: {{ include "library-chart.secretNameMilvus" . }} + {{- end }} {{- if .Values.extraEnvVars }} - secretRef: name: {{ include "library-chart.secretNameExtraEnv" . }} diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json index f4d140ce..aab99c20 100644 --- a/charts/vscode-python/values.schema.json +++ b/charts/vscode-python/values.schema.json @@ -640,6 +640,16 @@ "title": "Discover Metaflow services", "type": "boolean", "default": true + }, + "chromadb": { + "title": "Discover ChromaDB services", + "type": "boolean", + "default": true + }, + "milvus": { + "title": "Discover Milvus services", + "type": "boolean", + "default": true } } }, diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml index 80eb43d6..4eb74ee4 100644 --- a/charts/vscode-python/values.yaml +++ b/charts/vscode-python/values.yaml @@ -80,6 +80,7 @@ discovery: mlflow: true metaflow: true chromadb: true + milvus: true hive: secretName: "" @@ -93,6 +94,9 @@ metaflow: chromadb: secretName: "" +milvus: + secretName: "" + coresite: secretName: "" From 2e8f4f28bcee8d9b0a239033650d7b548bbd1e18 Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Tue, 15 Apr 2025 15:52:28 +0200 Subject: [PATCH 2/2] [IDE] Update default values for milvus discovery --- charts/jupyter-pyspark/values.yaml | 4 ++++ charts/jupyter-python/values.yaml | 4 ++++ charts/vscode-pyspark/values.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml index 59493078..96a75d92 100644 --- a/charts/jupyter-pyspark/values.yaml +++ b/charts/jupyter-pyspark/values.yaml @@ -115,6 +115,7 @@ discovery: mlflow: true metaflow: true chromadb: true + milvus: true hive: secretName: "" @@ -128,6 +129,9 @@ metaflow: chromadb: secretName: "" +milvus: + secretName: "" + coresite: secretName: "" diff --git a/charts/jupyter-python/values.yaml b/charts/jupyter-python/values.yaml index 27888e4c..93b44b76 100644 --- a/charts/jupyter-python/values.yaml +++ b/charts/jupyter-python/values.yaml @@ -85,6 +85,7 @@ discovery: mlflow: true metaflow: true chromadb: true + milvus: true hive: secretName: "" @@ -98,6 +99,9 @@ metaflow: chromadb: secretName: "" +milvus: + secretName: "" + coresite: secretName: "" diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml index 389efd0c..f3a23bfd 100644 --- a/charts/vscode-pyspark/values.yaml +++ b/charts/vscode-pyspark/values.yaml @@ -116,6 +116,7 @@ discovery: mlflow: true metaflow: true chromadb: true + milvus: true hive: secretName: "" @@ -129,6 +130,9 @@ metaflow: chromadb: secretName: "" +milvus: + secretName: "" + coresite: secretName: ""