Fixed names to allow multiple deployments without clashes, added some example config and env vars, bumped opsdroid version (#28)

Author: ryanm101

charts/opsdroid/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: opsdroid
-version: 0.1.6
-appVersion: 0.25.0
+version: 0.1.7
+appVersion: 0.28.0
 description: Opsdroid is a ChatOps bot framework written in Python
 keywords:
 - chatbot

charts/opsdroid/templates/opsdroid-config.yaml

@@ -2,7 +2,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: opsdroid-config
+  name: opsdroid-{{ .Release.Name }}-config
 data:
   configuration.yaml: |
 {{ .Values.opsdroid.configuration | indent 4 }}

charts/opsdroid/templates/opsdroid-deployment.yaml

@@ -5,12 +5,12 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: opsdroid
+      app: opsdroid-{{ .Release.Name }}
   replicas: 1
   template:
     metadata:
       labels:
-        app: opsdroid
+        app: opsdroid-{{ .Release.Name }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/opsdroid-config.yaml") . | sha256sum }}
     spec:
@@ -43,7 +43,7 @@ spec:
             - name: {{ .name }}
               valueFrom:
                 secretKeyRef:
-                  name: opsdroid-config
+                  name: opsdroid-{{ $.Release.Name }}-config
                   key: {{ .name }}
             {{- end }}
         {{- if $.Values.opsdroid.resources }}
@@ -54,10 +54,10 @@ spec:
         {{- if $.Values.opsdroid.configuration }}
         - name: config
           configMap:
-            name: opsdroid-config
+            name: opsdroid-{{ .Release.Name }}-config
         {{- end }}
         {{- if .Values.opsdroid.pvc.enabled }}
         - name: opsdroid-data
           persistentVolumeClaim:
-            claimName: opsdroid-data
+            claimName: opsdroid-{{ .Release.Name }}-data
         {{- end }}

charts/opsdroid/templates/opsdroid-ingress.yaml

@@ -7,7 +7,7 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ .Release.Name }}
+  name: opsdroid-{{ .Release.Name }}
   annotations:
     {{- range $key, $value := .Values.opsdroid.ingress.annotations }}
       {{ $key }}: {{ $value | quote }}
@@ -22,7 +22,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: opsdroid
+                name: opsdroid-{{ .Release.Name }}
                 port:
                   number: {{ $.Values.opsdroid.service.port }}
     {{- end -}}

charts/opsdroid/templates/opsdroid-pvc.yaml

@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: opsdroid-data
+  name: opsdroid-{{ .Release.Name }}-data
   {{- if .Values.opsdroid.pvc.annotations -}}
   annotations:
     {{- range $key, $value := .Values.opsdroid.pvc.annotations }}

charts/opsdroid/templates/opsdroid-secrets.yaml

@@ -1,9 +1,11 @@
+{{- if $.Values.opsdroid.environment }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: opsdroid-config
+  name: opsdroid-{{ .Release.Name }}-config
 type: Opaque
 data:
   {{- range .Values.opsdroid.environment }}
   {{ .name }}: '{{ .value | b64enc }}'
   {{- end }}
+{{- end }}

charts/opsdroid/templates/opsdroid-service.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: opsdroid
+  name: opsdroid-{{ .Release.Name }}
 spec:
   ports:
     - port: {{ .Values.opsdroid.service.port }}
       targetPort: {{ .Values.opsdroid.service.port }}
       protocol: TCP
   selector:
-    app: opsdroid
+    app: opsdroid-{{ .Release.Name }}

charts/opsdroid/templates/rasanlu-deployment.yaml

@@ -8,13 +8,13 @@ spec:
   template:
     metadata:
       labels:
-        app: rasanlu
+        app: rasanlu-{{ .Release.Name }}
     spec:
       volumes:
       {{- if .Values.rasanlu.pvc.enabled }}
         - name: rasanlu-data
           persistentVolumeClaim:
-            claimName: rasanlu-data
+            claimName: rasanlu-{{ .Release.Name }}-data
       {{- end }}
       containers:
         - image: {{ .Values.rasanlu.image.repository }}:{{ .Values.rasanlu.image.tag }}

charts/opsdroid/templates/rasanlu-pvc.yaml

@@ -3,7 +3,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: rasanlu-data
+  name: rasanlu-{{ .Release.Name }}-data
   {{- if .Values.rasanlu.pvc.annotations -}}
   annotations:
     {{- range $key, $value := .Values.rasanlu.pvc.annotations }}

charts/opsdroid/templates/rasanlu-service.yaml

@@ -2,12 +2,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: rasanlu
+  name: rasanlu-{{ .Release.Name }}
 spec:
   ports:
     - port: {{ .Values.rasanlu.service.port }}
       targetPort: {{ .Values.rasanlu.service.port }}
       protocol: TCP
   selector:
-    app: rasanlu
+    app: rasanlu-{{ .Release.Name }}
 {{- end -}}