Prepare release v2.2.1 (#3600)

Signed-off-by: Andrey Velichkevich <[email protected]>

CHANGELOG/CHANGELOG-2.2.md

@@ -1,3 +1,34 @@
+# [v2.2.1](https://github.com/kubeflow/trainer/releases/tag/v2.2.1) (2026-06-16)
+
+## 🚀 Features
+
+- feat(ci): automate release process (#3536) ([#3590](https://github.com/kubeflow/trainer/pull/3590) by @Krishna-kg732)
+- feat: update k8s to 0.36 for release-2.2 ([#3514](https://github.com/kubeflow/trainer/pull/3514) by @kannon92)
+
+## 🐛 Bug Fixes
+
+- [release-2.2] fix(ci): Update Python API models version in make release ([#3622](https://github.com/kubeflow/trainer/pull/3622) by @andreyvelich)
+- [release-2.2] fix(ci): Guard git-cliff against empty user names ([#3598](https://github.com/kubeflow/trainer/pull/3598) by @andreyvelich)
+- [release-2.2] fix(ci): Fix git-cliff for patch release Changelog (#3591) ([#3593](https://github.com/kubeflow/trainer/pull/3593) by @andreyvelich)
+- [release-2.2] fix(examples): use namespaced SQuAD dataset (#3560) ([#3592](https://github.com/kubeflow/trainer/pull/3592) by @XploY04)
+- [release-2.2] fix(api): allow atomic RuntimePatches update on unsuspend ([#3489](https://github.com/kubeflow/trainer/pull/3489) by @NarayanaSabari)
+- [release-2.2] fix(manifests): Use released version for JobSet and LWS images ([#3453](https://github.com/kubeflow/trainer/pull/3453) by @andreyvelich)
+
+## ⚙️ Miscellaneous Tasks
+
+- chore(ci): Remove Trivy Action (#3389) ([#3391](https://github.com/kubeflow/trainer/pull/3391) by @andreyvelich)
+
+# [v2.2.1](https://github.com/kubeflow/trainer/releases/tag/v2.2.1) (2026-06-16)
+
+## 🚀 Features
+
+- feat(ci): automate release process (#3536) ([#3590](https://github.com/kubeflow/trainer/pull/3590) by @andreyvelich)
+- feat: update k8s to 0.36 for release-2.2 ([#3514](https://github.com/kubeflow/trainer/pull/3514) by @kannon92)
+
+## ⚙️ Miscellaneous Tasks
+
+- chore(ci): Remove Trivy Action (#3389) ([#3391](https://github.com/kubeflow/trainer/pull/3391) by @andreyvelich)
+
 # [v2.2.0](https://github.com/kubeflow/trainer/tree/v2.2.0) (2026-03-19)
 
 This is Kubeflow Trainer v2.2.0 release.

Makefile

@@ -263,8 +263,7 @@ release: ## Create a release commit. Usage: make release VERSION=vX.Y.Z [GITHUB_
 		MAJOR_MINOR=$$(echo "$(VERSION)" | sed 's/^v//' | cut -d. -f1,2); \
 		CHANGELOG_PATH="CHANGELOG/CHANGELOG-$$MAJOR_MINOR.md"; \
 		RELEASE_BRANCH="release-$$MAJOR_MINOR"; \
-		RELEASE_SHA=$$(git rev-parse --verify --quiet "refs/heads/$$RELEASE_BRANCH" \
-			|| git rev-parse --verify --quiet "refs/remotes/upstream/$$RELEASE_BRANCH"); \
+		RELEASE_SHA=$$(git rev-parse --verify --quiet "refs/remotes/upstream/$$RELEASE_BRANCH"); \
 		if [ -n "$$RELEASE_SHA" ]; then \
 			PREV_TAG=$$(git describe --tags --abbrev=0 --match 'v[0-9]*' --exclude '*rc*' "$$RELEASE_SHA" 2>/dev/null || true); \
 			if [ -n "$$PREV_TAG" ]; then \

VERSION

@@ -1 +1 @@
-v2.2.0
+v2.2.1

api/python_api/kubeflow_trainer_api/__init__.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"

cliff.toml

@@ -60,9 +60,9 @@ ignore_tags = ".*-(alpha|beta|rc).*"
 
 # Manually define groups based on conventional patterns
 commit_parsers = [
-   { message = "^feat(\\(.*\\))?:", group = "🚀 Features" },
-   { message = "^fix(\\(.*\\))?:", group = "🐛 Bug Fixes" },
-   { message = "^chore(\\(.*\\))?:", group = "⚙️ Miscellaneous Tasks" },
-   { message = "^revert(\\(.*\\))?:", group = "⏪ Reverts" },
+   { message = "^(\\[[^]]+\\]\\s*)?feat(\\(.*\\))?:", group = "🚀 Features" },
+   { message = "^(\\[[^]]+\\]\\s*)?fix(\\(.*\\))?:", group = "🐛 Bug Fixes" },
+   { message = "^(\\[[^]]+\\]\\s*)?chore(\\(.*\\))?:", group = "⚙️ Miscellaneous Tasks" },
+   { message = "^(\\[[^]]+\\]\\s*)?revert(\\(.*\\))?:", group = "⏪ Reverts" },
    { message = ".*", skip = true },
 ]