From 85078cbfd2373f7f556425bc1c1281803e10ddf3 Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Wed, 2 Jul 2025 14:49:32 +0200 Subject: [PATCH 1/5] [library-chart] PostgreSQL discovery --- charts/library-chart/Chart.yaml | 2 +- charts/library-chart/templates/_notes.tpl | 7 +++ .../_secret_postgresql_discovery.tpl | 62 +++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 charts/library-chart/templates/_secret_postgresql_discovery.tpl diff --git a/charts/library-chart/Chart.yaml b/charts/library-chart/Chart.yaml index a5215dbb1..e95e1df64 100644 --- a/charts/library-chart/Chart.yaml +++ b/charts/library-chart/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: library-chart -version: 1.7.6 +version: 1.7.7 type: library diff --git a/charts/library-chart/templates/_notes.tpl b/charts/library-chart/templates/_notes.tpl index 98834593d..da1346280 100644 --- a/charts/library-chart/templates/_notes.tpl +++ b/charts/library-chart/templates/_notes.tpl @@ -196,6 +196,13 @@ It is possible to associate an initialization script with your service to set up {{ end -}} +{{- with (include "library-chart.postgresql-discovery-help" .) }} +
+ PostgreSQL +{{ . }} +
+{{ end -}} + {{- with (include "library-chart.metaflow-discovery-help" .) }}
Metaflow diff --git a/charts/library-chart/templates/_secret_postgresql_discovery.tpl b/charts/library-chart/templates/_secret_postgresql_discovery.tpl new file mode 100644 index 000000000..227b7ccca --- /dev/null +++ b/charts/library-chart/templates/_secret_postgresql_discovery.tpl @@ -0,0 +1,62 @@ +{{/* Create the name of the secret PostgreSQL to use */}} +{{- define "library-chart.secretNamePostgreSQL" -}} +{{- if (.Values.discovery).postgresql }} +{{- $name := printf "%s-secretpostgresql" (include "library-chart.fullname" .) }} +{{- default $name (.Values.postgresql).secretName }} +{{- else }} +{{- default "default" (.Values.postgresql).secretName }} +{{- end }} +{{- end }} + + +{{/* Secret for PostgreSQL */}} +{{- define "library-chart.secretPostgreSQL" }} +{{- $context := . }} +{{- if (.Values.discovery).postgresql }} +{{- with $secretData := first (include "library-chart.getOnyxiaDiscoverySecrets" (list .Release.Namespace "postgres") | fromJsonArray) -}} +{{- $pg_service := index $secretData "postgres-service" | default "" | b64dec }} +{{- $pg_port := index $secretData "postgres-port" | default "" | b64dec }} +{{- $pg_database := index $secretData "postgres-database" | default "" | b64dec }} +{{- $pg_username := index $secretData "postgres-username" | default "" | b64dec }} +{{- $pg_password := index $secretData "password" | default "" | b64dec }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "library-chart.secretNamePostgreSQL" $context }} + labels: + {{- include "library-chart.labels" $context | nindent 4 }} +stringData: + PGHOST: "http://{{ $pg_service }}" + PGPORT: {{ $pg_port | quote }} + PGDATABASE: {{ $pg_database | quote }} + PGUSER: {{ $pg_username | quote }} + PGPASSWORD: {{ $pg_password | quote }} +{{- end }} +{{- end }} +{{- end }} + + +{{- define "library-chart.postgresql-discovery-help" -}} +{{- if (.Values.discovery).postgresql }} +{{- if first (include "library-chart.getOnyxiaDiscoverySecrets" (list .Release.Namespace "postgres") | fromJsonArray) }} +The connection to your PostgreSQL service is already preconfigured in your service. +{{- if regexMatch "^r|r$" .Chart.Name }} +```r +library(DBI) +conn <- dbConnect(RPostgres::Postgres()) +print(dbGetQuery(conn, "SELECT version();")) +dbDisconnect(conn) +``` +{{- else }} +A client can be created in a Python script or interactive console: +```python +import psycopg +conn = psycopg.connect() +with conn.cursor() as cur: + print(cur.execute("SELECT version();").fetchone()) +conn.close() +``` +{{- end }} +{{- end }} +{{- end }} +{{- end -}} From efdc0740d73d7869daa560dcfc8e882d238a964e Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Wed, 2 Jul 2025 15:10:29 +0200 Subject: [PATCH 2/5] [All] PostgreSQL discovery in all interactive services --- charts/jupyter-pyspark/Chart.yaml | 4 ++-- .../jupyter-pyspark/templates/secret-postgresql.yaml | 1 + charts/jupyter-pyspark/templates/statefulset.yaml | 7 +++++++ charts/jupyter-pyspark/values.schema.json | 5 +++++ charts/jupyter-pyspark/values.yaml | 4 ++++ charts/jupyter-python/Chart.yaml | 4 ++-- .../jupyter-python/templates/secret-postgresql.yaml | 1 + charts/jupyter-python/templates/statefulset.yaml | 7 +++++++ charts/jupyter-python/values.schema.json | 5 +++++ charts/jupyter-python/values.yaml | 4 ++++ charts/rstudio-sparkr/Chart.yaml | 4 ++-- .../rstudio-sparkr/templates/secret-postgresql.yaml | 1 + charts/rstudio-sparkr/templates/statefulset.yaml | 7 +++++++ charts/rstudio-sparkr/values.schema.json | 5 +++++ charts/rstudio-sparkr/values.yaml | 4 ++++ charts/rstudio/Chart.yaml | 4 ++-- charts/rstudio/templates/secret-postgresql.yaml | 1 + charts/rstudio/templates/statefulset.yaml | 7 +++++++ charts/rstudio/values.schema.json | 11 +++++++++++ charts/rstudio/values.yaml | 6 ++++++ charts/vscode-pyspark/Chart.yaml | 4 ++-- .../vscode-pyspark/templates/secret-postgresql.yaml | 1 + charts/vscode-pyspark/templates/statefulset.yaml | 9 ++++++++- charts/vscode-pyspark/values.schema.json | 5 +++++ charts/vscode-pyspark/values.yaml | 4 ++++ charts/vscode-python/Chart.yaml | 4 ++-- charts/vscode-python/templates/secret-postgresql.yaml | 1 + charts/vscode-python/templates/statefulset.yaml | 7 +++++++ charts/vscode-python/values.schema.json | 5 +++++ charts/vscode-python/values.yaml | 4 ++++ 30 files changed, 123 insertions(+), 13 deletions(-) create mode 100644 charts/jupyter-pyspark/templates/secret-postgresql.yaml create mode 100644 charts/jupyter-python/templates/secret-postgresql.yaml create mode 100644 charts/rstudio-sparkr/templates/secret-postgresql.yaml create mode 100644 charts/rstudio/templates/secret-postgresql.yaml create mode 100644 charts/vscode-pyspark/templates/secret-postgresql.yaml create mode 100644 charts/vscode-python/templates/secret-postgresql.yaml diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 36cb1f156..1dccce421 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.3.12 +version: 2.3.13 dependencies: - name: library-chart - version: 1.7.5 + version: 1.7.7 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-pyspark/templates/secret-postgresql.yaml b/charts/jupyter-pyspark/templates/secret-postgresql.yaml new file mode 100644 index 000000000..cf056bee8 --- /dev/null +++ b/charts/jupyter-pyspark/templates/secret-postgresql.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretPostgreSQL" . }} diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml index 7d0a905e9..d832c1b2b 100644 --- a/charts/jupyter-pyspark/templates/statefulset.yaml +++ b/charts/jupyter-pyspark/templates/statefulset.yaml @@ -50,6 +50,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -281,6 +284,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameMilvus" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + - secretRef: + name: {{ include "library-chart.secretNamePostgreSQL" . }} + {{- 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 37e267fee..dfc2915be 100644 --- a/charts/jupyter-pyspark/values.schema.json +++ b/charts/jupyter-pyspark/values.schema.json @@ -656,6 +656,11 @@ "title": "Discover Milvus services", "type": "boolean", "default": true + }, + "postgresql": { + "title": "Discover PostgreSQL services", + "type": "boolean", + "default": true } } }, diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml index 25eecadb5..b88507596 100644 --- a/charts/jupyter-pyspark/values.yaml +++ b/charts/jupyter-pyspark/values.yaml @@ -116,6 +116,7 @@ discovery: metaflow: true chromadb: true milvus: true + postgresql: true hive: secretName: "" @@ -132,6 +133,9 @@ chromadb: milvus: secretName: "" +postgresql: + secretName: "" + coresite: secretName: "" diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml index a789556a0..17770750b 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.3.14 +version: 2.3.15 dependencies: - name: library-chart - version: 1.7.5 + version: 1.7.7 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-python/templates/secret-postgresql.yaml b/charts/jupyter-python/templates/secret-postgresql.yaml new file mode 100644 index 000000000..cf056bee8 --- /dev/null +++ b/charts/jupyter-python/templates/secret-postgresql.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretPostgreSQL" . }} diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml index 6890687b8..c36efe881 100644 --- a/charts/jupyter-python/templates/statefulset.yaml +++ b/charts/jupyter-python/templates/statefulset.yaml @@ -44,6 +44,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -232,6 +235,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameMilvus" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + - secretRef: + name: {{ include "library-chart.secretNamePostgreSQL" . }} + {{- 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 1107f4d4b..47171207a 100644 --- a/charts/jupyter-python/values.schema.json +++ b/charts/jupyter-python/values.schema.json @@ -609,6 +609,11 @@ "title": "Discover Milvus services", "type": "boolean", "default": true + }, + "postgresql": { + "title": "Discover PostgreSQL services", + "type": "boolean", + "default": true } } }, diff --git a/charts/jupyter-python/values.yaml b/charts/jupyter-python/values.yaml index 3e0f53ece..ebb26089f 100644 --- a/charts/jupyter-python/values.yaml +++ b/charts/jupyter-python/values.yaml @@ -85,6 +85,7 @@ discovery: metaflow: true chromadb: true milvus: true + postgresql: true hive: secretName: "" @@ -101,6 +102,9 @@ chromadb: milvus: secretName: "" +postgresql: + secretName: "" + coresite: secretName: "" diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 38ac23bd4..9a9fe7e17 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -23,8 +23,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.3.7 +version: 2.3.8 dependencies: - name: library-chart - version: 1.7.5 + version: 1.7.7 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/templates/secret-postgresql.yaml b/charts/rstudio-sparkr/templates/secret-postgresql.yaml new file mode 100644 index 000000000..cf056bee8 --- /dev/null +++ b/charts/rstudio-sparkr/templates/secret-postgresql.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretPostgreSQL" . }} diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml index 8cfacd392..f6ede0c11 100644 --- a/charts/rstudio-sparkr/templates/statefulset.yaml +++ b/charts/rstudio-sparkr/templates/statefulset.yaml @@ -32,6 +32,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretHive" .))) }} checksum/hive: {{ include (print $.Template.BasePath "/secret-hive.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }} + {{- end }} {{- if not (empty (trim (include "library-chart.secretIvySettings" .))) }} checksum/ivysettings: {{ include (print $.Template.BasePath "/secret-ivysettings.yaml") . | sha256sum }} {{- end }} @@ -238,6 +241,10 @@ spec: - configMapRef: name: {{ include "library-chart.configMapNameRepository" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + - secretRef: + name: {{ include "library-chart.secretNamePostgreSQL" . }} + {{- end }} {{- if .Values.extraEnvVars }} - secretRef: name: {{ include "library-chart.secretNameExtraEnv" . }} diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json index b2c9b839c..a853cf71e 100644 --- a/charts/rstudio-sparkr/values.schema.json +++ b/charts/rstudio-sparkr/values.schema.json @@ -614,6 +614,11 @@ "title": "Discover Hive Metastore services", "type": "boolean", "default": true + }, + "postgresql": { + "title": "Discover PostgreSQL services", + "type": "boolean", + "default": true } } }, diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml index 68be3d5fe..99bf60f91 100644 --- a/charts/rstudio-sparkr/values.yaml +++ b/charts/rstudio-sparkr/values.yaml @@ -98,10 +98,14 @@ git: discovery: hive: true + postgresql: true hive: secretName: "" +postgresql: + secretName: "" + coresite: secretName: "" diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index 5d9e3f427..7abfc8960 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/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.3.8 +version: 2.3.9 dependencies: - name: library-chart - version: 1.7.5 + version: 1.7.7 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio/templates/secret-postgresql.yaml b/charts/rstudio/templates/secret-postgresql.yaml new file mode 100644 index 000000000..cf056bee8 --- /dev/null +++ b/charts/rstudio/templates/secret-postgresql.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretPostgreSQL" . }} diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml index 4204e33ed..42975e7fb 100644 --- a/charts/rstudio/templates/statefulset.yaml +++ b/charts/rstudio/templates/statefulset.yaml @@ -29,6 +29,9 @@ spec: {{- if .Values.vault.enabled }} checksum/vault: {{ include (print $.Template.BasePath "/secret-vault.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -171,6 +174,10 @@ spec: - configMapRef: name: {{ include "library-chart.configMapNameRepository" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + - secretRef: + name: {{ include "library-chart.secretNamePostgreSQL" . }} + {{- end }} - secretRef: name: {{ include "library-chart.secretNameToken" . }} {{- if .Values.extraEnvVars }} diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json index 1d1e3dcd1..48d0081a3 100644 --- a/charts/rstudio/values.schema.json +++ b/charts/rstudio/values.schema.json @@ -581,6 +581,17 @@ } } }, + "discovery": { + "title": "Third party services discovery", + "type": "object", + "properties": { + "postgresql": { + "title": "Discover PostgreSQL services", + "type": "boolean", + "default": true + } + } + }, "security": { "title": "Security", "type": "object", diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml index 4f3bb62c3..174d57dfe 100644 --- a/charts/rstudio/values.yaml +++ b/charts/rstudio/values.yaml @@ -77,6 +77,12 @@ repository: packageManagerUrl: "" rRepository: "" +discovery: + postgresql: true + +postgresql: + secretName: "" + replicaCount: 1 imagePullSecrets: [] diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index dfd2247a9..694184868 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.3.12 +version: 2.3.13 dependencies: - name: library-chart - version: 1.7.5 + version: 1.7.7 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/templates/secret-postgresql.yaml b/charts/vscode-pyspark/templates/secret-postgresql.yaml new file mode 100644 index 000000000..cf056bee8 --- /dev/null +++ b/charts/vscode-pyspark/templates/secret-postgresql.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretPostgreSQL" . }} diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml index 961546b93..df60cec8b 100644 --- a/charts/vscode-pyspark/templates/statefulset.yaml +++ b/charts/vscode-pyspark/templates/statefulset.yaml @@ -45,11 +45,14 @@ spec: checksum/mlflow: {{ include (print $.Template.BasePath "/secret-mlflow.yaml") . | sha256sum }} {{- end }} {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} - checksum/mlflow: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }} + 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 not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -283,6 +286,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameMLFlow" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + - secretRef: + name: {{ include "library-chart.secretNamePostgreSQL" . }} + {{- end }} {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} - secretRef: name: {{ include "library-chart.secretNameChromaDB" . }} diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json index c2f4f60d2..229bce77d 100644 --- a/charts/vscode-pyspark/values.schema.json +++ b/charts/vscode-pyspark/values.schema.json @@ -640,6 +640,11 @@ "title": "Discover Milvus services", "type": "boolean", "default": true + }, + "postgresql": { + "title": "Discover PostgreSQL services", + "type": "boolean", + "default": true } } }, diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml index 4bb3cbcff..62be0c342 100644 --- a/charts/vscode-pyspark/values.yaml +++ b/charts/vscode-pyspark/values.yaml @@ -116,6 +116,7 @@ discovery: metaflow: true chromadb: true milvus: true + postgresql: true hive: secretName: "" @@ -132,6 +133,9 @@ chromadb: milvus: secretName: "" +postgresql: + secretName: "" + coresite: secretName: "" diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml index 33f828581..8bc90c929 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.3.14 +version: 2.3.15 dependencies: - name: library-chart - version: 1.7.5 + version: 1.7.7 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-python/templates/secret-postgresql.yaml b/charts/vscode-python/templates/secret-postgresql.yaml new file mode 100644 index 000000000..cf056bee8 --- /dev/null +++ b/charts/vscode-python/templates/secret-postgresql.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretPostgreSQL" . }} diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml index 15112455a..734f0c802 100644 --- a/charts/vscode-python/templates/statefulset.yaml +++ b/charts/vscode-python/templates/statefulset.yaml @@ -44,6 +44,9 @@ spec: {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }} checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }} {{- end }} @@ -225,6 +228,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameMLFlow" . }} {{- end }} + {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }} + - secretRef: + name: {{ include "library-chart.secretNamePostgreSQL" . }} + {{- end }} {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }} - secretRef: name: {{ include "library-chart.secretNameChromaDB" . }} diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json index b0bbddaa5..a8c87b99f 100644 --- a/charts/vscode-python/values.schema.json +++ b/charts/vscode-python/values.schema.json @@ -645,6 +645,11 @@ "title": "Discover Milvus services", "type": "boolean", "default": true + }, + "postgresql": { + "title": "Discover PostgreSQL services", + "type": "boolean", + "default": true } } }, diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml index b2a795593..fdffcbd38 100644 --- a/charts/vscode-python/values.yaml +++ b/charts/vscode-python/values.yaml @@ -80,6 +80,7 @@ discovery: metaflow: true chromadb: true milvus: true + postgresql: true hive: secretName: "" @@ -99,6 +100,9 @@ milvus: coresite: secretName: "" +postgresql: + secretName: "" + # This is a YAML-formatted file. # Declare variables to be passed into your templates. replicaCount: 1 From fc9c4448b84475a956ea5ac746b875961c46561b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 09:30:37 +0200 Subject: [PATCH 3/5] Update Helm release library-chart to v1.7.6 (#243) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- charts/jupyter-pyspark/Chart.yaml | 6 +++++- charts/jupyter-python/Chart.yaml | 6 +++++- charts/rstudio-sparkr/Chart.yaml | 6 +++++- charts/rstudio/Chart.yaml | 6 +++++- charts/vscode-pyspark/Chart.yaml | 6 +++++- charts/vscode-python/Chart.yaml | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 1dccce421..6b86754bf 100644 --- a/charts/jupyter-pyspark/Chart.yaml +++ b/charts/jupyter-pyspark/Chart.yaml @@ -24,8 +24,12 @@ 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.3.13 +version: 2.3.14 dependencies: - name: library-chart +<<<<<<< HEAD version: 1.7.7 +======= + version: 1.7.6 +>>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml index 17770750b..6813f3181 100644 --- a/charts/jupyter-python/Chart.yaml +++ b/charts/jupyter-python/Chart.yaml @@ -22,8 +22,12 @@ 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.3.15 +version: 2.3.16 dependencies: - name: library-chart +<<<<<<< HEAD version: 1.7.7 +======= + version: 1.7.6 +>>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 9a9fe7e17..6f890f7e6 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -23,8 +23,12 @@ 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.3.8 +version: 2.3.9 dependencies: - name: library-chart +<<<<<<< HEAD version: 1.7.7 +======= + version: 1.7.6 +>>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index 7abfc8960..5c4e5e5fb 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/Chart.yaml @@ -22,8 +22,12 @@ 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.3.9 +version: 2.3.10 dependencies: - name: library-chart +<<<<<<< HEAD version: 1.7.7 +======= + version: 1.7.6 +>>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index 694184868..296314bc6 100644 --- a/charts/vscode-pyspark/Chart.yaml +++ b/charts/vscode-pyspark/Chart.yaml @@ -24,8 +24,12 @@ 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.3.13 +version: 2.3.14 dependencies: - name: library-chart +<<<<<<< HEAD version: 1.7.7 +======= + version: 1.7.6 +>>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml index 8bc90c929..b25c98e2d 100644 --- a/charts/vscode-python/Chart.yaml +++ b/charts/vscode-python/Chart.yaml @@ -22,8 +22,12 @@ 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.3.15 +version: 2.3.16 dependencies: - name: library-chart +<<<<<<< HEAD version: 1.7.7 +======= + version: 1.7.6 +>>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services From fb5b08af2855c771cc6eabcc2125bef197cb7574 Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Wed, 2 Jul 2025 15:23:40 +0200 Subject: [PATCH 4/5] Fixed failed rebase --- charts/jupyter-pyspark/Chart.yaml | 4 ---- charts/jupyter-python/Chart.yaml | 4 ---- charts/rstudio-sparkr/Chart.yaml | 4 ---- charts/rstudio/Chart.yaml | 4 ---- charts/vscode-pyspark/Chart.yaml | 4 ---- charts/vscode-python/Chart.yaml | 4 ---- 6 files changed, 24 deletions(-) diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 6b86754bf..6d28a6fb7 100644 --- a/charts/jupyter-pyspark/Chart.yaml +++ b/charts/jupyter-pyspark/Chart.yaml @@ -27,9 +27,5 @@ type: application version: 2.3.14 dependencies: - name: library-chart -<<<<<<< HEAD version: 1.7.7 -======= - version: 1.7.6 ->>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml index 6813f3181..928b8270b 100644 --- a/charts/jupyter-python/Chart.yaml +++ b/charts/jupyter-python/Chart.yaml @@ -25,9 +25,5 @@ type: application version: 2.3.16 dependencies: - name: library-chart -<<<<<<< HEAD version: 1.7.7 -======= - version: 1.7.6 ->>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 6f890f7e6..ba34ff1ad 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -26,9 +26,5 @@ type: application version: 2.3.9 dependencies: - name: library-chart -<<<<<<< HEAD version: 1.7.7 -======= - version: 1.7.6 ->>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index 5c4e5e5fb..f128871c6 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/Chart.yaml @@ -25,9 +25,5 @@ type: application version: 2.3.10 dependencies: - name: library-chart -<<<<<<< HEAD version: 1.7.7 -======= - version: 1.7.6 ->>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index 296314bc6..01fab6825 100644 --- a/charts/vscode-pyspark/Chart.yaml +++ b/charts/vscode-pyspark/Chart.yaml @@ -27,9 +27,5 @@ type: application version: 2.3.14 dependencies: - name: library-chart -<<<<<<< HEAD version: 1.7.7 -======= - version: 1.7.6 ->>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml index b25c98e2d..6b0a3fb39 100644 --- a/charts/vscode-python/Chart.yaml +++ b/charts/vscode-python/Chart.yaml @@ -25,9 +25,5 @@ type: application version: 2.3.16 dependencies: - name: library-chart -<<<<<<< HEAD version: 1.7.7 -======= - version: 1.7.6 ->>>>>>> 0f10d4d5 (Update Helm release library-chart to v1.7.6 (#243)) repository: https://inseefrlab.github.io/helm-charts-interactive-services From 091df501aff1ea1181336b672c963e5be58a5d7a Mon Sep 17 00:00:00 2001 From: Gaspard FEREY Date: Thu, 3 Jul 2025 13:51:12 +0200 Subject: [PATCH 5/5] Bumped library-chart version to latest --- charts/jupyter-pyspark/Chart.yaml | 2 +- charts/jupyter-python/Chart.yaml | 2 +- charts/rstudio-sparkr/Chart.yaml | 2 +- charts/rstudio/Chart.yaml | 2 +- charts/vscode-pyspark/Chart.yaml | 2 +- charts/vscode-python/Chart.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 6d28a6fb7..d3c9dabf7 100644 --- a/charts/jupyter-pyspark/Chart.yaml +++ b/charts/jupyter-pyspark/Chart.yaml @@ -27,5 +27,5 @@ type: application version: 2.3.14 dependencies: - name: library-chart - version: 1.7.7 + version: 1.7.11 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml index 928b8270b..296a8cd0c 100644 --- a/charts/jupyter-python/Chart.yaml +++ b/charts/jupyter-python/Chart.yaml @@ -25,5 +25,5 @@ type: application version: 2.3.16 dependencies: - name: library-chart - version: 1.7.7 + version: 1.7.11 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index ba34ff1ad..520ca529a 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -26,5 +26,5 @@ type: application version: 2.3.9 dependencies: - name: library-chart - version: 1.7.7 + version: 1.7.11 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index f128871c6..44f231495 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/Chart.yaml @@ -25,5 +25,5 @@ type: application version: 2.3.10 dependencies: - name: library-chart - version: 1.7.7 + version: 1.7.11 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index 01fab6825..159b42a1c 100644 --- a/charts/vscode-pyspark/Chart.yaml +++ b/charts/vscode-pyspark/Chart.yaml @@ -27,5 +27,5 @@ type: application version: 2.3.14 dependencies: - name: library-chart - version: 1.7.7 + version: 1.7.11 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml index 6b0a3fb39..7caec00b9 100644 --- a/charts/vscode-python/Chart.yaml +++ b/charts/vscode-python/Chart.yaml @@ -25,5 +25,5 @@ type: application version: 2.3.16 dependencies: - name: library-chart - version: 1.7.7 + version: 1.7.11 repository: https://inseefrlab.github.io/helm-charts-interactive-services