[stable/joomla] Add nodeSelector, tolerations and affinity (#8319)

Signed-off-by: juan131 <juan@bitnami.com>
This commit is contained in:
Juan Ariza Toledano
2018-10-10 06:42:36 -07:00
committed by k8s-ci-robot
parent 5b8e14e9be
commit 686a3947ba
4 changed files with 50 additions and 20 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: joomla
version: 3.0.3
version: 3.1.0
appVersion: 3.8.12
description: PHP content management system (CMS) for publishing web content
keywords:
+3
View File
@@ -109,6 +109,9 @@ The following table lists the configurable parameters of the Joomla! chart and t
| `readinessProbe.timeoutSeconds` | When the probe times out | 5 |
| `readinessProbe.failureThreshold` | Minimum consecutive failures to be considered failed | 6 |
| `readinessProbe.successThreshold` | Minimum consecutive successes to be considered successful | 1 |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `tolerations` | List of node taints to tolerate | `[]` |
| `affinity` | Map of node/pod affinities | `{}` |
The above parameters map to the env variables defined in [bitnami/joomla](http://github.com/bitnami/bitnami-docker-joomla). For more information please refer to the [bitnami/joomla](http://github.com/bitnami/bitnami-docker-joomla) image documentation.
+12
View File
@@ -144,4 +144,16 @@ spec:
{{- else }}
emptyDir: {}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end -}}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- end }}
+34 -19
View File
@@ -42,7 +42,7 @@ allowEmptyPassword: "yes"
##
externalDatabase:
## Database host
host:
host: localhost
## Database host
port: 3306
@@ -51,7 +51,7 @@ externalDatabase:
user: bn_joomla
## Database password
password:
password: ""
## Database name
database: bitnami_joomla
@@ -89,7 +89,7 @@ mariadb:
## MariaDB admin password
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run
##
# root:
# rootUser:
# password:
## Enable persistence using Persistent Volume Claims
@@ -109,6 +109,23 @@ mariadb:
accessMode: ReadWriteOnce
size: 8Gi
## Configure extra options for liveness and readiness probes
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
livenessProbe:
enbaled: true
initialDelaySeconds: 120
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 6
successThreshold: 1
readinessProbe:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 6
successThreshold: 1
## Kubernetes svc configuration
##
service:
@@ -215,19 +232,17 @@ resources:
memory: 512Mi
cpu: 300m
## Configure extra options for liveness and readiness probes
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
livenessProbe:
enbaled: true
initialDelaySeconds: 120
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 6
successThreshold: 1
readinessProbe:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 6
successThreshold: 1
## Node labels for pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/
##
nodeSelector: {}
## Tolerations for pod assignment
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
##
tolerations: []
## Affinity for pod assignment
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
##
affinity: {}