From 970f5cbec083efed6d88f104db55f6bdeabc55cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Wed, 11 Nov 2020 01:02:56 +0100 Subject: [PATCH] [bitnami/nginx] Major version. Adapt Chart to apiVersion: v2 (#4291) * [bitnami/nginx] Major version. Adapt Chart to apiVersion: v2 * [bitnami/nginx] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/nginx/Chart.lock | 6 ++++++ bitnami/nginx/Chart.yaml | 28 +++++++++++++++++----------- bitnami/nginx/README.md | 31 +++++++++++++++++++++++++++---- bitnami/nginx/requirements.lock | 6 ------ bitnami/nginx/requirements.yaml | 6 ------ bitnami/nginx/values.yaml | 8 ++++---- 6 files changed, 54 insertions(+), 31 deletions(-) create mode 100644 bitnami/nginx/Chart.lock delete mode 100644 bitnami/nginx/requirements.lock delete mode 100644 bitnami/nginx/requirements.yaml diff --git a/bitnami/nginx/Chart.lock b/bitnami/nginx/Chart.lock new file mode 100644 index 000000000..de10f227b --- /dev/null +++ b/bitnami/nginx/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://charts.bitnami.com/bitnami + version: 1.0.0 +digest: sha256:a2093836b2b6a85d7bf34143d3159b5c413c5e7423bde212de9cb416c985b976 +generated: "2020-11-10T23:27:16.349220545Z" diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml index 3d848104d..f8da7b725 100644 --- a/bitnami/nginx/Chart.yaml +++ b/bitnami/nginx/Chart.yaml @@ -1,22 +1,28 @@ -apiVersion: v1 -name: nginx -version: 7.1.6 +annotations: + category: Infrastructure +apiVersion: v2 appVersion: 1.19.4 +dependencies: + - name: common + repository: https://charts.bitnami.com/bitnami + tags: + - bitnami-common + version: 1.x.x description: Chart for the nginx server +engine: gotpl +home: https://github.com/bitnami/charts/tree/master/bitnami/nginx +icon: https://bitnami.com/assets/stacks/nginx/img/nginx-stack-220x234.png keywords: - nginx - http - web - www - reverse proxy -home: https://github.com/bitnami/charts/tree/master/bitnami/nginx -icon: https://bitnami.com/assets/stacks/nginx/img/nginx-stack-220x234.png +maintainers: + - email: containers@bitnami.com + name: Bitnami +name: nginx sources: - https://github.com/bitnami/bitnami-docker-nginx - http://www.nginx.org -maintainers: - - name: Bitnami - email: containers@bitnami.com -engine: gotpl -annotations: - category: Infrastructure +version: 8.0.0 diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 8aea1e932..4ce27089a 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -20,7 +20,7 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites - Kubernetes 1.12+ -- Helm 2.12+ or Helm 3.0-beta3+ +- Helm 3.0-beta3+ ## Installing the Chart @@ -327,18 +327,41 @@ Find more information about how to deal with common errors related to Bitnami’ ## Upgrading -### 7.0.0 +### To 8.0.0 + +[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL. + +**What changes were introduced in this major version?** + +- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field. +- Move dependency information from the *requirements.yaml* to the *Chart.yaml* +- After running `helm dependency update`, a *Chart.lock* file is generated containing the same structure used in the previous *requirements.lock* +- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts + +**Considerations when upgrading to this version** + +- If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues +- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore +- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3 + +**Useful links** + +- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/ +- https://helm.sh/docs/topics/v2_v3_migration/ +- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/ + +### To 7.0.0 - This version also introduces `bitnami/common`, a [library chart](https://helm.sh/docs/topics/library_charts/#helm) as a dependency. More documentation about this new utility could be found [here](https://github.com/bitnami/charts/tree/master/bitnami/common#bitnami-common-library-chart). Please, make sure that you have updated the chart dependencies before executing any upgrade. - Ingress configuration was also adapted to follow the Helm charts best practices. > Note: There is no backwards compatibility due to the above mentioned changes. It's necessary to install a new release of the chart, and migrate your existing application to the new NGINX instances. -### 5.6.0 +### To 5.6.0 Added support for the use of LDAP. -### 5.0.0 +### To 5.0.0 Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments. Use the workaround below to upgrade from versions previous to 5.0.0. The following example assumes that the release name is nginx: diff --git a/bitnami/nginx/requirements.lock b/bitnami/nginx/requirements.lock deleted file mode 100644 index cf5c3480e..000000000 --- a/bitnami/nginx/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://charts.bitnami.com/bitnami - version: 0.10.0 -digest: sha256:cbe8f782ad7168557b9bb101a4d441d3210e2dda09cd249eb8426d1499ce6afc -generated: "2020-10-27T18:22:51.219349248Z" diff --git a/bitnami/nginx/requirements.yaml b/bitnami/nginx/requirements.yaml deleted file mode 100644 index 0c2495d0f..000000000 --- a/bitnami/nginx/requirements.yaml +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: - - name: common - version: 0.x.x - repository: https://charts.bitnami.com/bitnami - tags: - - bitnami-common diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml index 8887749a9..a4e78b0c3 100644 --- a/bitnami/nginx/values.yaml +++ b/bitnami/nginx/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/nginx - tag: 1.19.4-debian-10-r6 + tag: 1.19.4-debian-10-r14 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -87,7 +87,7 @@ cloneStaticSiteFromGit: image: registry: docker.io repository: bitnami/git - tag: 2.29.2-debian-10-r3 + tag: 2.29.2-debian-10-r11 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -350,7 +350,7 @@ ldapDaemon: image: registry: docker.io repository: bitnami/nginx-ldap-auth-daemon - tag: 0.20200116.0-debian-10-r160 + tag: 0.20200116.0-debian-10-r167 pullPolicy: IfNotPresent ## LDAP Daemon port @@ -608,7 +608,7 @@ metrics: image: registry: docker.io repository: bitnami/nginx-exporter - tag: 0.8.0-debian-10-r126 + tag: 0.8.0-debian-10-r133 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.