Merge branch 'main' into patch-1

This commit is contained in:
Joe Previte 2021-05-21 10:46:41 -07:00 committed by GitHub
commit ee78c31b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 65 additions and 2 deletions

View File

@ -26,3 +26,7 @@ updates:
# We can't use it until we switch to ESM across the project # We can't use it until we switch to ESM across the project
# See release notes: https://github.com/sindresorhus/xdg-basedir/releases/tag/v5.0.0 # See release notes: https://github.com/sindresorhus/xdg-basedir/releases/tag/v5.0.0
versions: ["5.x"] versions: ["5.x"]
- dependency-name: "limiter"
# 2.0.0 has breaking changes
# so we can't update yet.
versions: ["2.x"]

View File

@ -3,12 +3,14 @@
# Changelog # Changelog
- [Changelog](#changelog) - [Changelog](#changelog)
- [Next Version](#next-version)
- [New Features](#new-features)
- [3.10.1](#3101) - [3.10.1](#3101)
- [Bug Fixes](#bug-fixes) - [Bug Fixes](#bug-fixes)
- [Documentation](#documentation) - [Documentation](#documentation)
- [Development](#development) - [Development](#development)
- [3.10.0](#3100) - [3.10.0](#3100)
- [New Features](#new-features) - [New Features](#new-features-1)
- [Bug Fixes](#bug-fixes-1) - [Bug Fixes](#bug-fixes-1)
- [Documentation](#documentation-1) - [Documentation](#documentation-1)
- [Development](#development-1) - [Development](#development-1)
@ -51,6 +53,15 @@ VS Code v0.00.0
--> -->
## Next Version
VS Code v1.56.1
### New Features
- feat: support `extraInitContainers` in helm chart values
- feat: change `extraContainers` to support templating in helm chart
## 3.10.1 ## 3.10.1
VS Code v1.56.1 VS Code v1.56.1

View File

@ -65,6 +65,7 @@ and their default values.
| extraArgs | list | `[]` | | | extraArgs | list | `[]` | |
| extraConfigmapMounts | list | `[]` | | | extraConfigmapMounts | list | `[]` | |
| extraContainers | string | `""` | | | extraContainers | string | `""` | |
| extraInitContainers | string | `""` | |
| extraSecretMounts | list | `[]` | | | extraSecretMounts | list | `[]` | |
| extraVars | list | `[]` | | | extraVars | list | `[]` | |
| extraVolumeMounts | list | `[]` | | | extraVolumeMounts | list | `[]` | |
@ -115,3 +116,47 @@ $ helm upgrade --install code-server ci/helm-chart -f values.yaml
``` ```
> **Tip**: You can use the default [values.yaml](values.yaml) > **Tip**: You can use the default [values.yaml](values.yaml)
# Extra Containers
There are two parameters which allow to add more containers to pod.
Use `extraContainers` to add regular containers
and `extraInitContainers` to add init containers. You can read more
about init containers in [k8s documentation](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/).
Both parameters accept strings and use them as a templates
Example of using `extraInitContainers`:
``` yaml
extraInitContainers: |
- name: customization
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: IfNotPresent
env:
- name: SERVICE_URL
value: https://open-vsx.org/vscode/gallery
- name: ITEM_URL
value: https://open-vsx.org/vscode/item
command:
- sh
- -c
- |
code-server --install-extension ms-python.python
code-server --install-extension golang.Go
volumeMounts:
- name: data
mountPath: /home/coder
```
With this yaml in file `init.yaml`, you can execute
```console
$ helm upgrade --install code-server \
ci/helm-chart \
--values init.yaml
```
to deploy code-server with python and golang extensions preinstalled
before main container have started.

View File

@ -43,10 +43,13 @@ spec:
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /home/coder mountPath: /home/coder
{{- if .Values.extraInitContainers }}
{{ tpl .Values.extraInitContainers . | indent 6}}
{{- end }}
{{- end }} {{- end }}
containers: containers:
{{- if .Values.extraContainers }} {{- if .Values.extraContainers }}
{{ toYaml .Values.extraContainers | indent 8}} {{ tpl .Values.extraContainers . | indent 8}}
{{- end }} {{- end }}
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"