Merge branch 'main' into patch-2

Author: jsjoeio

CHANGELOG.md

@@ -1,175 +1,123 @@
 # Changelog
 
-<!--
+All notable changes to this project will be documented in this file.
 
-This should be updated on every PR.
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-We copy from here into the release notes.
+<!-- Example:
 
- -->
+## [9.99.999] - 9090-09-09
 
-<!--
-Add next version above previous version but below this line using the template
+VS Code v99.99.999
 
-## Next Version
+### Changed
+### Added
+### Deprecated
+### Removed
+### Fixed
+### Security
 
-VS Code v0.00.0
-
-### New Features
+-->
 
-- item
+## [Unreleased](https://github.com/cdr/code-server/releases)
 
-### Bug Fixes
+VS Code v1.63.0
 
-- fix(socket): did this thing #321 @githubuser
+code-server has been rebased on upstream's newly open-sourced server
+implementation (#4414).
 
-### Documentation
+### Changed
 
-- item
+- Web socket compression has been made the default (when supported). This means
+  the `--enable` flag will no longer take `permessage-deflate` as an option.
+- Extra extension directories have been removed. The `--extra-extensions-dir`
+  and `--extra-builtin-extensions-dir` will no longer be accepted.
+- The `--install-source` and `--locale` flags have been removed.
+- The static endpoint can no longer reach outside code-server. However the
+  vscode-remote-resource endpoint still can.
+- OpenVSX has been made the default marketplace. However this means web
+  extensions like Vim are now broken.
 
-### Development
+## [3.12.0](https://github.com/cdr/code-server/releases/tag/v3.12.0) - 2021-09-15
 
-- item
+VS Code v1.60.0
 
--->
+### Changed
 
-## Next Version
+- Upgrade VS Code to 1.60.0.
 
-VS Code v0.00.0
+### Fixed
 
-### New Features
+- Fix logout when using a base path (#3608).
 
-- item
+## [3.11.1](https://github.com/cdr/code-server/releases/tag/v3.11.1) - 2021-08-06
 
-### Bug Fixes
+Undocumented (see releases page).
 
-- Fix logout when using a base path (#3608)
+## [3.11.0](https://github.com/cdr/code-server/releases/tag/v3.11.0) - 2021-06-14
 
-### Documentation
+Undocumented (see releases page).
 
-- docs: add Pomerium #3424 @desimone
-- docs: fix confusing sentence in pull requests section #3460 @shiv-tyagi
-- docs: remove toc from changelog @oxy @jsjoeio
-- docs(MAINTAINING): add information about CHANGELOG #3467 @jsjoeio
-- docs: move release process to MAINTAINING.md #3441 @oxy @Prashant168
-- docs: format 'Caddy' from guide.md @PisecesPeng
+## [3.10.2](https://github.com/cdr/code-server/releases/tag/v3.10.2) - 2021-05-21
 
-### Development
+VS Code v1.56.1
 
-- chore: cross-compile docker images with buildx #3166 @oxy
-- chore: update node to v14 #3458 @oxy
-- chore: update .gitignore #3557 @cuining
-- fix: use sufficient computational effort for password hash #3422 @jsjoeio
-- docs(CONTRIBUTING): add section on testing #3629 @jsjoeio
+### Added
 
-### Development
+- Support `extraInitContainers` in helm chart values (#3393).
 
-- fix(publish): update cdrci fork in brew-bump.sh #3468 @jsjoeio
-- chore(dev): migrate away from parcel #3578 @jsjoeio
+### Changed
 
-## 3.10.2
+- Change `extraContainers` to support templating in helm chart (#3393).
 
-VS Code v1.56.1
+### Fixed
 
-### New Features
+- Fix "Open Folder" on welcome page (#3437).
 
-- feat: support `extraInitContainers` in helm chart values #3393 @strowk
-- feat: change `extraContainers` to support templating in helm chart #3393 @strowk
+## [3.10.1](https://github.com/cdr/code-server/releases/tag/v3.10.1) - 2021-05-17
 
-### Bug Fixes
+VS Code v1.56.1
 
-- fix: use correct command to Open Folder on Welcome page #3437 @jsjoeio
+### Fixed
 
-### Development
+- Check the logged user instead of $USER (#3330).
+- Fix broken node_modules.asar symlink in npm package (#3355).
+- Update cloud agent to fix version issue (#3342).
 
-- fix(ci): update brew-bump.sh to update remote first #3438 @jsjoeio
+### Changed
 
-## 3.10.1
+- Use xdgBasedir.runtime instead of tmp (#3304).
 
-VS Code v1.56.1
+## [3.10.0](https://github.com/cdr/code-server/releases/tag/v3.10.0) - 2021-05-10
 
-### Bug Fixes
+VS Code v1.56.0
 
-- fix: Check the logged user instead of $USER #3330 @videlanicolas
-- fix: Fix broken node_modules.asar symlink in npm package #3355 @code-asher
-- fix: Update cloud agent to fix version issue #3342 @oxy
+### Changed
 
-### Documentation
+- Update to VS Code 1.56.0 (#3269).
+- Minor connections refactor (#3178). Improves connection stability.
+- Use ptyHostService (#3308). This brings us closer to upstream VS Code.
 
-- docs(install): add raspberry pi section #3376 @jsjoeio
-- docs(maintaining): add pull requests section #3378 @jsjoeio
-- docs(maintaining): add merge strategies section #3379 @jsjoeio
-- refactor: move default PR template #3375 @jsjoeio
-- docs(contributing): add commits section #3377 @jsjoeio
+### Added
 
-### Development
+- Add flag for toggling permessage-deflate (#3286). The default is off so
+  compression will no longer be used by default. Use the --enable flag to
+  toggle it back on.
 
-- chore: ignore updates to microsoft/playwright-github-action
-- fix(socket): use xdgBasedir.runtime instead of tmp #3304 @jsjoeio
-- fix(ci): re-enable trivy-scan-repo #3368 @jsjoeio
+### Fixed
 
-## 3.10.0
+- Make rate limiter not count against successful logins (#3141).
+- Refactor logout (#3277). This fixes logging out in some scenarios.
+- Make sure directories exist (#3309). This fixes some errors on startup.
 
-VS Code v1.56.0
+### Security
 
-### New Features
-
-- feat: minor connections refactor #3178 @code-asher
-- feat(security): add code-scanning with CodeQL #3229 @jsjoeio
-- feat(ci): add trivy job for security #3261 @jsjoeio
-- feat(vscode): update to version 1.56.0 #3269 @oxy
-- feat: use ptyHostService #3308 @code-asher
-
-### Bug Fixes
-
-- fix(socket): did this thing #321 @githubuser
-- fix(login): rate limiter shouldn't count successful logins #3141 @jsjoeio
-- chore(lib/vscode): update netmask #3187 @oxy
-- chore(deps): update dependencies with CVEs #3223 @oxy
-- fix: refactor logout #3277 @code-asher
-- fix: add flag for toggling permessage-deflate #3286 @code-asher
-- fix: make sure directories exist #3309 @code-asher
-
-### Documentation
-
-- docs(FAQ): add mention of sysbox #3087 @bpmct
-- docs: add security policy #3148 @jsjoeio
-- docs(guide.md): add `caddy` example for serving from sub-path #3217 @catthehacker
-- docs: revamp debugging section #3224 @code-asher
-- docs(readme): refactor to use codecov shield #3227 @jsjoeio
-- docs(maintaining): use milestones over boards #3228 @jsjoeio
-- docs(faq): add entry for accessing OSX folders #3247 @bpmct
-- docs(termux): add workaround for Android backspace issue #3251 @jsjoeio
-- docs(maintaining): add triage to workflow #3284 @jsjoeio
-- docs(security): add section for tools #3287 @jsjoeio
-- docs(maintaining): add versioning #3288 @jsjoeio
-- docs: add changelog #3337 @jsjoeio
-
-### Development
-
-- fix(update-vscode): add check/docs for git-subtree #3129 @oxy
-- refactor(testing): migrate to playwright-test from jest-playwright #3133 @jsjoeio
-- refactor(ci): remove unmaintained CI images and update release workflow #3147 @oxy
-- chore(ci): migrate from hub to gh #3168 @oxy
-- feat(testing): add e2e tests for code-server and terminal #3169 @jsjoeio
-- chore(ranger): fix syntax for extension-request #3172 @oxy
-- feat(testing): add codecov to generate test coverage reports #3194 @jsjoeio
-- feat(testing): add tests for registerServiceWorker #3200 @jsjoeio
-- refactor(testing): fix flaky terminal test #3230 @jsjoeio
-- chore: ignore 15.x @types/node updates #3244 @jsjoeio
-- chore(build): compile vscode+extensions in parallel #3250 @oxy
-- fix(deps): remove eslint-plugin-jest-playwright #3260 @jsjoeio
-- fix(testing): reduce flakiness of terminal.test.ts and use 1 worker for e2e tests #3263 @jsjoeio
-- feat(testing): add isConnected check #3271 @jsjoeio
-- feat(testing): add test for src/node/constants.ts #3290 @jsjoeio
-- feat: test static route #3297 @code-asher
-- refactor(ci): split audit from prebuild #3298 @oxy
-- chore(lib/vscode): cleanup/update build deps #3314 @oxy
-- fix(build): download correct cloud-agent for arch #3331 @oxy
-- fix: xmldom and underscore #3332 @oxy
+- Update dependencies with CVEs (#3223).
 
 ## Previous versions
 
-This was added with `3.10.0`, which means any previous versions are not documented in the changelog.
+This was added with `3.10.0`, which means any previous versions are not
+documented in the changelog.
 
 To see those, please visit the [Releases page](https://github.com/cdr/code-server/releases).

ci/helm-chart/templates/deployment.yaml

@@ -142,6 +142,12 @@ spec:
           secretName: {{ .secretName }}
           defaultMode: {{ .defaultMode }}
       {{- end }}
+      {{- range .Values.extraConfigmapMounts }}
+      - name: {{ .name }}
+        configMap:
+          name: {{ .configMap }}
+          defaultMode: {{ .defaultMode }}
+      {{- end }}
       {{- range .Values.extraVolumeMounts }}
       - name: {{ .name }}
         {{- if .existingClaim }}