Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 0 deletions

diff --git a/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml b/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
new file mode 100644
index 00000000000..d02577d34fe
--- /dev/null
+++ b/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
@@ -0,0 +1,12 @@
+- name: "Legacy database configuration"
+  announcement_milestone: "14.3"
+  removal_milestone: "15.0"
+  body: |
+   The syntax of [GitLabs database](https://docs.gitlab.com/omnibus/settings/database.html)
+   configuration located in `database.yml` is changing and the legacy format is deprecated. The legacy format
+   supported using a single PostgreSQL adapter, whereas the new format is changing to support multiple databases. The `main:` database needs to be defined as a first configuration item.
+   
+   This deprecation mainly impacts users compiling GitLab from source because Omnibus will handle this configuration automatically.
+  stage: Enablement
+  tiers: [Core, Premium, Ultimate]
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338182
diff --git a/data/deprecations/distribution_deprecations_14-3.yml b/data/deprecations/distribution_deprecations_14-3.yml
new file mode 100644
index 00000000000..e43cc7baf09
--- /dev/null
+++ b/data/deprecations/distribution_deprecations_14-3.yml
@@ -0,0 +1,7 @@
+- name: "Rename Task Runner pod to Toolbox" # The name of the feature to be deprecated
+  announcement_milestone: "14.2" # The milestone when this feature was first announced as deprecated.
+  removal_milestone: "14.4" # the milestone when this feature is planned to be removed
+  body: | # Do not modify this line, instead modify the lines below.
+    The Task Runner pod is used to execute periodic housekeeping tasks within the GitLab application and is often confused with the GitLab Runner. Thus, [Task Runner will be renamed to Toolbox](https://gitlab.com/groups/gitlab-org/charts/-/epics/25).
+
+    This will result in the rename of the sub-chart: `gitlab/task-runner` to `gitlab/toolbox`. Resulting pods will be named along the lines of `{{ .Release.Name }}-toolbox`, which will often be `gitlab-toolbox`. They will be locatable with the label `app=toolbox`.