From 1fb44d614aac61d9405c80b21b0af9e8d455811b Mon Sep 17 00:00:00 2001 From: garronej Date: Sat, 2 Jul 2022 01:51:41 +0200 Subject: [PATCH] https://github.com/InseeFrLab/onyxia/issues/43 --- charts/jupyter/Chart.yaml | 2 +- charts/jupyter/values.schema.json | 11 ++++++++++- charts/jupyter/values.yaml | 1 + charts/library-chart/templates/_configmaps.tpl | 1 + charts/rstudio/Chart.yaml | 2 +- charts/rstudio/values.schema.json | 11 ++++++++++- charts/rstudio/values.yaml | 1 + charts/tensorflow/Chart.yaml | 2 +- charts/tensorflow/values.schema.json | 11 ++++++++++- charts/tensorflow/values.yaml | 1 + charts/ubuntu/Chart.yaml | 2 +- charts/ubuntu/values.schema.json | 11 ++++++++++- charts/ubuntu/values.yaml | 1 + charts/vscode/Chart.yaml | 2 +- charts/vscode/values.schema.json | 9 +++++++++ charts/vscode/values.yaml | 1 + 16 files changed, 60 insertions(+), 9 deletions(-) diff --git a/charts/jupyter/Chart.yaml b/charts/jupyter/Chart.yaml index d13a5e75..03beeacb 100644 --- a/charts/jupyter/Chart.yaml +++ b/charts/jupyter/Chart.yaml @@ -25,7 +25,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: 6.2.2 +version: 6.3.0 # 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 diff --git a/charts/jupyter/values.schema.json b/charts/jupyter/values.schema.json index 01b4cc24..61ec2736 100644 --- a/charts/jupyter/values.schema.json +++ b/charts/jupyter/values.schema.json @@ -339,7 +339,7 @@ }, "repository": { "type": "string", - "description": "projet", + "description": "Repository url", "default": "", "x-form": { "value": "{{git.project}}" @@ -348,6 +348,15 @@ "value": false, "path": "git/enabled" } + }, + "branch": { + "type": "string", + "description": "Brach automatically checkout", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } } } }, diff --git a/charts/jupyter/values.yaml b/charts/jupyter/values.yaml index a46bf2c0..2775455b 100644 --- a/charts/jupyter/values.yaml +++ b/charts/jupyter/values.yaml @@ -92,6 +92,7 @@ git: cache: "" token: "" repository: "" + branch: "" #active ou non la recherche d'un hiveMetastore dans le namespace # see configmap-hive.yaml et helpers template diff --git a/charts/library-chart/templates/_configmaps.tpl b/charts/library-chart/templates/_configmaps.tpl index 53f50a4a..c0a283ef 100644 --- a/charts/library-chart/templates/_configmaps.tpl +++ b/charts/library-chart/templates/_configmaps.tpl @@ -94,6 +94,7 @@ data: GIT_CREDENTIALS_CACHE_DURATION: "{{ .Values.git.cache }}" GIT_PERSONAL_ACCESS_TOKEN: "{{ .Values.git.token }}" GIT_REPOSITORY: "{{ .Values.git.repository }}" + GIT_BRANCH: "{{ .Values.git.branch }}" {{- end }} {{- end }} diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index 3b1ac748..a7eb0968 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/Chart.yaml @@ -23,7 +23,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: 6.3.5 +version: 6.4.0 dependencies: - name: library-chart diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json index a466bc7f..52861a6d 100644 --- a/charts/rstudio/values.schema.json +++ b/charts/rstudio/values.schema.json @@ -330,7 +330,7 @@ }, "repository": { "type": "string", - "description": "projet", + "description": "Repository url", "default": "", "x-form": { "value": "{{git.project}}" @@ -339,6 +339,15 @@ "value": false, "path": "git/enabled" } + }, + "branch": { + "type": "string", + "description": "Brach automatically checkout", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } } } }, diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml index 7e96b67d..1dcaca8b 100644 --- a/charts/rstudio/values.yaml +++ b/charts/rstudio/values.yaml @@ -96,6 +96,7 @@ git: cache: "" token: "" repository: "" + branch: "" # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/charts/tensorflow/Chart.yaml b/charts/tensorflow/Chart.yaml index 9496bc4f..19e6d7b6 100644 --- a/charts/tensorflow/Chart.yaml +++ b/charts/tensorflow/Chart.yaml @@ -24,7 +24,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: 4.7.0 +version: 4.8.0 # 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 diff --git a/charts/tensorflow/values.schema.json b/charts/tensorflow/values.schema.json index 7ed49f43..a7584905 100644 --- a/charts/tensorflow/values.schema.json +++ b/charts/tensorflow/values.schema.json @@ -303,7 +303,7 @@ }, "repository": { "type": "string", - "description": "projet", + "description": "Repository url", "default": "", "x-form": { "value": "{{git.project}}" @@ -312,6 +312,15 @@ "value": false, "path": "git/enabled" } + }, + "branch": { + "type": "string", + "description": "Brach automatically checkout", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } } } }, diff --git a/charts/tensorflow/values.yaml b/charts/tensorflow/values.yaml index bfe22cd1..0ba3a5ea 100644 --- a/charts/tensorflow/values.yaml +++ b/charts/tensorflow/values.yaml @@ -67,6 +67,7 @@ git: cache: "" token: "" repository: "" + branch: "" # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/charts/ubuntu/Chart.yaml b/charts/ubuntu/Chart.yaml index 9a704973..d820f083 100644 --- a/charts/ubuntu/Chart.yaml +++ b/charts/ubuntu/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: 5.0.12 +version: 5.1.0 # 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 diff --git a/charts/ubuntu/values.schema.json b/charts/ubuntu/values.schema.json index 5709dfcd..2ead9cdc 100644 --- a/charts/ubuntu/values.schema.json +++ b/charts/ubuntu/values.schema.json @@ -292,7 +292,7 @@ }, "repository": { "type": "string", - "description": "projet", + "description": "Repository url", "default": "", "x-form": { "value": "{{git.project}}" @@ -301,6 +301,15 @@ "value": false, "path": "git/enabled" } + }, + "branch": { + "type": "string", + "description": "Brach automatically checkout", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } } } }, diff --git a/charts/ubuntu/values.yaml b/charts/ubuntu/values.yaml index 79f9c375..5eb20cbe 100644 --- a/charts/ubuntu/values.yaml +++ b/charts/ubuntu/values.yaml @@ -69,6 +69,7 @@ git: cache: "" token: "" repository: "" + branch: "" # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/charts/vscode/Chart.yaml b/charts/vscode/Chart.yaml index f8085eae..c6ffb5d3 100644 --- a/charts/vscode/Chart.yaml +++ b/charts/vscode/Chart.yaml @@ -23,7 +23,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: 6.7.0 +version: 6.8.0 # 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 diff --git a/charts/vscode/values.schema.json b/charts/vscode/values.schema.json index 73ad505c..9cdeb792 100644 --- a/charts/vscode/values.schema.json +++ b/charts/vscode/values.schema.json @@ -302,6 +302,15 @@ "value": false, "path": "git/enabled" } + }, + "branch": { + "type": "string", + "description": "Brach automatically checkout", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } } } }, diff --git a/charts/vscode/values.yaml b/charts/vscode/values.yaml index 4bc1d391..b49ccff5 100644 --- a/charts/vscode/values.yaml +++ b/charts/vscode/values.yaml @@ -60,6 +60,7 @@ git: name: "" email: "" cache: "" + branch: "" # This is a YAML-formatted file. # Declare variables to be passed into your templates.