From e41b4559e612b40bb39173c9c68f0e2afb157f9d Mon Sep 17 00:00:00 2001 From: avouacr Date: Fri, 27 Oct 2023 09:45:12 +0000 Subject: [PATCH] NOTES in fr/en --- .gitignore | 170 +++++++++++++++++++++++ charts/redash/Chart.yaml | 9 +- charts/redash/templates/NOTES.txt | 14 ++ charts/superset/Chart.yaml | 4 +- charts/superset/templates/NOTES.txt | 12 +- charts/superset/templates/_discovery.tpl | 1 + charts/superset/values.yaml | 4 +- 7 files changed, 201 insertions(+), 13 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a160b49 --- /dev/null +++ b/.gitignore @@ -0,0 +1,170 @@ +__pycache__/ +*.tgz +index.yaml +**/Chart.lock +utils/prepull-deployment-manifest.yaml +utils/prepull-daemon-manifest.yaml +**/nohup.out +**/prepull.log + + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ diff --git a/charts/redash/Chart.yaml b/charts/redash/Chart.yaml index 20c8bc6..a75e0d5 100644 --- a/charts/redash/Chart.yaml +++ b/charts/redash/Chart.yaml @@ -23,21 +23,20 @@ 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: 0.0.2 +version: 0.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1 +appVersion: "latest" + dependencies: - name: redash version: 3.0.0 repository: https://getredash.github.io/contrib-helm-chart/ - enabled: true - name: postgresql version: 11.6.15 repository: https://charts.bitnami.com/bitnami - enabled: true - name: library-chart - version: 1.0.3 + version: 1.5.15 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/redash/templates/NOTES.txt b/charts/redash/templates/NOTES.txt index 4e22509..c90a77a 100644 --- a/charts/redash/templates/NOTES.txt +++ b/charts/redash/templates/NOTES.txt @@ -1,3 +1,17 @@ +{{- if eq .Values.userPreferences.language "fr" }} +{{- if .Values.ingress.enabled }} +- Vous pouvez vous connecter à ce Redash en cliquant sur ce [lien](https://{{ .Values.ingress.hostname }}) + +*NOTES concernant la suppression :* + +- **Vous pouvez supprimer ce graphique en toute sécurité et en recréer un plus tard** +- Les volumes de données dans le postgresql associé ne seront pas supprimés +- Si vous démarrez un nouveau {{ .Chart.Name }}, il réutilisera ce volume en silence. +- Si vous souhaitez supprimer définitivement ce volume : `kubectl delete pvc data-{{ .Values.postgresql.fullnameOverride }}-0` + +{{- end }} + +{{- else }} {{- if .Values.ingress.enabled }} - You can connect to redash with your browser on this [link](https://{{ .Values.ingress.hostname }}) {{- end }} diff --git a/charts/superset/Chart.yaml b/charts/superset/Chart.yaml index d982996..e0d4f90 100644 --- a/charts/superset/Chart.yaml +++ b/charts/superset/Chart.yaml @@ -22,14 +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: 0.0.4 +version: 0.0.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "1" - dependencies: - name: superset version: 0.10.11 diff --git a/charts/superset/templates/NOTES.txt b/charts/superset/templates/NOTES.txt index f5f6dda..7953cb4 100644 --- a/charts/superset/templates/NOTES.txt +++ b/charts/superset/templates/NOTES.txt @@ -1,8 +1,14 @@ +{{- if eq .Values.userPreferences.language "fr" }} +{{- if .Values.ingress.enabled }} +- Vous pouvez vous connecter à ce Superset en cliquant sur ce [lien](https://{{ .Values.ingress.hostname }}) +- Le login est **{{ .Values.superset.init.adminUser.username }}** +- Le password est **{{ .Values.superset.init.adminUser.password }}** +{{- end }} + +{{- else }} {{- if .Values.ingress.enabled }} - You can connect to superset with your browser on this [link](https://{{ .Values.ingress.hostname }}) - The login is **{{ .Values.superset.init.adminUser.username }}** - The password is **{{ .Values.superset.init.adminUser.password }}** {{- end }} - - -**This chart is an alpha release, use it with caution** \ No newline at end of file +{{- end }} diff --git a/charts/superset/templates/_discovery.tpl b/charts/superset/templates/_discovery.tpl index 64fb312..c970f0f 100644 --- a/charts/superset/templates/_discovery.tpl +++ b/charts/superset/templates/_discovery.tpl @@ -13,6 +13,7 @@ Create the name of the config map S3 to use */}} {{- define "superset.discovery" -}} +{{- printf "# Enabling discovery of other services" | indent 2 }} {{- $postgres:= .Values.discovery.postgres }} {{- $elastic:= .Values.discovery.elastic }} {{- $trino:= .Values.discovery.trino }} diff --git a/charts/superset/values.yaml b/charts/superset/values.yaml index 11dddb6..06c6d29 100644 --- a/charts/superset/values.yaml +++ b/charts/superset/values.yaml @@ -74,5 +74,5 @@ ingress: # hosts: # - chart-example.local - - +userPreferences: + language: "en"