fix: Yaml fixes and release chart script

Author: dploeger

Chart.yaml

@@ -4,3 +4,12 @@ description: A Helm chart for deploying the Scalyr agent
 type: application
 version: 0.1.0
 appVersion: 2.1.11
+keywords:
+  - scalyr
+  - logging
+  - monitoring
+  - metrics
+home: https://github.com/dodevops/helm-scalyr
+icon: https://app.scalyr.com/s2/src/img/logo-reverse.png
+sources:
+  - https://github.com/dodevops/helm-scalyr

releaseChart.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+if [ -z "$1" ]
+then
+  echo "Usage: releaseChart.sh <version>"
+  exit 1
+fi
+
+VERSION="$1"
+
+if [ "$(git branch --show-current)" != "gh-pages" ]
+then
+  echo "Merge to gh-pages first!"
+  exit 1
+fi
+
+helm lint .
+
+helm package .
+
+helm repo index --url https://dodevops.github.io/helm-scalyr .
+
+

templates/_helpers.tpl

@@ -50,14 +50,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "scalyr-helm.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "scalyr-helm.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "scalyr-helm.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

templates/cluster-role-binding.yaml

@@ -11,5 +11,5 @@ roleRef:
   name: "{{ include "scalyr-helm.fullname" . }}-cluster-role"
 subjects:
   - kind: "ServiceAccount"
-    name: "{{ include "scalyr-helm.serviceAccountName" . }}"
+    name: "{{ include "scalyr-helm.fullname" . }}-sa"
 {{- end }}

templates/configmap.yaml

@@ -18,4 +18,6 @@ data:
       ]
     }
   {{- end }}
-  {{- toYaml .Values.scalyr.config | nindent 2 }}
+  {{ with .Values.scalyr.config }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}

templates/daemonset.yaml

@@ -22,7 +22,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "scalyr-helm.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
@@ -128,7 +127,7 @@ spec:
       dnsPolicy: "ClusterFirst"
       {{- if .Values.supportK8s }}
       automountServiceAccountToken: true
-      serviceAccountName: "{{ include "scalyr-helm.serviceAccountName" . }}"
+      serviceAccountName: "{{ include "scalyr-helm.fullname" . }}-sa"
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

templates/deployment.yaml

@@ -23,7 +23,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "scalyr-helm.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
@@ -129,7 +128,7 @@ spec:
       dnsPolicy: "ClusterFirst"
       {{- if .Values.supportK8s }}
       automountServiceAccountToken: true
-      serviceAccountName: "{{ include "scalyr-helm.serviceAccountName" . }}"
+      serviceAccountName: "{{ include "scalyr-helm.fullname" . }}-sa"
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

templates/serviceaccount.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "scalyr-helm.serviceAccountName" . }}
+  name: {{ include "scalyr-helm.fullname" . }}-sa
   labels:
     {{- include "scalyr-helm.labels" . | nindent 4 }}
 secrets: