From dfad5026cd8c5b0eaee455ceeef5339944b4d024 Mon Sep 17 00:00:00 2001 From: Gerard Hickey Date: Wed, 1 Apr 2020 11:35:27 -0700 Subject: [PATCH 1/4] Replaced references to postgresql and redis charts The postgresql and redis charts have been deprecated in the Helm stable repo and moved to the Bitnami repo, https://github.com/bitnami/charts. Signed-off-by: Gerard Hickey --- .../1970-deprecated-charts-docs.yml | 5 +++++ doc/architecture/decisions.md | 4 ++-- doc/charts/index.md | 2 +- doc/charts/redis/index.md | 2 +- doc/installation/command-line-options.md | 4 ++-- doc/installation/rbac.md | 2 +- doc/installation/storage.md | 8 +++---- doc/installation/upgrade.md | 2 +- doc/releases/3_0.md | 4 ++-- requirements.lock | 21 +++++++++++++++++++ requirements.yaml | 4 ++-- 11 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 changelogs/unreleased/1970-deprecated-charts-docs.yml create mode 100644 requirements.lock diff --git a/changelogs/unreleased/1970-deprecated-charts-docs.yml b/changelogs/unreleased/1970-deprecated-charts-docs.yml new file mode 100644 index 0000000000..c6d9e8ebd8 --- /dev/null +++ b/changelogs/unreleased/1970-deprecated-charts-docs.yml @@ -0,0 +1,5 @@ +--- +title: Updated references to deprecated postgresql and redis charts +merge_request: 1252 +author: +type: changed diff --git a/doc/architecture/decisions.md b/doc/architecture/decisions.md index e8270a4c53..caeddfe76d 100644 --- a/doc/architecture/decisions.md +++ b/doc/architecture/decisions.md @@ -107,13 +107,13 @@ our [guidelines for forking](../development/index.md#guidelines-for-forking) ### Redis -With the `3.0` release of the GitLab Helm chart, we no longer fork the [upstream Redis chart](https://github.com/helm/charts/tree/master/stable/redis), +With the `3.0` release of the GitLab Helm chart, we no longer fork the [upstream Redis chart](https://github.com/bitnami/charts/tree/master/bitnami/redis), and instead include it as a dependency. ### Redis HA Redis-HA was a chart we included in our releases prior to `3.0`. It has now been removed, -and replaced with [upstream Redis chart](https://github.com/helm/charts/tree/master/stable/redis) +and replaced with [upstream Redis chart](https://github.com/bitnami/charts/tree/master/bitnami/redis) which has added optional HA support. ### MinIO diff --git a/doc/charts/index.md b/doc/charts/index.md index b99e919c44..d0b561a11f 100644 --- a/doc/charts/index.md +++ b/doc/charts/index.md @@ -16,7 +16,7 @@ There are some common global settings that apply to multiple charts. See the - [MinIO](minio/index.md) - [NGINX](nginx/index.md) -- [Redis](https://github.com/helm/charts/tree/master/stable/redis) +- [Redis](https://github.com/bitnami/charts/tree/master/bitnami/redis) - [Registry](registry/index.md) - GitLab/[Gitaly](gitlab/gitaly/index.md) - GitLab/[GitLab Runner](gitlab/gitlab-runner/index.md) diff --git a/doc/charts/redis/index.md b/doc/charts/redis/index.md index a77688586f..177f7bce16 100644 --- a/doc/charts/redis/index.md +++ b/doc/charts/redis/index.md @@ -4,7 +4,7 @@ redirect_to: '../../installation/deployment.md#redis' NOTE: **Note:** Our fork of the Redis chart was switched in the `3.0` release of the GitLab -Helm chart to use the [upstream Redis chart](https://github.com/helm/charts/tree/master/stable/redis). +Helm chart to use the [upstream Redis chart](https://github.com/bitnami/charts/tree/master/bitnami/redis). Please refer to an older version of the docs if you are looking for the documentation for our older fork. diff --git a/doc/installation/command-line-options.md b/doc/installation/command-line-options.md index d7f2d34835..ccd893afdd 100644 --- a/doc/installation/command-line-options.md +++ b/doc/installation/command-line-options.md @@ -123,12 +123,12 @@ See [`nginx-ingress` chart](../charts/nginx/index.md). | Parameter | Description | Default | |--------------------------------------|---------------------------------------------|-----------------------| -| `redis.install` | Install the `stable/redis` chart | true | +| `redis.install` | Install the `bitnami/redis` chart | true | | `redis.existingSecret` | Specify the Secret for Redis servers to use | `gitlab-redis-secret` | | `redis.existingSecretKey` | Secret key where password is stored | `redis-password` | Any additional configuration of the Redis service should use the configuration -settings from the [Redis chart](https://github.com/helm/charts/tree/master/stable/redis). +settings from the [Redis chart](https://github.com/bitnami/charts/tree/master/bitnami/redis). ## Advanced registry configuration diff --git a/doc/installation/rbac.md b/doc/installation/rbac.md index daafbacf19..80bda4f907 100644 --- a/doc/installation/rbac.md +++ b/doc/installation/rbac.md @@ -44,7 +44,7 @@ GitLab chart depends on other charts that they also use RBAC and create their ow - Prometheus monitoring creates multiple own service accounts by default. They are all associated to cluster level roles. For more information see [Prometheus chart documentation](https://github.com/helm/charts/tree/master/stable/prometheus#rbac-configuration). - Certificate manager creates a service account by default to manage its custom resources along with native resources at the cluster level. For more information see [cert-manager chart RBAC template](https://github.com/jetstack/cert-manager/blob/master/deploy/charts/cert-manager/templates/rbac.yaml). -- When you use in-cluster PostgreSQL database (this is the default) the service account is not enabled. You can enable it but it is only used to run PostgreSQL service and is not associated to any specific role. For more information see [PostgreSQL chart](https://github.com/helm/charts/tree/master/stable/postgresql). +- When you use in-cluster PostgreSQL database (this is the default) the service account is not enabled. You can enable it but it is only used to run PostgreSQL service and is not associated to any specific role. For more information see [PostgreSQL chart](https://github.com/bitnami/charts/tree/master/bitnami/postgresql). NOTE: **Note:** Please keep in mind that for OpenShift deployment you need to assign `anyuid` SCC to `default` and `gitlab-runner` service account of your project. For more details see [OpenShift installation](./cloud/openshift.md). diff --git a/doc/installation/storage.md b/doc/installation/storage.md index 8f24b4182a..6fb734b790 100644 --- a/doc/installation/storage.md +++ b/doc/installation/storage.md @@ -5,8 +5,8 @@ The following applications within the GitLab chart require persistent storage to maintain state. - [Gitaly](../charts/gitlab/gitaly/index.md) (persists the Git repositories) -- [PostgreSQL](https://github.com/helm/charts/tree/master/stable/postgresql) (persists the GitLab database data) -- [Redis](https://github.com/helm/charts/tree/master/stable/redis) (persists GitLab job data) +- [PostgreSQL](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) (persists the GitLab database data) +- [Redis](https://github.com/bitnami/charts/tree/master/bitnami/redis) (persists GitLab job data) - [MinIO](../charts/minio/index.md) (persists the object storage data) The administrator may choose to provision this storage using [dynamic][] or [static][] volume provisioning. @@ -66,8 +66,8 @@ Follow the links below for further reading and additional persistence options: - [Gitaly persistence configuration](../charts/gitlab/gitaly/index.md#git-repository-persistence) - [MinIO persistence configuration](../charts/minio/index.md#persistence) -- [Redis persistence configuration](https://github.com/helm/charts/tree/master/stable/redis#persistence) -- [Upstream PostgreSQL chart configuration](https://github.com/helm/charts/tree/master/stable/postgresql#configuration) +- [Redis persistence configuration](https://github.com/bitnami/charts/tree/master/bitnami/redis) +- [Upstream PostgreSQL chart configuration](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#configuration-and-installation-details) > **Note**: Some of the advanced persistence options differ between PostgreSQL and the others, so it's important to check > the specific documentation for each before making changes. diff --git a/doc/installation/upgrade.md b/doc/installation/upgrade.md index 9042021887..e899a77d00 100644 --- a/doc/installation/upgrade.md +++ b/doc/installation/upgrade.md @@ -56,7 +56,7 @@ ensure that you explicitly set it back to `true` for future updates. ## Upgrade the bundled PostgreSQL chart -As part of the `3.0.0` release of this chart, we upgraded the bundled [PostgreSQL chart](https://github.com/helm/charts/tree/master/stable/postgresql) from 0.11.0 to 7.7.0. This is not a drop in replacement. Manual steps need to be performed to upgrade the database. +As part of the `3.0.0` release of this chart, we upgraded the bundled [PostgreSQL chart](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) from 0.11.0 to 7.7.0. This is not a drop in replacement. Manual steps need to be performed to upgrade the database. The steps have been documented in the [3.0 upgrade steps](#upgrade-steps-for-30-release). ## Upgrade steps for 3.0 release diff --git a/doc/releases/3_0.md b/doc/releases/3_0.md index b31baa99d0..addf0a7037 100644 --- a/doc/releases/3_0.md +++ b/doc/releases/3_0.md @@ -50,7 +50,7 @@ Upgrading to the `3.0` chart requires manual upgrade steps in order to update so ### PostgreSQL -As part of the `3.0.0` release of this chart, we upgraded the bundled [PostgreSQL chart](https://github.com/helm/charts/tree/master/stable/postgresql) +As part of the `3.0.0` release of this chart, we upgraded the bundled [PostgreSQL chart](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) from 0.11.0 to 7.7.3. This updates the database version from `9.6` to `10.9`. This is not a drop in replacement. Manual steps need to be performed to upgrade the database. @@ -78,7 +78,7 @@ under [Immutable Field Error, spec.clusterIP](../troubleshooting/index.md#speccl ### Redis As part of our [Redis upgrade](https://gitlab.com/gitlab-org/charts/gitlab/issues/1519) we've dropped our fork of the -Redis and Redis HA charts and have instead switched to using a newer version of the [upstream Redis chart](https://github.com/helm/charts/tree/master/stable/redis). +Redis and Redis HA charts and have instead switched to using a newer version of the [upstream Redis chart](https://github.com/bitnami/charts/tree/master/bitnami/redis). This brings with it an update to using Redis 5.x, with improved performance. diff --git a/requirements.lock b/requirements.lock new file mode 100644 index 0000000000..41bc24eb1f --- /dev/null +++ b/requirements.lock @@ -0,0 +1,21 @@ +dependencies: +- name: cert-manager + repository: https://charts.jetstack.io/ + version: 0.10.1 +- name: prometheus + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 10.0.0 +- name: postgresql + repository: https://charts.bitnami.com/bitnami + version: 7.7.3 +- name: gitlab-runner + repository: https://charts.gitlab.io/ + version: 0.15.0 +- name: grafana + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 4.0.1 +- name: redis + repository: https://charts.bitnami.com/bitnami + version: 10.3.4 +digest: sha256:e065e490218b65c4c69998cb96cd1bd628764ff337080b96240044dd8d631f5c +generated: "2020-04-01T11:03:54.169411-07:00" diff --git a/requirements.yaml b/requirements.yaml index e40cfb7d96..5e6c1f9edc 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -10,7 +10,7 @@ dependencies: condition: prometheus.install - name: postgresql version: 7.7.3 - repository: https://kubernetes-charts.storage.googleapis.com/ + repository: https://charts.bitnami.com/bitnami condition: postgresql.install - name: gitlab-runner version: 0.15.0 @@ -22,5 +22,5 @@ dependencies: condition: global.grafana.enabled - name: redis version: 10.3.4 - repository: https://kubernetes-charts.storage.googleapis.com/ + repository: https://charts.bitnami.com/bitnami condition: redis.install -- GitLab From 5dc225439882a71ab8328a8a646d25f8681c5b03 Mon Sep 17 00:00:00 2001 From: Gerard Hickey Date: Wed, 1 Apr 2020 12:01:14 -0700 Subject: [PATCH 2/4] Updated hub.helm.sh links for redis and postgres --- doc/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/index.md b/doc/index.md index 738dbfde17..13181ab591 100644 --- a/doc/index.md +++ b/doc/index.md @@ -24,8 +24,8 @@ can be installed separately. - GitLab/[Sidekiq](charts/gitlab/sidekiq/index.md) - GitLab/[Unicorn](charts/gitlab/unicorn/index.md) - Optional dependencies: - - [PostgreSQL](https://hub.helm.sh/charts/stable/redis) - - [Redis](https://hub.helm.sh/charts/stable/redis) + - [PostgreSQL](https://hub.helm.sh/charts/bitnami/postgresql) + - [Redis](hub.helm.sh/charts/bitnami/redis) - [MinIO](charts/minio/index.md) - Optional additions: - [Prometheus](https://hub.helm.sh/charts/stable/prometheus) -- GitLab From 49808500f7aeaa71e7b7884d6c9c26167dcec798 Mon Sep 17 00:00:00 2001 From: Gerard Hickey Date: Wed, 1 Apr 2020 12:04:50 -0700 Subject: [PATCH 3/4] Fixed MR number in changelog file --- changelogs/unreleased/1970-deprecated-charts-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/1970-deprecated-charts-docs.yml b/changelogs/unreleased/1970-deprecated-charts-docs.yml index c6d9e8ebd8..73f5ba388c 100644 --- a/changelogs/unreleased/1970-deprecated-charts-docs.yml +++ b/changelogs/unreleased/1970-deprecated-charts-docs.yml @@ -1,5 +1,5 @@ --- title: Updated references to deprecated postgresql and redis charts -merge_request: 1252 +merge_request: 1253 author: type: changed -- GitLab From 2a2105fa703c186d452e555de8a8aa77b4fbb65c Mon Sep 17 00:00:00 2001 From: Gerard Hickey Date: Wed, 1 Apr 2020 12:11:00 -0700 Subject: [PATCH 4/4] Removed eroneous requirements.lock --- requirements.lock | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 requirements.lock diff --git a/requirements.lock b/requirements.lock deleted file mode 100644 index 41bc24eb1f..0000000000 --- a/requirements.lock +++ /dev/null @@ -1,21 +0,0 @@ -dependencies: -- name: cert-manager - repository: https://charts.jetstack.io/ - version: 0.10.1 -- name: prometheus - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 10.0.0 -- name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 7.7.3 -- name: gitlab-runner - repository: https://charts.gitlab.io/ - version: 0.15.0 -- name: grafana - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.0.1 -- name: redis - repository: https://charts.bitnami.com/bitnami - version: 10.3.4 -digest: sha256:e065e490218b65c4c69998cb96cd1bd628764ff337080b96240044dd8d631f5c -generated: "2020-04-01T11:03:54.169411-07:00" -- GitLab