Merge pull request #23 from kubean-io/fix-helm-issue

fix helm issue

Author: yankay

.github/workflows/release.yaml

@@ -34,4 +34,4 @@ jobs:
             make helm-chart-release
           else
             echo "Release already exists"
-          fi
+          fi

Makefile

@@ -1,7 +1,7 @@
 
 .PHONY: test
 test:
-	# yamllint -s .
+	yamllint -s . || true
 	helm lint charts/ --strict
 
 GITHUB_OWNER?=kubean-io

charts/templates/_helpers.tpl

@@ -35,11 +35,19 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "kube-node-tuning.labels" -}}
-app.kubernetes.io/name: {{ include "kube-node-tuning.name" . }}
 helm.sh/chart: {{ include "kube-node-tuning.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 }}
+{{ include "kube-node-tuning.selectorLabels" . }}
+
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "kube-node-tuning.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kube-node-tuning.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

charts/templates/daemonset.yaml

@@ -26,8 +26,7 @@ spec:
     spec:
       initContainers:
         - name: setup-sysctl
-          image: >
-            {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - /bin/sh
@@ -43,8 +42,7 @@ spec:
             runAsUser: 0
       containers:
         - name: kube-node-tuning
-          image: >
-            {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - sleep