Skip to content

Commit

Permalink
Bump memcached version, add tolerations and affinity support (helm#11134
Browse files Browse the repository at this point in the history
)

Signed-off-by: Andy Snowden <[email protected]>
  • Loading branch information
Andy Snowden authored and k8s-ci-robot committed Feb 5, 2019
1 parent 55f2637 commit 5b98227
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
4 changes: 2 additions & 2 deletions stable/memcached/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 3 additions & 0 deletions stable/memcached/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
8 changes: 8 additions & 0 deletions stable/memcached/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
11 changes: 10 additions & 1 deletion stable/memcached/values.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5b98227

Please sign in to comment.