diff --git a/stable/memcached/Chart.yaml b/stable/memcached/Chart.yaml index 90e5ffc2e947..a9409889e469 100644 --- a/stable/memcached/Chart.yaml +++ b/stable/memcached/Chart.yaml @@ -1,6 +1,6 @@ name: memcached -version: 2.5.0 -appVersion: 1.5.6 +version: 2.6.0 +appVersion: 1.5.12 description: Free & open source, high-performance, distributed memory object caching system. keywords: diff --git a/stable/memcached/README.md b/stable/memcached/README.md index 7b9ec3468843..ee87509a4d1c 100644 --- a/stable/memcached/README.md +++ b/stable/memcached/README.md @@ -54,6 +54,9 @@ The following table lists the configurable parameters of the Memcached chart and | `extraVolumes` | Volume definitions to add as string | Un-set | | `kind` | Install as StatefulSet or Deployment | StatefulSet | | `podAnnotations` | Map of annotations to add to the pod(s) | `{}` | +| `nodeSelector` | Simple pod scheduling control | `{}` | +| `tolerations` | Allow or deny specific node taints | `{}` | +| `affinity` | Advanced pod scheduling control | `{}` | The above parameters map to `memcached` params. For more information please refer to the [Memcached documentation](https://github.com/memcached/memcached/wiki/ConfiguringServer). diff --git a/stable/memcached/templates/statefulset.yaml b/stable/memcached/templates/statefulset.yaml index 007c71fb2673..4b79fda728a3 100644 --- a/stable/memcached/templates/statefulset.yaml +++ b/stable/memcached/templates/statefulset.yaml @@ -91,3 +91,11 @@ spec: nodeSelector: {{ toYaml . | trim | indent 8}} {{- end }} +{{- with .Values.tolerations }} + tolerations: +{{ toYaml . | trim | indent 8}} +{{- end }} +{{- with .Values.affinity }} + affinity: +{{ toYaml . | trim | indent 8}} +{{- end }} \ No newline at end of file diff --git a/stable/memcached/values.yaml b/stable/memcached/values.yaml index a2c332679d70..c617f2e7d71d 100644 --- a/stable/memcached/values.yaml +++ b/stable/memcached/values.yaml @@ -1,7 +1,7 @@ ## Memcached image and tag ## ref: https://hub.docker.com/r/library/memcached/tags/ ## -image: memcached:1.5.6-alpine +image: memcached:1.5.12-alpine ## Specify a imagePullPolicy ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent' @@ -44,8 +44,17 @@ resources: memory: 64Mi cpu: 50m +## Key:value pair for assigning pod to specific sets of nodes +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ nodeSelector: {} +## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ +tolerations: {} + +## Advanced scheduling controls +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ +affinity: {} + metrics: ## Expose memcached metrics in Prometheus format enabled: false