From cebdb4122a4855b1cea8c2533722551ec59e5bc8 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Wed, 28 Dec 2022 18:35:21 +0100 Subject: [PATCH] Updated helm chart nginx in deployment/nginx to version 13.2.20 --- .../bitnami/nginx/13.2.0/Chart.lock | 6 -- .../nginx/{13.2.0 => 13.2.20}/.helmignore | 0 .../bitnami/nginx/13.2.20/Chart.lock | 6 ++ .../nginx/{13.2.0 => 13.2.20}/Chart.yaml | 6 +- .../nginx/{13.2.0 => 13.2.20}/README.md | 70 +++++++++---------- .../charts/common/.helmignore | 0 .../charts/common/Chart.yaml | 6 +- .../charts/common/README.md | 21 +++--- .../charts/common/templates/_affinities.tpl | 20 +++--- .../charts/common/templates/_capabilities.tpl | 0 .../charts/common/templates/_errors.tpl | 0 .../charts/common/templates/_images.tpl | 12 ++-- .../charts/common/templates/_ingress.tpl | 2 +- .../charts/common/templates/_labels.tpl | 0 .../charts/common/templates/_names.tpl | 6 +- .../charts/common/templates/_secrets.tpl | 35 ++++++++-- .../charts/common/templates/_storage.tpl | 0 .../charts/common/templates/_tplvalues.tpl | 0 .../charts/common/templates/_utils.tpl | 2 +- .../charts/common/templates/_warnings.tpl | 0 .../templates/validations/_cassandra.tpl | 0 .../common/templates/validations/_mariadb.tpl | 0 .../common/templates/validations/_mongodb.tpl | 0 .../common/templates/validations/_mysql.tpl | 0 .../templates/validations/_postgresql.tpl | 0 .../common/templates/validations/_redis.tpl | 0 .../templates/validations/_validations.tpl | 0 .../charts/common/values.yaml | 0 .../{13.2.0 => 13.2.20}/templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/deployment.yaml | 27 ++++--- .../templates/extra-list.yaml | 0 .../templates/health-ingress.yaml | 0 .../{13.2.0 => 13.2.20}/templates/hpa.yaml | 0 .../templates/ingress.yaml | 11 +++ .../{13.2.0 => 13.2.20}/templates/pdb.yaml | 0 .../templates/prometheusrules.yaml | 0 .../templates/server-block-configmap.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/servicemonitor.yaml | 0 .../{13.2.0 => 13.2.20}/templates/svc.yaml | 0 .../templates/tls-secrets.yaml | 0 .../{13.2.0 => 13.2.20}/values.schema.json | 0 .../nginx/{13.2.0 => 13.2.20}/values.yaml | 8 +-- simple-helm/deployment/nginx/helm-chart.yml | 2 +- 45 files changed, 142 insertions(+), 98 deletions(-) delete mode 100644 simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.lock rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/.helmignore (100%) create mode 100644 simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.lock rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/Chart.yaml (87%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/README.md (95%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/.helmignore (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/Chart.yaml (82%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/README.md (90%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_affinities.tpl (84%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_capabilities.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_errors.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_images.tpl (88%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_ingress.tpl (95%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_labels.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_names.tpl (95%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_secrets.tpl (79%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_storage.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_tplvalues.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_utils.tpl (91%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/_warnings.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_cassandra.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_mariadb.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_mongodb.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_mysql.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_postgresql.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_redis.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/templates/validations/_validations.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/charts/common/values.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/NOTES.txt (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/_helpers.tpl (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/deployment.yaml (94%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/extra-list.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/health-ingress.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/hpa.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/ingress.yaml (85%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/pdb.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/prometheusrules.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/server-block-configmap.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/serviceaccount.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/servicemonitor.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/svc.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/templates/tls-secrets.yaml (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/values.schema.json (100%) rename simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/{13.2.0 => 13.2.20}/values.yaml (99%) diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.lock b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.lock deleted file mode 100644 index 5736b75..0000000 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://charts.bitnami.com/bitnami - version: 2.0.0 -digest: sha256:c66468d294c878acfb7cc6c082bc08d7105d139098bd42f88e6fe26903506c8f -generated: "2022-08-20T10:59:50.394581581Z" diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/.helmignore b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/.helmignore similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/.helmignore rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/.helmignore diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.lock b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.lock new file mode 100644 index 0000000..5818781 --- /dev/null +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://charts.bitnami.com/bitnami + version: 2.2.2 +digest: sha256:49ca75cf23ba5eb7df4becef52580f98c8bd8194eb80368b9d7b875f6eefa8e5 +generated: "2022-12-13T19:15:48.236175982Z" diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.yaml similarity index 87% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.yaml index b791d85..dd1162f 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/Chart.yaml +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/Chart.yaml @@ -1,7 +1,7 @@ annotations: category: Infrastructure apiVersion: v2 -appVersion: 1.23.1 +appVersion: 1.23.3 dependencies: - name: common repository: https://charts.bitnami.com/bitnami @@ -11,7 +11,7 @@ dependencies: description: NGINX Open Source is a web server that can be also used as a reverse proxy, load balancer, and HTTP cache. Recommended for high-demanding sites due to its ability to provide faster content. -home: https://github.com/bitnami/charts/tree/master/bitnami/nginx +home: https://github.com/bitnami/charts/tree/main/bitnami/nginx icon: https://bitnami.com/assets/stacks/nginx/img/nginx-stack-220x234.png keywords: - nginx @@ -26,4 +26,4 @@ name: nginx sources: - https://github.com/bitnami/containers/tree/main/bitnami/nginx - https://www.nginx.org -version: 13.2.0 +version: 13.2.20 diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/README.md b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/README.md similarity index 95% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/README.md rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/README.md index 884aaed..96ec966 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/README.md +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/README.md @@ -11,8 +11,8 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema ## TL;DR ```bash -$ helm repo add bitnami https://charts.bitnami.com/bitnami -$ helm install my-release bitnami/nginx +$ helm repo add my-repo https://charts.bitnami.com/bitnami +$ helm install my-release my-repo/nginx ``` ## Introduction @@ -33,8 +33,8 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment To install the chart with the release name `my-release`: ```bash -$ helm repo add bitnami https://charts.bitnami.com/bitnami -$ helm install my-release bitnami/nginx +$ helm repo add my-repo https://charts.bitnami.com/bitnami +$ helm install my-release my-repo/nginx ``` These commands deploy NGINX Open Source on the Kubernetes cluster in the default configuration. @@ -84,7 +84,7 @@ The command removes all the Kubernetes components associated with the chart and | -------------------- | ----------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | NGINX image registry | `docker.io` | | `image.repository` | NGINX image repository | `bitnami/nginx` | -| `image.tag` | NGINX image tag (immutable tags are recommended) | `1.23.1-debian-11-r8` | +| `image.tag` | NGINX image tag (immutable tags are recommended) | `1.23.3-debian-11-r3` | | `image.digest` | NGINX image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | NGINX image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -174,28 +174,28 @@ The command removes all the Kubernetes components associated with the chart and ### Custom NGINX application parameters -| Name | Description | Value | -| ------------------------------------------ | --------------------------------------------------------------------------------------------------- | ---------------------- | -| `cloneStaticSiteFromGit.enabled` | Get the server static content from a Git repository | `false` | -| `cloneStaticSiteFromGit.image.registry` | Git image registry | `docker.io` | -| `cloneStaticSiteFromGit.image.repository` | Git image repository | `bitnami/git` | -| `cloneStaticSiteFromGit.image.tag` | Git image tag (immutable tags are recommended) | `2.37.1-debian-11-r10` | -| `cloneStaticSiteFromGit.image.digest` | Git image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `cloneStaticSiteFromGit.image.pullPolicy` | Git image pull policy | `IfNotPresent` | -| `cloneStaticSiteFromGit.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `cloneStaticSiteFromGit.repository` | Git Repository to clone static content from | `""` | -| `cloneStaticSiteFromGit.branch` | Git branch to checkout | `""` | -| `cloneStaticSiteFromGit.interval` | Interval for sidecar container pull from the Git repository | `60` | -| `cloneStaticSiteFromGit.gitClone.command` | Override default container command for git-clone-repository | `[]` | -| `cloneStaticSiteFromGit.gitClone.args` | Override default container args for git-clone-repository | `[]` | -| `cloneStaticSiteFromGit.gitSync.command` | Override default container command for git-repo-syncer | `[]` | -| `cloneStaticSiteFromGit.gitSync.args` | Override default container args for git-repo-syncer | `[]` | -| `cloneStaticSiteFromGit.extraEnvVars` | Additional environment variables to set for the in the containers that clone static site from git | `[]` | -| `cloneStaticSiteFromGit.extraVolumeMounts` | Add extra volume mounts for the Git containers | `[]` | -| `serverBlock` | Custom server block to be added to NGINX configuration | `""` | -| `existingServerBlockConfigmap` | ConfigMap with custom server block to be added to NGINX configuration | `""` | -| `staticSiteConfigmap` | Name of existing ConfigMap with the server static site content | `""` | -| `staticSitePVC` | Name of existing PVC with the server static site content | `""` | +| Name | Description | Value | +| ------------------------------------------ | --------------------------------------------------------------------------------------------------- | --------------------- | +| `cloneStaticSiteFromGit.enabled` | Get the server static content from a Git repository | `false` | +| `cloneStaticSiteFromGit.image.registry` | Git image registry | `docker.io` | +| `cloneStaticSiteFromGit.image.repository` | Git image repository | `bitnami/git` | +| `cloneStaticSiteFromGit.image.tag` | Git image tag (immutable tags are recommended) | `2.39.0-debian-11-r3` | +| `cloneStaticSiteFromGit.image.digest` | Git image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `cloneStaticSiteFromGit.image.pullPolicy` | Git image pull policy | `IfNotPresent` | +| `cloneStaticSiteFromGit.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `cloneStaticSiteFromGit.repository` | Git Repository to clone static content from | `""` | +| `cloneStaticSiteFromGit.branch` | Git branch to checkout | `""` | +| `cloneStaticSiteFromGit.interval` | Interval for sidecar container pull from the Git repository | `60` | +| `cloneStaticSiteFromGit.gitClone.command` | Override default container command for git-clone-repository | `[]` | +| `cloneStaticSiteFromGit.gitClone.args` | Override default container args for git-clone-repository | `[]` | +| `cloneStaticSiteFromGit.gitSync.command` | Override default container command for git-repo-syncer | `[]` | +| `cloneStaticSiteFromGit.gitSync.args` | Override default container args for git-repo-syncer | `[]` | +| `cloneStaticSiteFromGit.extraEnvVars` | Additional environment variables to set for the in the containers that clone static site from git | `[]` | +| `cloneStaticSiteFromGit.extraVolumeMounts` | Add extra volume mounts for the Git containers | `[]` | +| `serverBlock` | Custom server block to be added to NGINX configuration | `""` | +| `existingServerBlockConfigmap` | ConfigMap with custom server block to be added to NGINX configuration | `""` | +| `staticSiteConfigmap` | Name of existing ConfigMap with the server static site content | `""` | +| `staticSitePVC` | Name of existing PVC with the server static site content | `""` | ### Traffic Exposure parameters @@ -252,7 +252,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.port` | NGINX Container Status Port scraped by Prometheus Exporter | `""` | | `metrics.image.registry` | NGINX Prometheus exporter image registry | `docker.io` | | `metrics.image.repository` | NGINX Prometheus exporter image repository | `bitnami/nginx-exporter` | -| `metrics.image.tag` | NGINX Prometheus exporter image tag (immutable tags are recommended) | `0.10.0-debian-11-r24` | +| `metrics.image.tag` | NGINX Prometheus exporter image tag (immutable tags are recommended) | `0.11.0-debian-11-r32` | | `metrics.image.digest` | NGINX Prometheus exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | NGINX Prometheus exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -284,7 +284,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```bash $ helm install my-release \ --set imagePullPolicy=Always \ - bitnami/nginx + my-repo/nginx ``` The above command sets the `imagePullPolicy` to `Always`. @@ -292,7 +292,7 @@ The above command sets the `imagePullPolicy` to `Always`. Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, ```bash -$ helm install my-release -f values.yaml bitnami/nginx +$ helm install my-release -f values.yaml my-repo/nginx ``` > **Tip**: You can use the default [values.yaml](values.yaml) @@ -314,7 +314,7 @@ To modify the application version used in this chart, specify a different versio The NGINX chart allows you to deploy a custom web application using one of the following methods: - Cloning from a git repository: Set `cloneStaticSiteFromGit.enabled` to `true` and set the repository and branch using the `cloneStaticSiteFromGit.repository` and `cloneStaticSiteFromGit.branch` parameters. A sidecar will also pull the latest changes in an interval set by `cloneStaticSitesFromGit.interval`. -- Providing a ConfigMap: Set the `staticSiteConfigMap` value to mount a ConfigMap in the NGINX html folder. +- Providing a ConfigMap: Set the `staticSiteConfigmap` value to mount a ConfigMap in the NGINX html folder. - Using an existing PVC: Set the `staticSitePVC` value to mount an PersistentVolumeClaim with the static site content. You can deploy a example web application using git deploying the chart with the following parameters: @@ -361,7 +361,7 @@ Alternatively, you can use a ConfigMap or a Secret with the environment variable This chart allows you to set your custom affinity using the `affinity` parameter. Find more information about Pod's affinity in the [kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity). -As an alternative, you can use of the preset configurations for pod affinity, pod anti-affinity, and node affinity available at the [bitnami/common](https://github.com/bitnami/charts/tree/master/bitnami/common#affinity) chart. To do so, set the `podAffinityPreset`, `podAntiAffinityPreset`, or `nodeAffinityPreset` parameters. +As an alternative, you can use of the preset configurations for pod affinity, pod anti-affinity, and node affinity available at the [bitnami/common](https://github.com/bitnami/charts/tree/main/bitnami/common#affinity) chart. To do so, set the `podAffinityPreset`, `podAntiAffinityPreset`, or `nodeAffinityPreset` parameters. ### Deploying extra resources @@ -369,7 +369,7 @@ There are cases where you may want to deploy extra objects, such a ConfigMap con ### Ingress -This chart provides support for ingress resources. If you have an ingress controller installed on your cluster, such as [nginx-ingress-controller](https://github.com/bitnami/charts/tree/master/bitnami/nginx-ingress-controller) or [contour](https://github.com/bitnami/charts/tree/master/bitnami/contour) you can utilize the ingress controller to serve your application. +This chart provides support for ingress resources. If you have an ingress controller installed on your cluster, such as [nginx-ingress-controller](https://github.com/bitnami/charts/tree/main/bitnami/nginx-ingress-controller) or [contour](https://github.com/bitnami/charts/tree/main/bitnami/contour) you can utilize the ingress controller to serve your application. To enable ingress integration, please set `ingress.enabled` to `true`. @@ -433,7 +433,7 @@ On 9 April 2022, security vulnerabilities in the [NGINX LDAP reference implement ### 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. +- 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/main/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. @@ -449,7 +449,7 @@ Use the workaround below to upgrade from versions previous to 5.0.0. The followi ```console $ kubectl delete deployment nginx --cascade=false -$ helm upgrade nginx bitnami/nginx +$ helm upgrade nginx my-repo/nginx ``` ### To 1.0.0 diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/.helmignore b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/.helmignore similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/.helmignore rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/.helmignore diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/Chart.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/Chart.yaml similarity index 82% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/Chart.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/Chart.yaml index 27b7348..f9ba944 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/Chart.yaml +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/Chart.yaml @@ -1,10 +1,10 @@ annotations: category: Infrastructure apiVersion: v2 -appVersion: 2.0.0 +appVersion: 2.2.2 description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself. -home: https://github.com/bitnami/charts/tree/master/bitnami/common +home: https://github.com/bitnami/charts/tree/main/bitnami/common icon: https://bitnami.com/downloads/logos/bitnami-mark.png keywords: - common @@ -20,4 +20,4 @@ sources: - https://github.com/bitnami/charts - https://www.bitnami.com/ type: library -version: 2.0.0 +version: 2.2.2 diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/README.md b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/README.md similarity index 90% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/README.md rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/README.md index a2ecd60..ec43a5f 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/README.md +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/README.md @@ -43,10 +43,11 @@ The following table lists the helpers available in the library which are scoped | Helper identifier | Description | Expected Input | |-------------------------------|------------------------------------------------------|------------------------------------------------| -| `common.affinities.nodes.soft` | Return a soft nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | -| `common.affinities.nodes.hard` | Return a hard nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | -| `common.affinities.pods.soft` | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | -| `common.affinities.pods.hard` | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | +| `common.affinities.nodes.soft` | Return a soft nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | +| `common.affinities.nodes.hard` | Return a hard nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | +| `common.affinities.pods.soft` | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | +| `common.affinities.pods.hard` | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | +| `common.affinities.topologyKey` | Return a topologyKey definition | `dict "topologyKey" "FOO"` | ### Capabilities @@ -107,12 +108,12 @@ The following table lists the helpers available in the library which are scoped ### Secrets -| Helper identifier | Description | Expected Input | -|---------------------------|--------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.secrets.name` | Generate the name of the secret. | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure. | -| `common.secrets.key` | Generate secret key. | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure. | -| `common.passwords.manage` | Generate secret password or retrieve one if already created. | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $`, length, strong and chartNAme fields are optional. | -| `common.secrets.exists` | Returns whether a previous generated secret already exists. | `dict "secret" "secret-name" "context" $` | +| Helper identifier | Description | Expected Input | +|-----------------------------------|--------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `common.secrets.name` | Generate the name of the secret. | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure. | +| `common.secrets.key` | Generate secret key. | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure. | +| `common.secrets.passwords.manage` | Generate secret password or retrieve one if already created. | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $`, length, strong and chartNAme fields are optional. | +| `common.secrets.exists` | Returns whether a previous generated secret already exists. | `dict "secret" "secret-name" "context" $` | ### Storage diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_affinities.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_affinities.tpl similarity index 84% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_affinities.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_affinities.tpl index 2387be2..81902a6 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_affinities.tpl +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_affinities.tpl @@ -45,9 +45,17 @@ Return a nodeAffinity definition {{- end -}} {{- end -}} +{{/* +Return a topologyKey definition +{{ include "common.affinities.topologyKey" (dict "topologyKey" "BAR") -}} +*/}} +{{- define "common.affinities.topologyKey" -}} +{{ .topologyKey | default "kubernetes.io/hostname" -}} +{{- end -}} + {{/* Return a soft podAffinity/podAntiAffinity definition -{{ include "common.affinities.pods.soft" (dict "component" "FOO" "extraMatchLabels" .Values.extraMatchLabels "context" $) -}} +{{ include "common.affinities.pods.soft" (dict "component" "FOO" "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "context" $) -}} */}} {{- define "common.affinities.pods.soft" -}} {{- $component := default "" .component -}} @@ -62,15 +70,13 @@ preferredDuringSchedulingIgnoredDuringExecution: {{- range $key, $value := $extraMatchLabels }} {{ $key }}: {{ $value | quote }} {{- end }} - namespaces: - - {{ include "common.names.namespace" .context | quote }} - topologyKey: kubernetes.io/hostname + topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} weight: 1 {{- end -}} {{/* Return a hard podAffinity/podAntiAffinity definition -{{ include "common.affinities.pods.hard" (dict "component" "FOO" "extraMatchLabels" .Values.extraMatchLabels "context" $) -}} +{{ include "common.affinities.pods.hard" (dict "component" "FOO" "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "context" $) -}} */}} {{- define "common.affinities.pods.hard" -}} {{- $component := default "" .component -}} @@ -84,9 +90,7 @@ requiredDuringSchedulingIgnoredDuringExecution: {{- range $key, $value := $extraMatchLabels }} {{ $key }}: {{ $value | quote }} {{- end }} - namespaces: - - {{ include "common.names.namespace" .context | quote }} - topologyKey: kubernetes.io/hostname + topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} {{- end -}} {{/* diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_capabilities.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_capabilities.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_capabilities.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_capabilities.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_errors.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_errors.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_errors.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_errors.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_images.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_images.tpl similarity index 88% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_images.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_images.tpl index f1c92ef..46c659e 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_images.tpl +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_images.tpl @@ -6,18 +6,18 @@ Return the proper image name {{- define "common.images.image" -}} {{- $registryName := .imageRoot.registry -}} {{- $repositoryName := .imageRoot.repository -}} -{{- $tag := .imageRoot.tag | toString -}} -{{- $digest := .imageRoot.digest | toString -}} +{{- $separator := ":" -}} +{{- $termination := .imageRoot.tag | toString -}} {{- if .global }} {{- if .global.imageRegistry }} {{- $registryName = .global.imageRegistry -}} {{- end -}} {{- end -}} -{{- if $digest }} - {{- printf "%s/%s@%s" $registryName $repositoryName $digest -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- if .imageRoot.digest }} + {{- $separator = "@" -}} + {{- $termination = .imageRoot.digest | toString -}} {{- end -}} +{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}} {{- end -}} {{/* diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_ingress.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_ingress.tpl similarity index 95% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_ingress.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_ingress.tpl index 8caf73a..831da9c 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_ingress.tpl +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_ingress.tpl @@ -62,7 +62,7 @@ Usage: {{ include "common.ingress.certManagerRequest" ( dict "annotations" .Values.path.to.the.ingress.annotations ) }} */}} {{- define "common.ingress.certManagerRequest" -}} -{{ if or (hasKey .annotations "cert-manager.io/cluster-issuer") (hasKey .annotations "cert-manager.io/issuer") }} +{{ if or (hasKey .annotations "cert-manager.io/cluster-issuer") (hasKey .annotations "cert-manager.io/issuer") (hasKey .annotations "kubernetes.io/tls-acme") }} {{- true -}} {{- end -}} {{- end -}} diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_labels.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_labels.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_labels.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_labels.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_names.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_names.tpl similarity index 95% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_names.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_names.tpl index 1bdac8b..617a234 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_names.tpl +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_names.tpl @@ -55,11 +55,7 @@ Usage: Allow the release namespace to be overridden for multi-namespace deployments in combined charts. */}} {{- define "common.names.namespace" -}} -{{- if .Values.namespaceOverride -}} -{{- .Values.namespaceOverride -}} -{{- else -}} -{{- .Release.Namespace -}} -{{- end -}} +{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_secrets.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_secrets.tpl similarity index 79% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_secrets.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_secrets.tpl index a53fb44..a1708b2 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_secrets.tpl +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_secrets.tpl @@ -8,7 +8,7 @@ Usage: Params: - existingSecret - ExistingSecret/String - Optional. The path to the existing secrets in the values.yaml given by the user to be used instead of the default one. Allows for it to be of type String (just the secret name) for backwards compatibility. - +info: https://github.com/bitnami/charts/tree/master/bitnami/common#existingsecret + +info: https://github.com/bitnami/charts/tree/main/bitnami/common#existingsecret - defaultNameSuffix - String - Optional. It is used only if we have several secrets in the same deployment. - context - Dict - Required. The context for the template evaluation. */}} @@ -41,7 +41,7 @@ Usage: Params: - existingSecret - ExistingSecret/String - Optional. The path to the existing secrets in the values.yaml given by the user to be used instead of the default one. Allows for it to be of type String (just the secret name) for backwards compatibility. - +info: https://github.com/bitnami/charts/tree/master/bitnami/common#existingsecret + +info: https://github.com/bitnami/charts/tree/main/bitnami/common#existingsecret - key - String - Required. Name of the key in the secret. */}} {{- define "common.secrets.key" -}} @@ -90,10 +90,10 @@ The order in which this function returns a secret password: {{- $passwordLength := default 10 .length }} {{- $providedPasswordKey := include "common.utils.getKeyFromList" (dict "keys" .providedValues "context" $.context) }} {{- $providedPasswordValue := include "common.utils.getValueFromKey" (dict "key" $providedPasswordKey "context" $.context) }} -{{- $secretData := (lookup "v1" "Secret" $.context.Release.Namespace .secret).data }} +{{- $secretData := (lookup "v1" "Secret" (include "common.names.namespace" .context) .secret).data }} {{- if $secretData }} {{- if hasKey $secretData .key }} - {{- $password = index $secretData .key }} + {{- $password = index $secretData .key | quote }} {{- else }} {{- printf "\nPASSWORDS ERROR: The secret \"%s\" does not contain the key \"%s\"\n" .secret .key | fail -}} {{- end -}} @@ -122,6 +122,31 @@ The order in which this function returns a secret password: {{- printf "%s" $password -}} {{- end -}} +{{/* +Reuses the value from an existing secret, otherwise sets its value to a default value. + +Usage: +{{ include "common.secrets.lookup" (dict "secret" "secret-name" "key" "keyName" "defaultValue" .Values.myValue "context" $) }} + +Params: + - secret - String - Required - Name of the 'Secret' resource where the password is stored. + - key - String - Required - Name of the key in the secret. + - defaultValue - String - Required - The path to the validating value in the values.yaml, e.g: "mysql.password". Will pick first parameter with a defined value. + - context - Context - Required - Parent context. + +*/}} +{{- define "common.secrets.lookup" -}} +{{- $value := "" -}} +{{- $defaultValue := required "\n'common.secrets.lookup': Argument 'defaultValue' missing or empty" .defaultValue -}} +{{- $secretData := (lookup "v1" "Secret" (include "common.names.namespace" .context) .secret).data -}} +{{- if and $secretData (hasKey $secretData .key) -}} + {{- $value = index $secretData .key -}} +{{- else -}} + {{- $value = $defaultValue | toString | b64enc -}} +{{- end -}} +{{- printf "%s" $value -}} +{{- end -}} + {{/* Returns whether a previous generated secret already exists @@ -133,7 +158,7 @@ Params: - context - Context - Required - Parent context. */}} {{- define "common.secrets.exists" -}} -{{- $secret := (lookup "v1" "Secret" $.context.Release.Namespace .secret) }} +{{- $secret := (lookup "v1" "Secret" (include "common.names.namespace" .context) .secret) }} {{- if $secret }} {{- true -}} {{- end -}} diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_storage.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_storage.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_storage.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_storage.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_tplvalues.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_tplvalues.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_tplvalues.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_tplvalues.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_utils.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_utils.tpl similarity index 91% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_utils.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_utils.tpl index 8c22b2a..b1ead50 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_utils.tpl +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_utils.tpl @@ -6,7 +6,7 @@ Usage: */}} {{- define "common.utils.secret.getvalue" -}} {{- $varname := include "common.utils.fieldToEnvVar" . -}} -export {{ $varname }}=$(kubectl get secret --namespace {{ .context.Release.Namespace | quote }} {{ .secret }} -o jsonpath="{.data.{{ .field }}}" | base64 -d) +export {{ $varname }}=$(kubectl get secret --namespace {{ include "common.names.namespace" .context | quote }} {{ .secret }} -o jsonpath="{.data.{{ .field }}}" | base64 -d) {{- end -}} {{/* diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_warnings.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_warnings.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/_warnings.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/_warnings.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_cassandra.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_cassandra.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_cassandra.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_cassandra.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_mariadb.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_mariadb.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_mariadb.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_mariadb.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_mongodb.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_mongodb.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_mongodb.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_mongodb.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_mysql.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_mysql.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_mysql.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_mysql.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_postgresql.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_postgresql.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_postgresql.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_postgresql.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_redis.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_redis.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_redis.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_redis.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_validations.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_validations.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/templates/validations/_validations.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/templates/validations/_validations.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/values.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/values.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/charts/common/values.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/charts/common/values.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/NOTES.txt b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/NOTES.txt similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/NOTES.txt rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/NOTES.txt diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/_helpers.tpl b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/_helpers.tpl similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/_helpers.tpl rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/_helpers.tpl diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/deployment.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/deployment.yaml similarity index 94% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/deployment.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/deployment.yaml index 05784e2..949e1fa 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/deployment.yaml +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/deployment.yaml @@ -90,7 +90,8 @@ spec: - -ec - | [[ -f "/opt/bitnami/scripts/git/entrypoint.sh" ]] && source "/opt/bitnami/scripts/git/entrypoint.sh" - git clone {{ .Values.cloneStaticSiteFromGit.repository }} --branch {{ .Values.cloneStaticSiteFromGit.branch }} /app + git clone {{ .Values.cloneStaticSiteFromGit.repository }} --branch {{ .Values.cloneStaticSiteFromGit.branch }} /tmp/app + [[ "$?" -eq 0 ]] && shopt -s dotglob && rm -rf /app/* && mv /tmp/app/* /app/ {{- end }} {{- if .Values.cloneStaticSiteFromGit.gitClone.args }} args: {{- include "common.tplvalues.render" (dict "value" .Values.cloneStaticSiteFromGit.gitClone.args "context" $) | nindent 12 }} @@ -164,6 +165,12 @@ spec: env: - name: BITNAMI_DEBUG value: {{ ternary "true" "false" .Values.image.debug | quote }} + - name: NGINX_HTTP_PORT_NUMBER + value: {{ .Values.containerPorts.http | quote }} + {{- if .Values.containerPorts.https }} + - name: NGINX_HTTPS_PORT_NUMBER + value: {{ .Values.containerPorts.https | quote }} + {{- end }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} @@ -187,26 +194,26 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.extraContainerPorts "context" $) | nindent 12 }} {{- end }} {{- if not .Values.diagnosticMode.enabled }} - {{- if .Values.livenessProbe.enabled }} + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: http - {{- else if .Values.customLivenessProbe }} - livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.readinessProbe.enabled }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readinessProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: http - {{- else if .Values.customReadinessProbe }} - readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.startupProbe.enabled }} + {{- if .Values.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.startupProbe.enabled }} startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.startupProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: http - {{- else if .Values.customStartupProbe }} - startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }} {{- end }} {{- end }} {{- if .Values.resources }} diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/extra-list.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/extra-list.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/extra-list.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/extra-list.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/health-ingress.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/health-ingress.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/health-ingress.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/health-ingress.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/hpa.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/hpa.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/hpa.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/hpa.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/ingress.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/ingress.yaml similarity index 85% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/ingress.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/ingress.yaml index e47c3bd..9d0afca 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/ingress.yaml +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/ingress.yaml @@ -32,6 +32,17 @@ spec: pathType: {{ .Values.ingress.pathType }} {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }} + {{- else }} + - http: + paths: + {{- if .Values.ingress.extraPaths }} + {{- toYaml .Values.ingress.extraPaths | nindent 10 }} + {{- end }} + - path: {{ .Values.ingress.path }} + {{- if eq "true" (include "common.ingress.supportsPathType" .) }} + pathType: {{ .Values.ingress.pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- range .Values.ingress.extraHosts }} - host: {{ .name | quote }} diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/pdb.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/pdb.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/pdb.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/pdb.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/prometheusrules.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/prometheusrules.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/prometheusrules.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/prometheusrules.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/server-block-configmap.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/server-block-configmap.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/server-block-configmap.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/server-block-configmap.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/serviceaccount.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/serviceaccount.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/serviceaccount.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/serviceaccount.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/servicemonitor.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/servicemonitor.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/servicemonitor.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/servicemonitor.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/svc.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/svc.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/svc.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/svc.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/tls-secrets.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/tls-secrets.yaml similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/templates/tls-secrets.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/templates/tls-secrets.yaml diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/values.schema.json b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/values.schema.json similarity index 100% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/values.schema.json rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/values.schema.json diff --git a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/values.yaml b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/values.yaml similarity index 99% rename from simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/values.yaml rename to simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/values.yaml index 2a7ed2a..0b4966b 100644 --- a/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.0/values.yaml +++ b/simple-helm/.helm-charts/https_charts.bitnami.com/bitnami/nginx/13.2.20/values.yaml @@ -71,7 +71,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/nginx - tag: 1.23.1-debian-11-r8 + tag: 1.23.3-debian-11-r3 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -421,7 +421,7 @@ cloneStaticSiteFromGit: image: registry: docker.io repository: bitnami/git - tag: 2.37.1-debian-11-r10 + tag: 2.39.0-debian-11-r3 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -773,7 +773,7 @@ metrics: image: registry: docker.io repository: bitnami/nginx-exporter - tag: 0.10.0-debian-11-r24 + tag: 0.11.0-debian-11-r32 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -852,7 +852,7 @@ metrics: ## scrapeTimeout: "" ## @param metrics.serviceMonitor.selector Prometheus instance selector labels - ## ref: https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-configuration + ## ref: https://github.com/bitnami/charts/tree/main/bitnami/prometheus-operator#prometheus-configuration ## ## selector: ## prometheus: my-prometheus diff --git a/simple-helm/deployment/nginx/helm-chart.yml b/simple-helm/deployment/nginx/helm-chart.yml index 79b67bb..1b4c591 100644 --- a/simple-helm/deployment/nginx/helm-chart.yml +++ b/simple-helm/deployment/nginx/helm-chart.yml @@ -1,6 +1,6 @@ helmChart: repo: https://charts.bitnami.com/bitnami chartName: nginx - chartVersion: 13.2.0 + chartVersion: 13.2.20 releaseName: nginx output: deploy.yml