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
2 changes: 1 addition & 1 deletion charts/vscode-pyspark/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2.2.9
version: 2.2.10
dependencies:
- name: library-chart
version: 1.6.13
Expand Down
1 change: 1 addition & 0 deletions charts/vscode-pyspark/templates/secret-assistant.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretAssistant" . }}
14 changes: 14 additions & 0 deletions charts/vscode-pyspark/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ spec:
secret:
secretName: {{ include "library-chart.secretNameCacerts" . }}
{{- end }}
{{- if (.Values.userPreferences.aiAssistant).enabled }}
- name: secret-assistant
secret:
secretName: {{ include "library-chart.secretNameAssistant" . }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand All @@ -127,6 +132,10 @@ spec:
- -c
- |
echo 'initContainer make-secrets-writable is started';
{{ if (.Values.userPreferences.aiAssistant).enabled }}
mkdir /dest/continue
cp /src/continue/config.yaml /dest/continue/config.yaml
{{- end }}
{{- if .Values.s3.enabled }}
mkdir /dest/coresite;
cp /src/coresite/core-site.xml /dest/coresite/core-site.xml;
Expand Down Expand Up @@ -157,6 +166,11 @@ spec:
awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "/dest/cacerts/cert." c ".crt"}' < /tmp/ca.pem;
{{- end }}
volumeMounts:
{{ if (.Values.userPreferences.aiAssistant).enabled }}
- mountPath: /home/{{ .Values.environment.user }}/.continue
subPath: continue
name: config-files
{{- end }}
- name: config-files
mountPath: /dest
{{- if (.Values.certificates).cacerts }}
Expand Down
57 changes: 57 additions & 0 deletions charts/vscode-pyspark/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,63 @@
"hidden": true,
"overwriteDefaultWith": "user.lang"
}
},
"aiAssistant":{
"type": "object",
"description": "Configure Continue, an extension to use custom AI code assistants",
"x-onyxia": {
"overwriteSchemaWith": "aiAssistant.json"
},
"properties": {
"enabled": {
"type": "boolean",
"default": false,
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.enabled"
}
},
"model": {
"type": "string",
"default":"",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.model"
}
},
"provider": {
"type": "string",
"default": "",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.provider"
}
},
"apiBase":{
"type": "string",
"default": "",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.apiBase"
}
},
"apiKey":{
"type": "string",
"default": "",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.apiKey"
}
},
"useLegacyCompletionsEndpoint":{
"type": "boolean",
"default": true,
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.useLegacyCompletionsEndpoint"
}
}
}
}
}
},
Expand Down
8 changes: 8 additions & 0 deletions charts/vscode-pyspark/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ startupProbe:
userPreferences:
darkMode: false
language: "en"
aiAssistant:
enabled: false
model: ""
provider: ""
apiBase: ""
apiKey: ""
secretName: "" # Generated based on the service's name if empty or not set
useLegacyCompletionsEndpoint: false

certificates: {}
# pathToCaBundle: /usr/local/share/ca-certificates/
Expand Down
2 changes: 1 addition & 1 deletion charts/vscode-python/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2.2.9
version: 2.2.10
dependencies:
- name: library-chart
version: 1.6.13
Expand Down
1 change: 1 addition & 0 deletions charts/vscode-python/templates/secret-assistant.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.secretAssistant" . }}
14 changes: 14 additions & 0 deletions charts/vscode-python/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ spec:
secret:
secretName: {{ include "library-chart.secretNameCacerts" . }}
{{- end }}
{{- if (.Values.userPreferences.aiAssistant).enabled }}
- name: secret-assistant
secret:
secretName: {{ include "library-chart.secretNameAssistant" . }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand All @@ -103,6 +108,10 @@ spec:
- -c
- |
echo 'initContainer make-secrets-writable is started';
{{ if (.Values.userPreferences.aiAssistant).enabled }}
mkdir /dest/continue
cp /src/continue/config.yaml /dest/continue/config.yaml
{{- end }}
{{- if .Values.discovery.hive }}
mkdir /dest/hive;
cp /src/hive/hive-site.xml /dest/hive/hive-site.xml;
Expand All @@ -121,6 +130,11 @@ spec:
awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "/dest/cacerts/cert." c ".crt"}' < /tmp/ca.pem;
{{- end }}
volumeMounts:
{{ if (.Values.userPreferences.aiAssistant).enabled }}
- mountPath: /home/{{ .Values.environment.user }}/.continue
subPath: continue
name: config-files
{{- end }}
- name: config-files
mountPath: /dest
{{- if and .Values.certificates .Values.certificates.cacerts }}
Expand Down
57 changes: 57 additions & 0 deletions charts/vscode-python/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,63 @@
"hidden": true,
"overwriteDefaultWith": "user.lang"
}
},
"aiAssistant":{
"type": "object",
"description": "Configure Continue, an extension to use custom AI code assistants",
"x-onyxia": {
"overwriteSchemaWith": "aiAssistant.json"
},
"properties": {
"enabled": {
"type": "boolean",
"default": false,
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.enabled"
}
},
"model": {
"type": "string",
"default":"",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.model"
}
},
"provider": {
"type": "string",
"default": "",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.provider"
}
},
"apiBase":{
"type": "string",
"default": "",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.apiBase"
}
},
"apiKey":{
"type": "string",
"default": "",
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.apiKey"
}
},
"useLegacyCompletionsEndpoint":{
"type": "boolean",
"default": true,
"hidden": true,
"x-onyxia": {
"overwriteDefaultWith": "user.profile.aiAssistant.useLegacyCompletionsEndpoint"
}
}
}
}
}
},
Expand Down
8 changes: 8 additions & 0 deletions charts/vscode-python/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,14 @@ startupProbe:
userPreferences:
darkMode: false
language: "en"
aiAssistant:
enabled: false
model: ""
provider: ""
apiBase: ""
apiKey: ""
secretName: "" # Generated based on the service's name if empty or not set
useLegacyCompletionsEndpoint: false

openshiftSCC:
enabled: false
Expand Down
Loading