From 530bb66d7c91db0113701025d39421d255bffb60 Mon Sep 17 00:00:00 2001 From: Tim Bordemann <7645199+timbrd@users.noreply.github.com> Date: Mon, 18 Jul 2022 21:27:54 +0200 Subject: [PATCH 1/5] Allow setting priorityClassName via helm chart (#5255) Co-authored-by: Joe Previte --- ci/helm-chart/templates/deployment.yaml | 3 +++ ci/helm-chart/values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ci/helm-chart/templates/deployment.yaml b/ci/helm-chart/templates/deployment.yaml index f137a9d2a..f36806553 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 }} diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 636a16951..ccc5b8a82 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 From 592973c1bbea7c948fc80a43e3416048ddcdeb5e Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 18 Jul 2022 16:37:35 -0500 Subject: [PATCH 2/5] fix: remove default memory limit (#5355) Having NODE_OPTIONS set is unexpected and although the later flag should override the previous flag it is not certain that will always be the case. Also some users are having issues with the 2 GB limit. --- src/node/wrapper.ts | 1 - 1 file changed, 1 deletion(-) 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"], }) From 033cdf23576ef2711c2f9caf337f776357097b31 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 14:37:54 -0700 Subject: [PATCH 3/5] chore(ci): update glob-parent (#5353) --- package.json | 3 ++- yarn.lock | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5fcdc3789..2cfa50352 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/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" From 23a18786defba8510cd0a891498877acfecbc127 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 14:38:07 -0700 Subject: [PATCH 4/5] refactor(ci): use release in branch release name (#5352) --- .github/workflows/npm-brew.yaml | 2 +- docs/MAINTAINING.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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/docs/MAINTAINING.md b/docs/MAINTAINING.md index 6ef0251ad..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.0) +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 From de317a09fe14787547a25756164d768d600d3e5a Mon Sep 17 00:00:00 2001 From: strowk Date: Mon, 18 Jul 2022 23:38:21 +0200 Subject: [PATCH 5/5] Allow more comprehensive affinity config (#5285) Co-authored-by: Timur Sultanaev Co-authored-by: Joe Previte --- ci/helm-chart/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-chart/templates/deployment.yaml b/ci/helm-chart/templates/deployment.yaml index f36806553..3a5e45166 100644 --- a/ci/helm-chart/templates/deployment.yaml +++ b/ci/helm-chart/templates/deployment.yaml @@ -119,7 +119,7 @@ spec: {{- end }} {{- with .Values.affinity }} affinity: - {{- toYaml . | nindent 8 }} + {{- tpl . $ | nindent 8 }} {{- end }} {{- with .Values.tolerations }} tolerations: