Bump memcached to v2.9.0

charts/memcached/v2.9.0/Chart.yaml

+apiVersion: v1
 name: memcached
-version: 2.3.1
-appVersion: 1.5.6
+version: 2.9.0
+appVersion: 1.5.12
 description: Free & open source, high-performance, distributed memory object caching
   system.
 keywords:
 - memcached
 - cache
 home: http://memcached.org/
-icon: https://upload.wikimedia.org/wikipedia/en/thumb/2/27/Memcached.svg/1024px-Memcached.svg.png
+icon: file://../memcached.png
 sources:
 - https://github.com/docker-library/memcached
 maintainers:

charts/memcached/v2.9.0/README.md

@@ -2,18 +2,28 @@
 
 The following table lists the configurable parameters of the Memcached chart and their default values.
 
-|      Parameter            |          Description            |                         Default                         |
-|---------------------------|---------------------------------|---------------------------------------------------------|
-| `image`                   | The image to pull and run       | A recent official memcached tag                         |
-| `imagePullPolicy`         | Image pull policy               | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
-| `memcached.verbosity`     | Verbosity level (v, vv, or vvv) | Un-set.                                                 |
-| `memcached.maxItemMemory` | Max memory for items (in MB)    | `64`                                                    |
-| `metrics.enabled`         | Expose metrics in prometheus format | false                                               |
-| `metrics.image`           | The image to pull and run for the metrics exporter | A recent official memcached tag      |
-| `metrics.imagePullPolicy` | Image pull policy               | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
-| `metrics.resources`       | CPU/Memory resource requests/limits for the metrics exporter | `{}`                       |
-| `extraContainers`         | Container sidecar definition(s) as string | Un-set                                        |
-| `extraVolumes`            | Volume definitions to add as string | Un-set                                              |
+|      Parameter             |          Description            |                         Default                         |
+|----------------------------|---------------------------------|---------------------------------------------------------|
+| `image`                    | The image to pull and run       | A recent official memcached tag                         |
+| `imagePullPolicy`          | Image pull policy               | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
+| `memcached.verbosity`      | Verbosity level (v, vv, or vvv) | Un-set.                                                 |
+| `memcached.maxItemMemory`  | Max memory for items (in MB)    | `64`                                                    |
+| `memcached.extraArgs`      | Additional memcached arguments  | `[]`                                                    |
+| `metrics.enabled`          | Expose metrics in prometheus format | false                                               |
+| `metrics.image`            | The image to pull and run for the metrics exporter | A recent official memcached tag      |
+| `metrics.imagePullPolicy`  | Image pull policy               | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
+| `metrics.resources`        | CPU/Memory resource requests/limits for the metrics exporter | `{}`                       |
+| `extraContainers`          | Container sidecar definition(s) as string | Un-set                                        |
+| `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) | `{}`                                            |
+| `podLabels`                | Custom Labels to be applied to statefulset | Un-set                                       |
+| `nodeSelector`             | Simple pod scheduling control | `{}`                                                      |
+| `tolerations`              | Allow or deny specific node taints | `{}`                                                 |
+| `affinity`                 | Advanced pod scheduling control | `{}`                                                    |
+| `securityContext.enabled`  | Enable security context    | `true`                                                       |
+| `securityContext.fsGroup`  | Group ID for the container | `1001`                                                       |
+| `securityContext.runAsUser`| User ID for the container  | `1001`                                                       |
 
 The above parameters map to `memcached` params. For more information please refer to the [Memcached documentation](https://github.com/memcached/memcached/wiki/ConfiguringServer).
 

charts/memcached/v2.9.0/app-readme.md

@@ -4,6 +4,5 @@
 
 Based on the [memcached](https://github.com/bitnami/charts/tree/master/bitnami/memcached) chart from the [Bitnami Charts](https://github.com/bitnami/charts) repository.
 
-## Introduction
-
-This chart bootstraps a [Memcached](https://hub.docker.com/_/memcached/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+### Upgrade Notes:
+Upgrading from version < 2.9.0 requires to select the `delete and recreate` option.

charts/memcached/v2.9.0/questions.yml

 categories:
 - Cache
+labels:
+  io.cattle.role: project # options are cluster/project
+rancher_min_version: 2.3
 questions:
 - variable: defaultImage
   default: "true"
@@ -10,15 +13,10 @@ questions:
   group: "Container Images"
   subquestions:
   - variable: image
-    default: "memcached"
+    default: "memcached:1.5.12-alpine"
     description: "Memcached Docker image"
     type: string
     label: Memcached Docker Image
-  - variable: imageTag
-    default: "1.5.6-alpine"
-    description: "memcached Docker image tag"
-    type: string
-    label: Memcached Docker Image Tag
 - variable: replicaCount
   default: "3"
   description: "Number or Memcached pods to run"
@@ -69,14 +67,8 @@ questions:
   group: "Metrics Settings"
   subquestions:
   - variable: metrics.image
-    default: "quay.io/prometheus/memcached-exporter"
+    default: "ranchercharts/prometheus-memcached-exporter:v0.4.1"
     description: "Docker repository of memcached metrics exporter"
     type: string
     label: Metrics Image Repository
     required: true
-  - variable: metrics.imageTag
-    default: "v0.4.1"
-    description: "memcached metrics image tag"
-    type: string
-    required: true
-    label: Metrics Image Tag

charts/memcached/v2.9.0/templates/pdb.yaml

@@ -2,6 +2,11 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "memcached.fullname" . }}
+  labels:
+    app: {{ template "memcached.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
 spec:
   selector:
     matchLabels:
@@ -10,4 +15,3 @@ spec:
       release: "{{ .Release.Name }}"
       heritage: "{{ .Release.Service }}"
   minAvailable: {{ .Values.pdbMinAvailable }}
-  
\ No newline at end of file

charts/memcached/v2.9.0/templates/statefulset.yaml

-apiVersion: apps/v1beta1
-kind: StatefulSet
+apiVersion: apps/v1
+kind: {{ .Values.kind }}
 metadata:
   name: {{ template "memcached.fullname" . }}
   labels:
@@ -8,8 +8,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
+  {{- if eq .Values.kind "StatefulSet" }}
   serviceName: {{ template "memcached.fullname" . }}
+  {{- end }}
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "memcached.fullname" . }}
+      release: "{{ .Release.Name }}"
   template:
     metadata:
       labels:
@@ -17,7 +23,18 @@ spec:
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
         heritage: "{{ .Release.Service }}"
+{{- with .Values.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end}}
+{{- with .Values.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
     spec:
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
       affinity:
         podAntiAffinity:
         {{- if eq .Values.AntiAffinity "hard" }}
@@ -39,11 +56,15 @@ spec:
         {{- end }}
       containers:
       - name: {{ template "memcached.fullname" . }}
-        image: {{ .Values.image }}:{{ .Values.imageTag }}
+        image: {{ .Values.image }}
         imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
+        {{- if .Values.securityContext.enabled }}
+        securityContext:
+          runAsUser: {{ .Values.securityContext.runAsUser }}
+        {{- end }}
         command:
         - memcached
-        - -m {{ .Values.memcached.maxItemMemory  }}
+        - -m {{ .Values.memcached.maxItemMemory }}
         {{- if .Values.memcached.extendedOptions }}
         - -o
         - {{ .Values.memcached.extendedOptions }}
@@ -51,6 +72,9 @@ spec:
         {{- if .Values.memcached.verbosity }}
         - -{{ .Values.memcached.verbosity }}
         {{- end }}
+{{- with .Values.memcached.extraArgs }}
+{{ toYaml . | indent 8 }}
+{{- end }}
         ports:
         - name: memcache
           containerPort: 11211
@@ -68,8 +92,12 @@ spec:
 {{ toYaml .Values.resources | indent 10 }}
 {{- if .Values.metrics.enabled }}
       - name: metrics
-        image: {{ .Values.metrics.image }}:{{ .Values.metrics.imageTag }}
+        image: {{ .Values.metrics.image }}
         imagePullPolicy: {{ default "" .Values.metrics.imagePullPolicy | quote }}
+        {{- if .Values.securityContext.enabled }}
+        securityContext:
+          runAsUser: {{ .Values.securityContext.runAsUser }}
+        {{- end }}
         ports:
         - name: metrics
           containerPort: 9150
@@ -87,3 +115,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 }}

charts/memcached/v2.9.0/values.yaml

 ## Memcached image and tag
 ## ref: https://hub.docker.com/r/library/memcached/tags/
 ##
-image: memcached
-imageTag: 1.5.6-alpine
+image: ranchercharts/memcached:1.5.12-alpine
 
 ## Specify a imagePullPolicy
 ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
@@ -30,10 +29,19 @@ memcached:
   verbosity: v
   extendedOptions: modern
 
+  ## Additional command line arguments to pass to memcached
+  ## E.g. to specify a maximum value size
+  ## extraArgs:
+  ##   - -I 2m
+  extraArgs: []
+
 ## Define various attributes of the service
 serviceAnnotations: {}
 #  prometheus.io/scrape: "true"
 
+## StatefulSet or Deployment
+kind: StatefulSet
+
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
@@ -42,15 +50,30 @@ 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: {}
+
+## Memcached pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
 metrics:
   ## Expose memcached metrics in Prometheus format
   enabled: false
 
   ## Memcached exporter image and tag
-  image: quay.io/prometheus/memcached-exporter
-  imageTag: v0.4.1
+  image: ranchercharts/prometheus-memcached-exporter:v0.4.1
 
   annotations:
     prometheus.io/scrape: "true"
@@ -70,3 +93,11 @@ metrics:
 extraContainers: |
 
 extraVolumes: |
+
+## Custom metadata labels to be applied to statefulset and pods
+# podLabels:
+#   foo: "bar"
+#   bar: "foo"
+
+# To be added to the server pod(s)
+podAnnotations: {}