Support pod annotations in chart

chart/searchlight/README.md

@@ -59,6 +59,7 @@ The following table lists the configurable parameters of the Searchlight chart a
 | `criticalAddon`                     | If true, installs Searchlight operator as critical addon                | `false`            |
 | `affinity`                          | Affinity rules for pod assignment                                       | `{}`               |
 | `nodeSelector`                      | Node labels for pod assignment                                          | `{}`               |
+| `nodeSelector`                      | Node labels for pod assignment                                          | `{}`               |
 | `tolerations`                       | Tolerations used pod assignment                                         | `{}`               |
 | `rbac.create`                       | If `true`, create and use RBAC resources                                | `true`             |
 | `serviceAccount.create`             | If `true`, create a new service account                                 | `true`             |

chart/searchlight/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "searchlight.fullname" . }}
@@ -8,8 +8,15 @@ metadata:
     app: "{{ template "searchlight.name" . }}"
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+{{- if .Values.annotations }}
+  annotations:
+{{ toYaml .Values.annotations | indent 4 }}
+{{- end }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: "{{ template "searchlight.name" . }}"
   template:
     metadata:
       labels:

chart/searchlight/values.yaml

@@ -29,6 +29,10 @@ icinga:
 ##
 imagePullPolicy: IfNotPresent
 
+## Annotations passed to operator pod(s).
+##
+annotations: {}
+
 ## Node labels for pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##

hack/deploy/operator.yaml

@@ -9,7 +9,7 @@ data:
   ICINGA_WEB_UI_PASSWORD: Y2hhbmdlaXQ=
   ${SEARCHLIGHT_ICINGA_API_PASSWORD}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: searchlight-operator
@@ -18,6 +18,9 @@ metadata:
     app: searchlight
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: searchlight
   template:
     metadata:
       labels: