Update Helm operator to SDK 0.15.2 (#111)

* Update HELM operator to SDK 0.15.2

Author: bharathi-tenneti

helm/memcached-operator/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/helm-operator:v0.14.1
+FROM quay.io/operator-framework/helm-operator:v0.15.2
 
 COPY watches.yaml ${HOME}/watches.yaml
 COPY helm-charts/ ${HOME}/helm-charts/

helm/memcached-operator/deploy/crds/cache.example.com_v1alpha1_memcached_cr.yaml

@@ -8,7 +8,7 @@ spec:
   ## Memcached image and tag
   ## ref: https://hub.docker.com/r/library/memcached/tags/
   ##
-  image: memcached:1.5.12-alpine
+  image: memcached:1.5.20
 
   ## Specify a imagePullPolicy
   ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
@@ -86,7 +86,7 @@ spec:
     enabled: false
 
     ## Memcached exporter image and tag
-    image: quay.io/prometheus/memcached-exporter:v0.4.1
+    image: quay.io/prometheus/memcached-exporter:v0.6.0
 
     ## Specify a imagePullPolicy
     ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'

helm/memcached-operator/helm-charts/memcached/Chart.yaml

@@ -1,8 +1,7 @@
 apiVersion: v1
-appVersion: 1.5.12
+appVersion: 1.5.20
 description: Free & open source, high-performance, distributed memory object caching
   system.
-engine: gotpl
 home: http://memcached.org/
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/2/27/Memcached.svg/1024px-Memcached.svg.png
 keywords:
@@ -18,4 +17,4 @@ maintainers:
 name: memcached
 sources:
 - https://github.com/docker-library/memcached
-version: 3.0.1
+version: 3.2.2

helm/memcached-operator/helm-charts/memcached/README.md

@@ -47,7 +47,8 @@ The following table lists the configurable parameters of the Memcached chart and
 | `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.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 | `{}`                       |
@@ -127,3 +128,5 @@ spec:
 ```
 
 Once you've done this, you can upgrade to 3.x with Helm as normal.
+
+

helm/memcached-operator/helm-charts/memcached/templates/NOTES.txt

@@ -3,7 +3,7 @@ Memcached can be accessed via port 11211 on the following DNS name from within y
 
 If you'd like to test your instance, forward the port locally:
 
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "memcached.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "memcached.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   kubectl port-forward $POD_NAME 11211
 
 In another tab, attempt to set a key:

helm/memcached-operator/helm-charts/memcached/templates/_helpers.tpl

@@ -22,3 +22,23 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "memcached.labels" -}}
+app.kubernetes.io/name: {{ include "memcached.name" . }}
+helm.sh/chart: {{ include "memcached.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "memcached.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

helm/memcached-operator/helm-charts/memcached/templates/pdb.yaml

@@ -2,16 +2,15 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "memcached.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: "post-upgrade, post-install"
+    helm.sh/hook-delete-policy: "before-hook-creation"
   labels:
-    app: {{ template "memcached.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+{{ include "memcached.labels" . | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "memcached.fullname" . }}
-      chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-      release: "{{ .Release.Name }}"
-      heritage: "{{ .Release.Service }}"
+      app.kubernetes.io/name: {{ include "memcached.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   minAvailable: {{ .Values.pdbMinAvailable }}

helm/memcached-operator/helm-charts/memcached/templates/statefulset.yaml

@@ -2,27 +2,23 @@ apiVersion: apps/v1
 kind: {{ .Values.kind }}
 metadata:
   name: {{ template "memcached.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "memcached.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+{{ include "memcached.labels" . | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "memcached.fullname" . }}
-      release: "{{ .Release.Name }}"
+      app.kubernetes.io/name: {{ include "memcached.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   {{- if eq .Values.kind "StatefulSet" }}
   serviceName: {{ template "memcached.fullname" . }}
   {{- end }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
       labels:
-        app: {{ template "memcached.fullname" . }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        release: "{{ .Release.Name }}"
-        heritage: "{{ .Release.Service }}"
+        app.kubernetes.io/name: {{ include "memcached.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
 {{- with .Values.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end}}
@@ -42,17 +38,17 @@ spec:
           - topologyKey: "kubernetes.io/hostname"
             labelSelector:
               matchLabels:
-                app:  {{ template "memcached.fullname" . }}
-                release: {{ .Release.Name | quote }}
+                app.kubernetes.io/name: {{ include "memcached.name" . }}
+                app.kubernetes.io/instance: {{ .Release.Name }}
         {{- else if eq .Values.AntiAffinity "soft" }}
           preferredDuringSchedulingIgnoredDuringExecution:
           - weight: 5
             podAffinityTerm:
               topologyKey: "kubernetes.io/hostname"
               labelSelector:
                 matchLabels:
-                  app:  {{ template "memcached.fullname" . }}
-                  release: {{ .Release.Name | quote }}
+                  app.kubernetes.io/name: {{ include "memcached.name" . }}
+                  app.kubernetes.io/instance: {{ .Release.Name }}
         {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"

helm/memcached-operator/helm-charts/memcached/templates/svc.yaml

@@ -2,11 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "memcached.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "memcached.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+{{ include "memcached.labels" . | indent 4 }}
   annotations:
 {{ toYaml .Values.serviceAnnotations | indent 4 }}
 spec:
@@ -21,4 +19,5 @@ spec:
     targetPort: metrics
 {{- end }}
   selector:
-    app: {{ template "memcached.fullname" . }}
+    app.kubernetes.io/name: {{ include "memcached.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}

helm/memcached-operator/helm-charts/memcached/values.yaml

@@ -1,7 +1,7 @@
 ## Memcached image and tag
 ## ref: https://hub.docker.com/r/library/memcached/tags/
 ##
-image: memcached:1.5.12-alpine
+image: memcached:1.5.20
 
 ## Specify a imagePullPolicy
 ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
@@ -79,7 +79,7 @@ metrics:
   enabled: false
 
   ## Memcached exporter image and tag
-  image: quay.io/prometheus/memcached-exporter:v0.4.1
+  image: quay.io/prometheus/memcached-exporter:v0.6.0
 
   ## Specify a imagePullPolicy
   ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
@@ -93,9 +93,7 @@ metrics:
   resources: {}
 
 extraContainers: |
-
 extraVolumes: |
-
 ## Custom metadata labels to be applied to statefulset and pods
 # podLabels:
 #   foo: "bar"