[bitnami/nginx] Add resources for Add resources to Git-Sync. Otherwise hpa did not work (#16204)

* Add resources for Sync-Container

Signed-off-by: MathysDev <michael@mmhu.ch>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update bitnami/nginx/templates/deployment.yaml

Co-authored-by: Miguel Ruiz <miruiz@vmware.com>
Signed-off-by: MathysDev <67581434+MathysDev@users.noreply.github.com>

* Update bitnami/nginx/values.yaml

Co-authored-by: Miguel Ruiz <miruiz@vmware.com>
Signed-off-by: MathysDev <67581434+MathysDev@users.noreply.github.com>

* remove extra lines

Signed-off-by: MathysDev <michael@mmhu.ch>

* moved resources under cloneStaticSiteFromGit.gitSync.resources

Signed-off-by: MathysDev <michael@mmhu.ch>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

---------

Signed-off-by: MathysDev <michael@mmhu.ch>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Signed-off-by: MathysDev <67581434+MathysDev@users.noreply.github.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Miguel Ruiz <miruiz@vmware.com>
This commit is contained in:
MathysDev
2023-04-28 17:15:19 +02:00
committed by GitHub
parent f490e633ae
commit 3c5db2820b
4 changed files with 36 additions and 24 deletions

View File

@@ -25,4 +25,4 @@ name: nginx
sources:
- https://github.com/bitnami/containers/tree/main/bitnami/nginx
- https://www.nginx.org
version: 14.0.0
version: 14.1.0

View File

@@ -168,28 +168,30 @@ 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.40.0-debian-11-r12` |
| `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.40.0-debian-11-r12` |
| `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.gitSync.resources.limits` | The resources limits for the git-repo-syncer container | `{}` |
| `cloneStaticSiteFromGit.gitSync.resources.requests` | The requested resources for the git-repo-syncer container | `{}` |
| `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

View File

@@ -133,6 +133,9 @@ spec:
{{- if .Values.cloneStaticSiteFromGit.gitSync.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.cloneStaticSiteFromGit.gitSync.args "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.cloneStaticSiteFromGit.gitSync.resources }}
resources: {{- toYaml .Values.cloneStaticSiteFromGit.gitSync.resources | nindent 12 }}
{{- end }}
volumeMounts:
- name: staticsite
mountPath: /app

View File

@@ -255,7 +255,6 @@ resources:
## cpu: 100m
## memory: 128Mi
requests: {}
## NGINX containers' lifecycleHooks
## ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/
@@ -465,6 +464,14 @@ cloneStaticSiteFromGit:
## @param cloneStaticSiteFromGit.gitSync.args Override default container args for git-repo-syncer
##
args: []
## git-repo-syncer resource requests and limits
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
## @param cloneStaticSiteFromGit.gitSync.resources.limits The resources limits for the git-repo-syncer container
## @param cloneStaticSiteFromGit.gitSync.resources.requests The requested resources for the git-repo-syncer container
##
resources:
limits: {}
requests: {}
## @param cloneStaticSiteFromGit.extraEnvVars Additional environment variables to set for the in the containers that clone static site from git
## E.g:
## extraEnvVars: