diff --git a/.github/workflows/npm-brew.yaml b/.github/workflows/npm-brew.yaml index 5df31ad99..822cd6921 100644 --- a/.github/workflows/npm-brew.yaml +++ b/.github/workflows/npm-brew.yaml @@ -31,7 +31,7 @@ jobs: uses: dawidd6/action-download-artifact@v2 id: download with: - branch: v${{ steps.version.outputs.version }} + branch: release/v${{ steps.version.outputs.version }} workflow: ci.yaml workflow_conclusion: completed name: "npm-package" diff --git a/ci/helm-chart/templates/deployment.yaml b/ci/helm-chart/templates/deployment.yaml index f137a9d2a..3a5e45166 100644 --- a/ci/helm-chart/templates/deployment.yaml +++ b/ci/helm-chart/templates/deployment.yaml @@ -25,6 +25,9 @@ spec: {{- if .Values.hostnameOverride }} hostname: {{ .Values.hostnameOverride }} {{- end }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName }} + {{- end }} {{- if .Values.securityContext.enabled }} securityContext: fsGroup: {{ .Values.securityContext.fsGroup }} @@ -116,7 +119,7 @@ spec: {{- end }} {{- with .Values.affinity }} affinity: - {{- toYaml . | nindent 8 }} + {{- tpl . $ | nindent 8 }} {{- end }} {{- with .Values.tolerations }} tolerations: diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 77e65b452..509eadd15 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -33,6 +33,8 @@ podAnnotations: {} podSecurityContext: {} # fsGroup: 2000 +priorityClassName: "" + service: type: ClusterIP port: 8080 diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index bf6238f33..18e3a8f0e 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -164,7 +164,8 @@ If you're the current release manager, follow these steps: ### Publishing a release -1. Create a new branch called `v0.0.0` (replace 0s with actual version aka v4.5.1) +1. Create a new branch called `release/v0.0.0` (replace 0s with actual version aka v4.5.0) + 1. If you don't do this, the `npm-brew` GitHub workflow will fail. It looks for the release artifacts under the branch pattern. 1. Run `yarn release:prep` and type in the new version (e.g., `3.8.1`) 1. GitHub Actions will generate the `npm-package`, `release-packages` and `release-images` artifacts. You do not have to wait for this step to complete diff --git a/package.json b/package.json index 75708339b..1bb923c29 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,8 @@ "follow-redirects": "^1.14.8", "node-fetch": "^2.6.7", "nanoid": "^3.1.31", - "minimist": "npm:minimist-lite@2.2.1" + "minimist": "npm:minimist-lite@2.2.1", + "glob-parent": "^6.0.1" }, "dependencies": { "@coder/logger": "1.1.16", diff --git a/src/node/wrapper.ts b/src/node/wrapper.ts index 40540d3b7..cf64f5741 100644 --- a/src/node/wrapper.ts +++ b/src/node/wrapper.ts @@ -322,7 +322,6 @@ export class ParentProcess extends Process { env: { ...process.env, CODE_SERVER_PARENT_PID: process.pid.toString(), - NODE_OPTIONS: `--max-old-space-size=2048 ${process.env.NODE_OPTIONS || ""}`, }, stdio: ["pipe", "pipe", "pipe", "ipc"], }) diff --git a/yarn.lock b/yarn.lock index 190abea71..2d5130452 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2032,12 +2032,12 @@ get-uri@3: fs-extra "^8.1.0" ftp "^0.3.10" -glob-parent@^5.1.0, glob-parent@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== +glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: - is-glob "^4.0.1" + is-glob "^4.0.3" glob@^7.1.3: version "7.1.6"