From 086d43e8c52fef556ce05fa4103f87616f3b634b Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Mon, 19 Oct 2020 15:45:01 +1300
Subject: [PATCH] Bump cluster applications CI template to 0.34.1
This changes repo location for Nginx Ingress, fluentD, and Prometheues
to vendored charts as the stable repo is scheduled to be deleted after
2020-11-13.
---
.../update-cluster-applications-0-34-1.yml | 5 +++++
doc/user/clusters/applications.md | 17 +++++++++++++++++
.../Managed-Cluster-Applications.gitlab-ci.yml | 2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 changelogs/unreleased/update-cluster-applications-0-34-1.yml
diff --git a/changelogs/unreleased/update-cluster-applications-0-34-1.yml b/changelogs/unreleased/update-cluster-applications-0-34-1.yml
new file mode 100644
index 0000000000000..5083de747dfcc
--- /dev/null
+++ b/changelogs/unreleased/update-cluster-applications-0-34-1.yml
@@ -0,0 +1,5 @@
+---
+title: Update cluster applications CI template to 0.34.1
+merge_request: 45487
+author:
+type: fixed
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 4e0e2991acb8c..864129f605177 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -647,6 +647,23 @@ applications you have configured. In case of pipeline failure, the
output of the [Helm Tiller](https://v2.helm.sh/docs/install/#running-tiller-locally) binary
is saved as a [CI job artifact](../../ci/pipelines/job_artifacts.md).
+For GitLab versions 13.5 and below, the Ingress, Fluentd, Prometheus,
+and Sentry apps are fetched from the central Helm [stable
+repository](https://kubernetes-charts.storage.googleapis.com/), which
+will be [deleted](https://github.com/helm/charts#deprecation-timeline)
+on November 13, 2020. This will cause the installation CI/CD pipeline to
+fail. Upgrade to GitLab 13.6, or alternatively, you can
+use the following `.gitlab-ci.yml`, which has been tested on GitLab
+13.5:
+
+```yaml
+include:
+ - template: Managed-Cluster-Applications.gitlab-ci.yml
+
+apply:
+ image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.34.1"
+```
+
### Important notes
Note the following:
diff --git a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml
index a9638f564f323..3f62d92ad1366 100644
--- a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml
@@ -1,6 +1,6 @@
apply:
stage: deploy
- image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.33.0"
+ image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.34.1"
environment:
name: production
variables:
--
GitLab