Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

4 files changed, 80 insertions, 3 deletions

diff --git a/data/removals/15_0/15-0-configure-self-managed-cert-based-kube-feature-flag.yml b/data/removals/15_0/15-0-configure-self-managed-cert-based-kube-feature-flag.yml
new file mode 100644
index 00000000000..a4b8b422dd9
--- /dev/null
+++ b/data/removals/15_0/15-0-configure-self-managed-cert-based-kube-feature-flag.yml
@@ -0,0 +1,24 @@
+- name: "Self-managed certificate-based integration with Kubernetes feature flagged"
+  announcement_milestone: "14.5"
+  announcement_date: "2021-11-15"
+  removal_milestone: "15.0"
+  removal_date: "2022-05-22"
+  breaking_change: true
+  reporter: nagyv-gitlab
+  stage: Configure
+  issue_url: https://gitlab.com/groups/gitlab-org/configure/-/epics/8
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    In 15.0 the certificate-based integration with Kubernetes will be disabled by default.
+
+    After 15.0, you should use the [agent for Kubernetes](https://docs.gitlab.com/ee/user/clusters/agent/) to connect Kubernetes clusters with GitLab. The agent for Kubernetes is a more robust, secure, and reliable integration with Kubernetes. [How do I migrate to the agent?](https://docs.gitlab.com/ee/user/infrastructure/clusters/migrate_to_gitlab_agent.html)
+
+    If you need more time to migrate, you can enable the `certificate_based_clusters` [feature flag](https://docs.gitlab.com/ee/administration/feature_flags.html), which re-enables the certificate-based integration.
+
+    In GitLab 16.0, we will [remove the feature, its related code, and the feature flag](https://about.gitlab.com/blog/2021/11/15/deprecating-the-cert-based-kubernetes-integration/). GitLab will continue to fix any security or critical issues until 16.0.
+
+    For updates and details, follow [this epic](https://gitlab.com/groups/gitlab-org/configure/-/epics/8).
+#
+# OPTIONAL FIELDS
+#
+  tiers: [Core, Premium, Ultimate]
+  documentation_url: 'https://docs.gitlab.com/ee/user/infrastructure/clusters/#certificate-based-kubernetes-integration-deprecated'
diff --git a/data/removals/15_0/15-0-removal-artifacts-keyword.yml b/data/removals/15_0/15-0-removal-artifacts-keyword.yml
index 39f618c47f5..29edd922eae 100644
--- a/data/removals/15_0/15-0-removal-artifacts-keyword.yml
+++ b/data/removals/15_0/15-0-removal-artifacts-keyword.yml
@@ -1,11 +1,11 @@
-- name: "`artifacts:report:cobertura` keyword"
+- name: "`artifacts:reports:cobertura` keyword"
   announcement_milestone: "14.7"
   announcement_date: "2022-02-22"
   removal_milestone: "15.0"
   removal_date: "2022-05-22"
   breaking_change: false
   body: |
-     As of GitLab 15.0, the [`artifacts:report:cobertura`](https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportscobertura-removed)
+     As of GitLab 15.0, the [`artifacts:reports:cobertura`](https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportscobertura-removed)
      keyword has been [replaced](https://gitlab.com/gitlab-org/gitlab/-/issues/344533) by
      [`artifacts:reports:coverage_report`](https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportscoverage_report).
      Cobertura is the only supported report file, but this is the first step towards GitLab supporting other report types.
diff --git a/data/removals/15_0/15-0-remove-background-upload-object-storage.yml b/data/removals/15_0/15-0-remove-background-upload-object-storage.yml
index 7d077175b29..16aab3d14c2 100644
--- a/data/removals/15_0/15-0-remove-background-upload-object-storage.yml
+++ b/data/removals/15_0/15-0-remove-background-upload-object-storage.yml
@@ -7,13 +7,46 @@
   reporter: fzimmer
   body: |  # Do not modify this line, instead modify the lines below.
     To reduce the overall complexity and maintenance burden of GitLab's [object storage feature](https://docs.gitlab.com/ee/administration/object_storage.html), support for using `background_upload` has been removed in GitLab 15.0.
+    By default [direct upload](https://docs.gitlab.com/ee/development/uploads/index.html#direct-upload) will be used.
 
-    This impacts a small subset of object storage providers, including but not limited to:
+    This impacts a subset of object storage providers, including but not limited to:
 
     - **OpenStack** Customers using OpenStack need to change their configuration to use the S3 API instead of Swift.
     - **RackSpace** Customers using RackSpace-based object storage need to migrate data to a different provider.
 
     If your object storage provider does not support `background_upload`, please [migrate objects to a supported object storage provider](https://docs.gitlab.com/ee/administration/object_storage.html#migrate-objects-to-a-different-object-storage-provider).
+
+    #### Encrypted S3 buckets
+
+    Additionally, this also breaks the use of [encrypted S3 buckets](https://docs.gitlab.com/ee/administration/object_storage.html#encrypted-s3-buckets) with [storage-specific configuration form](https://docs.gitlab.com/ee/administration/object_storage.html#storage-specific-configuration).
+
+    If your S3 buckets have [SSE-S3 or SSE-KMS encryption enabled](https://docs.aws.amazon.com/kms/latest/developerguide/services-s3.html), please [migrate your configuration to use consolidated object storage form](https://docs.gitlab.com/ee/administration/object_storage.html#transition-to-consolidated-form) before upgrading to GitLab 15.0. Otherwise, you may start getting `ETag mismatch` errors during objects upload.
+
+    #### 403 errors
+
+    If you see 403 errors when uploading to object storage after
+    upgrading to GitLab 15.0, check that the [correct permissions](https://docs.gitlab.com/ee/administration/object_storage.html#iam-permissions)
+    are assigned to the bucket. Direct upload needs the ability to delete an
+    object (example: `s3:DeleteObject`), but background uploads do not.
+
+    #### `remote_directory` with a path prefix
+
+    If the object storage `remote_directory` configuration contains a slash (`/`) after the bucket (example: `gitlab/uploads`), be aware that this [was never officially supported](https://gitlab.com/gitlab-org/gitlab/-/issues/292958).
+    Some users found that they could specify a path prefix to the bucket. In direct upload mode, object storage uploads will fail if a slash is present in GitLab 15.0.
+
+    If you have set a prefix, you can use a workaround to revert to background uploads:
+
+    1. Continue to use [storage-specific configuration](https://docs.gitlab.com/ee/administration/object_storage.html#storage-specific-configuration).
+    1. In Omnibus GitLab, set the `GITLAB_LEGACY_BACKGROUND_UPLOADS` to re-enable background uploads:
+
+        ```ruby
+        gitlab_rails['env'] = { 'GITLAB_LEGACY_BACKGROUND_UPLOADS' => 'artifacts,external_diffs,lfs,uploads,packages,dependency_proxy,terraform_state,pages' }
+        ```
+
+    Prefixes will be supported officially in [GitLab 15.2](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91307).
+    This workaround will be dropped, so we encourage migrating to consolidated object storage.
+
+
   stage: Enablement
   tiers: [Core, Premium, Ultimate]
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/26600
diff --git a/data/removals/15_2/removal-outdated-browser-support.yml b/data/removals/15_2/removal-outdated-browser-support.yml
new file mode 100644
index 00000000000..84b2fa32020
--- /dev/null
+++ b/data/removals/15_2/removal-outdated-browser-support.yml
@@ -0,0 +1,20 @@
+- name: "Support for older browsers"
+  removal_date: July 22, 2022
+  removal_milestone: "15.2"
+  reporter: leipert
+  breaking_change: false
+  body: |
+    In GitLab 15.2, we are cleaning up and [removing old code](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86003) that was specific for browsers that we no longer support. This has no impact on users if they use one of our [supported web browsers](https://docs.gitlab.com/ee/install/requirements.html#supported-web-browsers).
+
+    Most notably, support for the following browsers has been removed:
+
+    - Apple Safari 14 and older.
+    - Mozilla Firefox 78.
+
+    The minimum supported browser versions are:
+
+    - Apple Safari 14.1.
+    - Mozilla Firefox 91.
+    - Google Chrome 92.
+    - Chromium 92.
+    - Microsoft Edge 92.