Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/jupyter-pyspark/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13
version: 2.3.14
dependencies:
- name: library-chart
version: 1.7.6
version: 1.7.11
repository: https://inseefrlab.github.io/helm-charts-interactive-services
1 change: 1 addition & 0 deletions charts/jupyter-pyspark/templates/secret-postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretPostgreSQL" . }}
7 changes: 7 additions & 0 deletions charts/jupyter-pyspark/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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" . }}
Expand Down
5 changes: 5 additions & 0 deletions charts/jupyter-pyspark/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,11 @@
"title": "Discover Milvus services",
"type": "boolean",
"default": true
},
"postgresql": {
"title": "Discover PostgreSQL services",
"type": "boolean",
"default": true
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions charts/jupyter-pyspark/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ discovery:
metaflow: true
chromadb: true
milvus: true
postgresql: true

hive:
secretName: ""
Expand All @@ -132,6 +133,9 @@ chromadb:
milvus:
secretName: ""

postgresql:
secretName: ""

coresite:
secretName: ""

Expand Down
4 changes: 2 additions & 2 deletions charts/jupyter-python/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.15
version: 2.3.16
dependencies:
- name: library-chart
version: 1.7.6
version: 1.7.11
repository: https://inseefrlab.github.io/helm-charts-interactive-services
1 change: 1 addition & 0 deletions charts/jupyter-python/templates/secret-postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretPostgreSQL" . }}
7 changes: 7 additions & 0 deletions charts/jupyter-python/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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" . }}
Expand Down
5 changes: 5 additions & 0 deletions charts/jupyter-python/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,11 @@
"title": "Discover Milvus services",
"type": "boolean",
"default": true
},
"postgresql": {
"title": "Discover PostgreSQL services",
"type": "boolean",
"default": true
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions charts/jupyter-python/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ discovery:
metaflow: true
chromadb: true
milvus: true
postgresql: true

hive:
secretName: ""
Expand All @@ -101,6 +102,9 @@ chromadb:
milvus:
secretName: ""

postgresql:
secretName: ""

coresite:
secretName: ""

Expand Down
4 changes: 2 additions & 2 deletions charts/rstudio-sparkr/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
version: 2.3.9
dependencies:
- name: library-chart
version: 1.7.6
version: 1.7.11
repository: https://inseefrlab.github.io/helm-charts-interactive-services
1 change: 1 addition & 0 deletions charts/rstudio-sparkr/templates/secret-postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretPostgreSQL" . }}
7 changes: 7 additions & 0 deletions charts/rstudio-sparkr/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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" . }}
Expand Down
5 changes: 5 additions & 0 deletions charts/rstudio-sparkr/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,11 @@
"title": "Discover Hive Metastore services",
"type": "boolean",
"default": true
},
"postgresql": {
"title": "Discover PostgreSQL services",
"type": "boolean",
"default": true
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions charts/rstudio-sparkr/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,14 @@ git:

discovery:
hive: true
postgresql: true

hive:
secretName: ""

postgresql:
secretName: ""

coresite:
secretName: ""

Expand Down
4 changes: 2 additions & 2 deletions charts/rstudio/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
version: 2.3.10
dependencies:
- name: library-chart
version: 1.7.6
version: 1.7.11
repository: https://inseefrlab.github.io/helm-charts-interactive-services
1 change: 1 addition & 0 deletions charts/rstudio/templates/secret-postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretPostgreSQL" . }}
7 changes: 7 additions & 0 deletions charts/rstudio/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
11 changes: 11 additions & 0 deletions charts/rstudio/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions charts/rstudio/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ repository:
packageManagerUrl: ""
rRepository: ""

discovery:
postgresql: true

postgresql:
secretName: ""

replicaCount: 1

imagePullSecrets: []
Expand Down
4 changes: 2 additions & 2 deletions charts/vscode-pyspark/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13
version: 2.3.14
dependencies:
- name: library-chart
version: 1.7.6
version: 1.7.11
repository: https://inseefrlab.github.io/helm-charts-interactive-services
1 change: 1 addition & 0 deletions charts/vscode-pyspark/templates/secret-postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretPostgreSQL" . }}
9 changes: 8 additions & 1 deletion charts/vscode-pyspark/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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" . }}
Expand Down
5 changes: 5 additions & 0 deletions charts/vscode-pyspark/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,11 @@
"title": "Discover Milvus services",
"type": "boolean",
"default": true
},
"postgresql": {
"title": "Discover PostgreSQL services",
"type": "boolean",
"default": true
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions charts/vscode-pyspark/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ discovery:
metaflow: true
chromadb: true
milvus: true
postgresql: true

hive:
secretName: ""
Expand All @@ -132,6 +133,9 @@ chromadb:
milvus:
secretName: ""

postgresql:
secretName: ""

coresite:
secretName: ""

Expand Down
4 changes: 2 additions & 2 deletions charts/vscode-python/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.15
version: 2.3.16
dependencies:
- name: library-chart
version: 1.7.6
version: 1.7.11
repository: https://inseefrlab.github.io/helm-charts-interactive-services
1 change: 1 addition & 0 deletions charts/vscode-python/templates/secret-postgresql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretPostgreSQL" . }}
7 changes: 7 additions & 0 deletions charts/vscode-python/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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" . }}
Expand Down
5 changes: 5 additions & 0 deletions charts/vscode-python/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,11 @@
"title": "Discover Milvus services",
"type": "boolean",
"default": true
},
"postgresql": {
"title": "Discover PostgreSQL services",
"type": "boolean",
"default": true
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions charts/vscode-python/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ discovery:
metaflow: true
chromadb: true
milvus: true
postgresql: true

hive:
secretName: ""
Expand All @@ -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
Expand Down
Loading