diff --git a/upstreamed/dokuwiki/Chart.yaml b/upstreamed/dokuwiki/Chart.yaml index 7e84db9d4..ff1ed96f5 100644 --- a/upstreamed/dokuwiki/Chart.yaml +++ b/upstreamed/dokuwiki/Chart.yaml @@ -1,5 +1,5 @@ name: dokuwiki -version: 2.0.0 +version: 2.0.1 appVersion: 0.20180422.201805030840 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. diff --git a/upstreamed/dokuwiki/README.md b/upstreamed/dokuwiki/README.md index e90de2c15..45cf3c0c9 100644 --- a/upstreamed/dokuwiki/README.md +++ b/upstreamed/dokuwiki/README.md @@ -1,6 +1,6 @@ # DokuWiki -[DokuWiki](https://www.dokuwiki.org) DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. All data is stored in plain text files, so no database is required. +[DokuWiki](https://www.dokuwiki.org) is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. All data is stored in plain text files, so no database is required. ## TL;DR; @@ -46,8 +46,8 @@ The following table lists the configurable parameters of the DokuWiki chart and | Parameter | Description | Default | |--------------------------------------|------------------------------------------------------------|-----------------------------------------------| | `image.registry` | DokuWiki image registry | `docker.io` | -| `image.repository` | DokuWiki Image name | `bitnami/dokuwiki` | -| `image.tag` | DokuWiki Image tag | `{VERSION}` | +| `image.repository` | DokuWiki image name | `bitnami/dokuwiki` | +| `image.tag` | DokuWiki image tag | `{VERSION}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify image pull secrets | `nil` | | `dokuwikiUsername` | User of the application | `user` | diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index 71b1e9271..a7870bac6 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,5 +1,5 @@ name: rabbitmq -version: 1.1.8 +version: 1.1.9 appVersion: 3.7.6-ol-7 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index 10e7b1a1a..a06218894 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -49,7 +49,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `image.repository` | Rabbitmq Image name | `bitnami/rabbitmq` | | `image.tag` | Rabbitmq Image tag | `{VERSION}` | | `image.pullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `image.pullSecrets` | Specify docker-ragistry secret names as an array | `nil` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | | `image.debug` | Specify if debug values should be set | `false` | | `rbacEnabled` | Specify if rbac is enabled in your cluster | `true` | | `rabbitmq.username` | RabbitMQ application username | `user` | @@ -73,7 +73,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `ingress.tls` | enable ingress with tls | `false` | | `ingress.tlsSecret` | tls type secret to be used | `myTlsSecret` | | `ingress.annotations` | ingress annotations as an array | [] | -| `livenessProbe.enabled` | would you like a livessProbed to be enabled | `true` | +| `livenessProbe.enabled` | would you like a livenessProbed to be enabled | `true` | | `livenessProbe.initialDelaySeconds` | number of seconds | 120 | | `livenessProbe.timeoutSeconds` | number of seconds | 5 | | `livenessProbe.failureThreshold` | number of failures | 6 | diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index 24474e434..9dc325b9d 100644 --- a/upstreamed/redis/Chart.yaml +++ b/upstreamed/redis/Chart.yaml @@ -1,5 +1,5 @@ name: redis -version: 3.6.0 +version: 3.6.1 appVersion: 4.0.10 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/upstreamed/redis/README.md b/upstreamed/redis/README.md index f60c430f5..4b48b7b01 100644 --- a/upstreamed/redis/README.md +++ b/upstreamed/redis/README.md @@ -55,7 +55,7 @@ The following table lists the configurable parameters of the Redis chart and the | `image.repository` | Redis Image name | `bitnami/redis` | | `image.tag` | Redis Image tag | `{VERSION}` | | `image.pullPolicy` | Image pull policy | `Always` | -| `image.pullSecrets` | Specify docker-ragistry secret names as an array | `nil` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | | `cluster.enabled` | Use master-slave topology | `true` | | `cluster.slaveCount` | Number of slaves | 1 | | `existingSecret` | Name of existing secret object (for password authentication) | `nil` | diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index da7031925..1392c74ad 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,5 +1,5 @@ name: wordpress -version: 2.0.1 +version: 2.1.0 appVersion: 4.9.6 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/upstreamed/wordpress/README.md b/upstreamed/wordpress/README.md index f460cdd20..11e3f9b3a 100644 --- a/upstreamed/wordpress/README.md +++ b/upstreamed/wordpress/README.md @@ -96,6 +96,8 @@ The following table lists the configurable parameters of the WordPress chart and | `persistence.accessMode` | PVC Access Mode | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request | `10Gi` | | `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/wordpress](http://github.com/bitnami/bitnami-docker-wordpress). For more information please refer to the [bitnami/wordpress](http://github.com/bitnami/bitnami-docker-wordpress) image documentation. diff --git a/upstreamed/wordpress/templates/deployment.yaml b/upstreamed/wordpress/templates/deployment.yaml index adf57989b..8b7e41636 100644 --- a/upstreamed/wordpress/templates/deployment.yaml +++ b/upstreamed/wordpress/templates/deployment.yaml @@ -146,3 +146,12 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} {{- end -}} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} + diff --git a/upstreamed/wordpress/values-production.yaml b/upstreamed/wordpress/values-production.yaml index 5ab58b6a6..8bf2b9912 100644 --- a/upstreamed/wordpress/values-production.yaml +++ b/upstreamed/wordpress/values-production.yaml @@ -244,3 +244,13 @@ resources: ## 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: {} diff --git a/upstreamed/wordpress/values.yaml b/upstreamed/wordpress/values.yaml index f85f4100c..612141d50 100644 --- a/upstreamed/wordpress/values.yaml +++ b/upstreamed/wordpress/values.yaml @@ -242,3 +242,13 @@ resources: ## 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: {}