From e79570473fb7c9a1a777fdfacd0c9e234ddc59b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= <filip@gitpod.io>
Date: Tue, 6 Aug 2024 10:55:30 +0200
Subject: [PATCH] Add Node 22 and remove Node 21 (#1391)

---
 .github/promote-images.yml  |  2 ++
 .github/sync-containers.yml |  2 ++
 CHANGELOG.md                |  5 +++++
 README.md                   |  2 ++
 chunks/lang-node/chunk.yaml |  4 ++--
 dazzle.yaml                 | 14 +++++++++++++-
 tests/lang-node.yaml        |  2 +-
 7 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.github/promote-images.yml b/.github/promote-images.yml
index 058ce3726..b08831cb6 100644
--- a/.github/promote-images.yml
+++ b/.github/promote-images.yml
@@ -15,6 +15,8 @@
     workspace-node: "2024.*"
     workspace-node-lts: "2024.*"
     workspace-node-18: "2024.*"
+    workspace-node-20: "2024.*"
+    workspace-node-22: "2024.*"
     workspace-python: "2024.*"
     workspace-python-3.8: "2024.*"
     workspace-python-3.9: "2024.*"
diff --git a/.github/sync-containers.yml b/.github/sync-containers.yml
index 161f5192a..4d34ab3de 100644
--- a/.github/sync-containers.yml
+++ b/.github/sync-containers.yml
@@ -12,6 +12,8 @@ sync:
     - node
     - node-lts
     - node-18
+    - node-20
+    - node-22
     - python
     - python-3.8
     - python-3.9
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff365eac1..42059bcff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 A curated, chronologically ordered list of notable changes in [Gitpod's default workspace images](https://hub.docker.com/u/gitpod).
 
+## 2024-08-06
+
+- Introduce `workspace-node-20` and `workspace-node-22`
+- Deprecate `workspace-node-21` since it has reached EoL
+
 ## 2024-07-01
 
 - Bump Clang to `18` and enable ASAN Support.
diff --git a/README.md b/README.md
index 93a05c5a2..e163880c0 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,8 @@ Each contains a set of chunks: a common base and a language / tool. Every image
 - [`gitpod/workspace-node`](https://hub.docker.com/r/gitpod/workspace-node) ✅
 - [`gitpod/workspace-node-lts`](https://hub.docker.com/r/gitpod/workspace-node-lts) ✅
 - [`gitpod/workspace-node-18`](https://hub.docker.com/r/gitpod/workspace-node-18) ✅
+- [`gitpod/workspace-node-20`](https://hub.docker.com/r/gitpod/workspace-node-20) ✅
+- [`gitpod/workspace-node-22`](https://hub.docker.com/r/gitpod/workspace-node-22) ✅
 - [`gitpod/workspace-python`](https://hub.docker.com/r/gitpod/workspace-python) ✅
 - [`gitpod/workspace-python-3.8`](https://hub.docker.com/r/gitpod/workspace-python-3.8) ✅
 - [`gitpod/workspace-python-3.9`](https://hub.docker.com/r/gitpod/workspace-python-3.9) ✅
diff --git a/chunks/lang-node/chunk.yaml b/chunks/lang-node/chunk.yaml
index 8308d9228..a8b680b2b 100644
--- a/chunks/lang-node/chunk.yaml
+++ b/chunks/lang-node/chunk.yaml
@@ -5,6 +5,6 @@ variants:
   - name: "20"
     args:
       NODE_VERSION: 20.16.0
-  - name: "21"
+  - name: "22"
     args:
-      NODE_VERSION: 21.7.3
+      NODE_VERSION: 22.5.1
diff --git a/dazzle.yaml b/dazzle.yaml
index 5394580c6..a00e2f970 100644
--- a/dazzle.yaml
+++ b/dazzle.yaml
@@ -64,7 +64,7 @@ combiner:
       ref:
       - base
       chunks:
-        - lang-node:21
+        - lang-node:22
         - tool-chrome
     - name: node-lts
       ref:
@@ -78,6 +78,18 @@ combiner:
       chunks:
         - lang-node:18
         - tool-chrome
+    - name: node-20
+      ref:
+      - base
+      chunks:
+        - lang-node:20
+        - tool-chrome
+    - name: node-22
+      ref:
+      - base
+      chunks:
+        - lang-node:22
+        - tool-chrome
     - name: python-3.12
       ref:
       - base
diff --git a/tests/lang-node.yaml b/tests/lang-node.yaml
index 000cdc2e8..e3591c497 100644
--- a/tests/lang-node.yaml
+++ b/tests/lang-node.yaml
@@ -5,7 +5,7 @@
   - status == 0
   - stdout.indexOf("v18")  != -1 ||
     stdout.indexOf("v20")  != -1 ||
-    stdout.indexOf("v21")  != -1
+    stdout.indexOf("v22")  != -1
 - desc: it should have yarn
   command: [yarn --version]
   entrypoint: [bash, -i, -c]