From 6c0a01772d819783d1287201a600541fc5d31631 Mon Sep 17 00:00:00 2001 From: Jason Plum Date: Tue, 2 Sep 2025 11:39:39 -0400 Subject: [PATCH] Revert "Merge branch 'update-canonical-with-security-changes' into 'master'" This reverts merge request !4492 --- CHANGELOG.md | 12 ------------ Chart.yaml | 2 +- charts/gitlab/charts/geo-logcursor/Chart.yaml | 2 +- charts/gitlab/charts/gitaly/Chart.yaml | 2 +- charts/gitlab/charts/gitlab-exporter/Chart.yaml | 2 +- charts/gitlab/charts/gitlab-pages/Chart.yaml | 2 +- charts/gitlab/charts/gitlab-shell/Chart.yaml | 2 +- charts/gitlab/charts/kas/Chart.yaml | 2 +- charts/gitlab/charts/mailroom/Chart.yaml | 2 +- charts/gitlab/charts/migrations/Chart.yaml | 2 +- charts/gitlab/charts/praefect/Chart.yaml | 2 +- charts/gitlab/charts/sidekiq/Chart.yaml | 2 +- charts/gitlab/charts/spamcheck/Chart.yaml | 2 +- charts/gitlab/charts/toolbox/Chart.yaml | 2 +- charts/gitlab/charts/webservice/Chart.yaml | 2 +- doc/installation/version_mappings.md | 3 --- 16 files changed, 14 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 880e935194..7b289b608b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,6 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. -## 9.3.1 (2025-08-26) - -No changes. - ## 9.3.0 (2025-08-20) ### Added (3 changes) @@ -35,10 +31,6 @@ No changes. - [Update certmanager from v1.12 to v1.17](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/c990cd36ed7d6910be91a7bd01e65ad98fed8148) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/4234)) - [Update dependency container-registry to v4.25.0-gitlab](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/ca12af55763a3a4ae2fe8352b35f9a7aef91d6aa) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/4412)) -## 9.2.5 (2025-08-26) - -No changes. - ## 9.2.4 (2025-08-18) No changes. @@ -92,10 +84,6 @@ No changes. - [Update recommended Helm version to 3.17.3+](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/4e70185ac1f8ee8d755b77b87190d5e30eb91c14) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/4336)) - [Update Helm release gitlab-runner to v0.78.0](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/c0509f329431e8eb8a9b9e991eb2608be97617c6) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/4344)) -## 9.1.5 (2025-08-26) - -No changes. - ## 9.1.4 (2025-08-12) ### Added (1 change) diff --git a/Chart.yaml b/Chart.yaml index 7d17ac93d6..3c78dbeb76 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: gitlab -version: 9.3.1 +version: 9.3.0 appVersion: master description: GitLab is the most comprehensive AI-powered DevSecOps Platform. keywords: diff --git a/charts/gitlab/charts/geo-logcursor/Chart.yaml b/charts/gitlab/charts/geo-logcursor/Chart.yaml index c4a99d3147..c368d4e0ea 100644 --- a/charts/gitlab/charts/geo-logcursor/Chart.yaml +++ b/charts/gitlab/charts/geo-logcursor/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: geo-logcursor -version: 9.3.1 +version: 9.3.0 appVersion: master description: GitLab Geo logcursor keywords: diff --git a/charts/gitlab/charts/gitaly/Chart.yaml b/charts/gitlab/charts/gitaly/Chart.yaml index daf70fd56a..f6949577f1 100644 --- a/charts/gitlab/charts/gitaly/Chart.yaml +++ b/charts/gitlab/charts/gitaly/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: gitaly -version: 9.3.1 +version: 9.3.0 appVersion: master description: Git RPC service for handling all the git calls made by GitLab keywords: diff --git a/charts/gitlab/charts/gitlab-exporter/Chart.yaml b/charts/gitlab/charts/gitlab-exporter/Chart.yaml index 9a61aa5bcb..98d40871e9 100644 --- a/charts/gitlab/charts/gitlab-exporter/Chart.yaml +++ b/charts/gitlab/charts/gitlab-exporter/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: gitlab-exporter -version: 9.3.1 +version: 9.3.0 appVersion: 16.1.0 description: Exporter for GitLab Prometheus metrics (e.g. CI, pull mirrors) keywords: diff --git a/charts/gitlab/charts/gitlab-pages/Chart.yaml b/charts/gitlab/charts/gitlab-pages/Chart.yaml index 991b8044a2..27fff87d65 100644 --- a/charts/gitlab/charts/gitlab-pages/Chart.yaml +++ b/charts/gitlab/charts/gitlab-pages/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: gitlab-pages -version: 9.3.1 +version: 9.3.0 appVersion: master description: Daemon for serving static websites from GitLab projects keywords: diff --git a/charts/gitlab/charts/gitlab-shell/Chart.yaml b/charts/gitlab/charts/gitlab-shell/Chart.yaml index f74f16d4f6..d838a3c928 100644 --- a/charts/gitlab/charts/gitlab-shell/Chart.yaml +++ b/charts/gitlab/charts/gitlab-shell/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: gitlab-shell -version: 9.3.1 +version: 9.3.0 appVersion: main description: sshd for Gitlab keywords: diff --git a/charts/gitlab/charts/kas/Chart.yaml b/charts/gitlab/charts/kas/Chart.yaml index 497ad3a289..1d95b6126c 100644 --- a/charts/gitlab/charts/kas/Chart.yaml +++ b/charts/gitlab/charts/kas/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: kas -version: 9.3.1 +version: 9.3.0 appVersion: master description: GitLab Agent Server keywords: diff --git a/charts/gitlab/charts/mailroom/Chart.yaml b/charts/gitlab/charts/mailroom/Chart.yaml index f904b51d79..7929f96fa9 100644 --- a/charts/gitlab/charts/mailroom/Chart.yaml +++ b/charts/gitlab/charts/mailroom/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: mailroom -version: 9.3.1 +version: 9.3.0 appVersion: master description: Handling incoming emails keywords: diff --git a/charts/gitlab/charts/migrations/Chart.yaml b/charts/gitlab/charts/migrations/Chart.yaml index 65cbf32a15..48ea78d091 100644 --- a/charts/gitlab/charts/migrations/Chart.yaml +++ b/charts/gitlab/charts/migrations/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: migrations -version: 9.3.1 +version: 9.3.0 appVersion: master description: Database migrations and other versioning tasks for upgrading Gitlab keywords: diff --git a/charts/gitlab/charts/praefect/Chart.yaml b/charts/gitlab/charts/praefect/Chart.yaml index 0223f4949b..9a3cb2c7c5 100644 --- a/charts/gitlab/charts/praefect/Chart.yaml +++ b/charts/gitlab/charts/praefect/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: praefect -version: 9.3.1 +version: 9.3.0 appVersion: master description: Praefect is a router and transaction manager for Gitaly, and a required component for running a Gitaly Cluster. diff --git a/charts/gitlab/charts/sidekiq/Chart.yaml b/charts/gitlab/charts/sidekiq/Chart.yaml index 249d7fa768..3280c6323e 100644 --- a/charts/gitlab/charts/sidekiq/Chart.yaml +++ b/charts/gitlab/charts/sidekiq/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: sidekiq -version: 9.3.1 +version: 9.3.0 appVersion: master description: Gitlab Sidekiq for asynchronous task processing in rails keywords: diff --git a/charts/gitlab/charts/spamcheck/Chart.yaml b/charts/gitlab/charts/spamcheck/Chart.yaml index 2257ecec53..8a43bd16d3 100644 --- a/charts/gitlab/charts/spamcheck/Chart.yaml +++ b/charts/gitlab/charts/spamcheck/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: spamcheck -version: 9.3.1 +version: 9.3.0 appVersion: 1.2.3 description: GitLab Anti-Spam Engine keywords: diff --git a/charts/gitlab/charts/toolbox/Chart.yaml b/charts/gitlab/charts/toolbox/Chart.yaml index f9b52f38d1..376a130e6b 100644 --- a/charts/gitlab/charts/toolbox/Chart.yaml +++ b/charts/gitlab/charts/toolbox/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: toolbox -version: 9.3.1 +version: 9.3.0 appVersion: master description: For manually running rake tasks through kubectl keywords: diff --git a/charts/gitlab/charts/webservice/Chart.yaml b/charts/gitlab/charts/webservice/Chart.yaml index 1b1ae6be55..5a38a309c6 100644 --- a/charts/gitlab/charts/webservice/Chart.yaml +++ b/charts/gitlab/charts/webservice/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: webservice -version: 9.3.1 +version: 9.3.0 appVersion: master description: HTTP server for Gitlab keywords: diff --git a/doc/installation/version_mappings.md b/doc/installation/version_mappings.md index e34586edff..40490b2804 100644 --- a/doc/installation/version_mappings.md +++ b/doc/installation/version_mappings.md @@ -40,15 +40,12 @@ The table below maps some of the key previous supported chart versions and suppo | Chart version | GitLab version | |---------------|----------------| -| 9.3.1 | 18.3.1 | | 9.3.0 | 18.3.0 | -| 9.2.5 | 18.2.5 | | 9.2.4 | 18.2.4 | | 9.2.3 | 18.2.3 | | 9.2.2 | 18.2.2 | | 9.2.1 | 18.2.1 | | 9.2.0 | 18.2.0 | -| 9.1.5 | 18.1.5 | | 9.1.4 | 18.1.4 | | 9.1.3 | 18.1.3 | | 9.1.2 | 18.1.2 | -- GitLab