Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-13 14:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/apache] Add extra-list.yaml & extra initContainers & sidecars (#5534)

Browse Source 
* [bitnami/apache] extra-list.yaml

* [bitnami/apache] add initContainers & sidecars
This commit is contained in:
Quan TRAN
2021-02-18 09:55:21 +01:00
committed by GitHub
parent 3fe68649e1
commit 8f589f135b
5 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/apache/Chart.yaml
View File

@@ -26,4 +26,4 @@ name: apache
sources:
- https://github.com/bitnami/bitnami-docker-apache
- https://httpd.apache.org
version: 8.2.3
version: 8.3.0

19
bitnami/apache/README.md
View File

@@ -47,15 +47,26 @@ $ helm delete my-release
The command removes all the Kubernetes components associated with the chart and deletes the release.
### Global parameters
| Parameter | Description | Default |
|---------------------------|-------------------------------------------------|---------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
### Common parameters
| Parameter | Description | Default |
|---------------------|----------------------------------------------------------------------|--------------------------------|
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` (evaluated as a template) |
| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` |
## Parameters
The following tables lists the configurable parameters of the Apache chart and their default values.
| Parameter | Description | Default |
|----------------------------------|-------------------------------------------------------------------------------------------|--------------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` |
| `image.registry` | Apache Docker image registry | `docker.io` |
| `image.repository` | Apache Docker image name | `bitnami/apache` |
| `image.tag` | Apache Docker image tag | `{TAG_NAME}` |
@@ -122,6 +133,8 @@ The following tables lists the configurable parameters of the Apache chart and t
| `extraVolumes` | Array to add extra volumes | `[]` (evaluated as a template) |
| `extraVolumeMounts` | Array to add extra mount | `[]` (evaluated as a template) |
| `extraEnvVars` | Array to add extra environment variables | `[]` (evaluated as a template) |
| `initContainers` | Add additional init containers to the Apache pods | `{}` (evaluated as a template) |
| `sidecars` | Add additional sidecar containers to the Apache pods | `{}` (evaluated as a template) |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

16
bitnami/apache/templates/deployment.yaml
View File

@@ -40,8 +40,9 @@ spec:
{{- if .Values.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.cloneHtdocsFromGit.enabled }}
{{- if or .Values.initContainers .Values.cloneHtdocsFromGit.enabled }}
initContainers:
{{- if .Values.cloneHtdocsFromGit.enabled }}
- name: git-clone-repository
image: {{ include "git.image" . }}
imagePullPolicy: {{ .Values.git.pullPolicy | quote }}
@@ -54,7 +55,13 @@ spec:
volumeMounts:
- name: htdocs
mountPath: /app
{{- end }}
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- end }}
containers:
{{- if .Values.cloneHtdocsFromGit.enabled }}
- name: git-repo-syncer
image: {{ include "git.image" . }}
imagePullPolicy: {{ .Values.git.pullPolicy | quote }}
@@ -70,9 +77,7 @@ spec:
volumeMounts:
- name: htdocs
mountPath: /app
{{- else }}
containers:
{{- end }}
{{- end }}
- name: apache
image: {{ include "apache.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
@@ -153,6 +158,9 @@ spec:
resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) | nindent 8 }}
{{- end }}
volumes:
{{- if (include "apache.useHtdocs" .) }}
- name: htdocs

4
bitnami/apache/templates/extra-list.yaml Normal file
View File

@@ -0,0 +1,4 @@
{{- range .Values.extraDeploy }}
---
{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
{{- end }}

28
bitnami/apache/values.yaml
View File

@@ -34,6 +34,10 @@ image:
##
debug: false
## Extra objects to deploy (value evaluated as a template)
##
extraDeploy: []
## Bitnami Git image version
## ref: https://hub.docker.com/r/bitnami/git/tags/
##
@@ -304,6 +308,30 @@ extraVolumeMounts: []
##
extraEnvVars: []
## Add init containers to the Apache pods.
## Example:
## initContainers:
## - name: your-image-name
## image: your-image
## imagePullPolicy: Always
## ports:
## - name: portname
## containerPort: 1234
##
initContainers: {}
## Add sidecars to the Apache pods.
## Example:
## sidecars:
## - name: your-image-name
## image: your-image
## imagePullPolicy: Always
## ports:
## - name: portname
## containerPort: 1234
##
sidecars: {}
## Service parameters
##
service: