deployments/helm/twitchsingstools/templates/deployment.yaml

@@ -2,9 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "twitchsingstools.fullname" . }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-    checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
   labels:
     {{- include "twitchsingstools.labels" . | nindent 4 }}
 spec:
@@ -16,9 +13,6 @@ spec:
     metadata:
       labels:
         {{- include "twitchsingstools.selectorLabels" . | nindent 8 }}
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -31,11 +25,11 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}"
+          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 5353
+              containerPort: 80
               protocol: TCP
           livenessProbe:
             httpGet:

deployments/helm/twitchsingstools/templates/pvc.yaml

@@ -1,12 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: ServiceAccount
 metadata:
-  name: tstools-data
+  name: {{ include "twitchsingstools.serviceAccountName" . }}
   labels:
     {{- include "twitchsingstools.labels" . | nindent 4 }}
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.storageSize }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end -}}

deployments/helm/twitchsingstools/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: imartyn/twitchsingstools
+  repository: twitchsingstools
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -39,8 +39,6 @@ irc:
 
 twitchapp: {}
 
-storageSize: 10Gi
-
 service:
   type: ClusterIP
   port: 80
@@ -53,8 +51,7 @@ ingress:
     kubernetes.io/ingress.class: nginx
   hosts:
     - host: twitchsingstools.ing.martyn.berlin
-      paths: 
-      - /
+      paths: []
   tls: 
     - secretName: tstools-tls
       hosts:

main.go

@@ -196,12 +196,10 @@ func main() {
 			Database:       *persistentData,
 			Config:         config,
 		}
+		myBot.Start()
 	}
 	go func() {
 		rgb.YPrintf("[%s] Starting webserver on port %s\n", irc.TimeStamp(), "5353")
 		webserver.HandleHTTP(&myBot)
 	}()
-	if ircOauthPath != "" {
-		myBot.Start()
-	}
 }