From b9af6b833e3008cd29d07db5ceed1d62558f38a7 Mon Sep 17 00:00:00 2001 From: ihiverlet Date: Thu, 27 Jun 2024 14:59:48 +0000 Subject: [PATCH 1/3] rstudio & vscode - set one time password --- charts/rstudio-sparkr/Chart.yaml | 4 ++-- charts/rstudio-sparkr/values.schema.json | 2 +- charts/rstudio/Chart.yaml | 4 ++-- charts/rstudio/values.schema.json | 2 +- charts/vscode-pyspark/Chart.yaml | 4 ++-- charts/vscode-pyspark/values.schema.json | 2 +- charts/vscode-python/Chart.yaml | 2 +- charts/vscode-python/values.schema.json | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 75d72153..e5122b33 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -23,9 +23,9 @@ 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: 1.17.16 +version: 1.17.17 dependencies: - name: library-chart - version: 1.5.21 + version: 1.5.23 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json index 4fa97ec3..19249e4a 100644 --- a/charts/rstudio-sparkr/values.schema.json +++ b/charts/rstudio-sparkr/values.schema.json @@ -200,7 +200,7 @@ "default": "changeme", "render": "password", "x-onyxia": { - "overwriteDefaultWith": "{{project.password}}" + "overwriteDefaultWith": "{{service.oneTimePassword}}" } }, "allowlist": { diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index b415d35b..85ec3f5c 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/Chart.yaml @@ -22,9 +22,9 @@ 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: 1.15.26 +version: 1.15.27 dependencies: - name: library-chart - version: 1.5.21 + version: 1.5.23 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json index ec142148..52bb00a3 100644 --- a/charts/rstudio/values.schema.json +++ b/charts/rstudio/values.schema.json @@ -190,7 +190,7 @@ "default": "changeme", "render": "password", "x-onyxia": { - "overwriteDefaultWith": "{{project.password}}" + "overwriteDefaultWith": "{{service.oneTimePassword}}" } }, "allowlist": { diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index 7f49fef0..0d4ebea3 100644 --- a/charts/vscode-pyspark/Chart.yaml +++ b/charts/vscode-pyspark/Chart.yaml @@ -24,9 +24,9 @@ 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: 1.3.35 +version: 1.3.36 dependencies: - name: library-chart - version: 1.5.21 + version: 1.5.23 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json index 3cbbf268..78893cca 100644 --- a/charts/vscode-pyspark/values.schema.json +++ b/charts/vscode-pyspark/values.schema.json @@ -258,7 +258,7 @@ "default": "changeme", "render": "password", "x-onyxia": { - "overwriteDefaultWith": "{{project.password}}" + "overwriteDefaultWith": "{{service.oneTimePassword}}" } }, "allowlist": { diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml index fab09de3..37af7697 100644 --- a/charts/vscode-python/Chart.yaml +++ b/charts/vscode-python/Chart.yaml @@ -22,7 +22,7 @@ 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: 1.11.36 +version: 1.11.37 dependencies: - name: library-chart diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json index f0e2e45a..33518291 100644 --- a/charts/vscode-python/values.schema.json +++ b/charts/vscode-python/values.schema.json @@ -214,7 +214,7 @@ "default": "changeme", "render": "password", "x-onyxia": { - "overwriteDefaultWith": "{{project.password}}" + "overwriteDefaultWith": "{{service.oneTimePassword}}" } }, "allowlist": { From b1a25dd6af6d3e64ce74abe4df82a37aa3ee3ad1 Mon Sep 17 00:00:00 2001 From: ihiverlet Date: Tue, 2 Jul 2024 12:49:03 +0000 Subject: [PATCH 2/3] fix notes.txt --- charts/rstudio-sparkr/templates/NOTES.txt | 4 ++-- charts/rstudio/templates/NOTES.txt | 4 ++-- charts/vscode-pyspark/templates/NOTES.txt | 4 ++-- charts/vscode-python/templates/NOTES.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/rstudio-sparkr/templates/NOTES.txt b/charts/rstudio-sparkr/templates/NOTES.txt index 866880b2..10e0b6a8 100644 --- a/charts/rstudio-sparkr/templates/NOTES.txt +++ b/charts/rstudio-sparkr/templates/NOTES.txt @@ -12,7 +12,7 @@ {{- end }} {{- end }} - Le nom d'utilisateur est **{{ .Values.environment.user }}** -- Le mot de passe est **{{ .Values.security.password }}** +- Votre token: {{ .Values.security.password }} {{- if .Values.ingress.enabled }} {{- if .Values.networking.user.enabled }} @@ -49,7 +49,7 @@ Si vous n'exécutez pas votre service personnalisé, vous obtiendrez une erreur {{- end }} {{- end }} - The login is **{{ .Values.environment.user }}** -- The password is **{{ .Values.security.password }}** +- Your password: {{ .Values.security.password }} {{- if .Values.ingress.enabled }} {{- if .Values.networking.user.enabled }} diff --git a/charts/rstudio/templates/NOTES.txt b/charts/rstudio/templates/NOTES.txt index 9e99e675..3ff0fe97 100644 --- a/charts/rstudio/templates/NOTES.txt +++ b/charts/rstudio/templates/NOTES.txt @@ -6,7 +6,7 @@ - Vous pouvez vous connecter à ce RStudio avec votre navigateur sur ce [lien](https://{{ .Values.route.hostname }}) {{- end }} - Le nom d'utilisateur est {{ .Values.environment.user }} -- Le mot de passe est **{{ .Values.security.password }}** +- votre token: {{ .Values.security.password }} {{- if .Values.ingress.enabled }} {{- if .Values.networking.user.enabled }} @@ -37,7 +37,7 @@ - You can connect to this rstudio with your browser on this [link](https://{{ .Values.route.hostname }}) {{- end }} - The login is **{{ .Values.environment.user }}** -- The password is **{{ .Values.security.password }}** +- Your password: {{ .Values.security.password }} {{- if .Values.ingress.enabled }} {{- if .Values.networking.user.enabled }} diff --git a/charts/vscode-pyspark/templates/NOTES.txt b/charts/vscode-pyspark/templates/NOTES.txt index acac3f6f..720eb074 100644 --- a/charts/vscode-pyspark/templates/NOTES.txt +++ b/charts/vscode-pyspark/templates/NOTES.txt @@ -12,7 +12,7 @@ {{- end }} {{- end }} - Le nom d'utilisateur est **{{ .Values.environment.user }}** -- Le mot de passe est **{{ .Values.security.password }}** +- Votre token: {{ .Values.security.password }} {{- if .Values.ingress.enabled }} {{- if .Values.networking.user.enabled }} @@ -49,7 +49,7 @@ Si vous n'exécutez pas votre service personnalisé, vous obtiendrez une erreur {{- end }} {{- end }} - The login is **{{ .Values.environment.user }}** -- The password is **{{ .Values.security.password }}** +- Your password: {{ .Values.security.password }} {{- if .Values.ingress.enabled }} {{- if .Values.networking.user.enabled }} diff --git a/charts/vscode-python/templates/NOTES.txt b/charts/vscode-python/templates/NOTES.txt index 193d1b78..94982a54 100644 --- a/charts/vscode-python/templates/NOTES.txt +++ b/charts/vscode-python/templates/NOTES.txt @@ -13,7 +13,7 @@ Si vous n'exécutez pas votre service personnalisé, vous obtiendrez une erreur Si vous n'exécutez pas votre service personnalisé, vous obtiendrez une erreur 502 Bad Gateway. {{- end }} {{- end }} -- Votre jeton d'accès est **{{ .Values.security.password }}** +- Votre token: {{ .Values.security.password }} {{- else }} {{- if .Values.ingress.enabled }} - You can connect to this vscode with your browser on this [link](http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .Values.ingress.hostname }}) @@ -29,5 +29,5 @@ If you don't run your custom service you will get a 502 bad gateway error. If you don't run your custom service you will get a 502 bad gateway error. {{- end }} {{- end }} -- Your access token is **{{ .Values.security.password }}** +- Your password: {{ .Values.security.password }} {{- end }} \ No newline at end of file From 9e4479ab7ba7148f12cc330128cba0cb747890d8 Mon Sep 17 00:00:00 2001 From: ihiverlet Date: Tue, 2 Jul 2024 12:51:26 +0000 Subject: [PATCH 3/3] add new line --- charts/vscode-python/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml index 37e01acb..628ba497 100644 --- a/charts/vscode-python/values.yaml +++ b/charts/vscode-python/values.yaml @@ -206,4 +206,4 @@ userPreferences: openshiftSCC: enabled: false - scc: "" \ No newline at end of file + scc: ""