Minor template fixes

cost-analyzer/charts/grafana/templates/deployment.yaml

@@ -67,7 +67,9 @@ spec:
               subPath: download_dashboards.sh
             - name: storage
               mountPath: "/var/lib/grafana"
+              {{- if .Values.persistence.subPath }}
               subPath: {{ .Values.persistence.subPath }}
+              {{- end }}
           {{- range .Values.extraSecretMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
@@ -96,8 +98,10 @@ spec:
               value: "{{ .Values.sidecar.dashboards.folder }}"
             - name: ERROR_THROTTLE_SLEEP
               value: "{{ .Values.sidecar.dashboards.error_throttle_sleep }}"
+          {{- with .Values.sidecar.resources }}
           resources:
-{{ toYaml .Values.sidecar.resources | indent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: sc-dashboard-volume
               mountPath: {{ .Values.sidecar.dashboards.folder | quote }}
@@ -177,7 +181,9 @@ spec:
 {{- end}}
             - name: storage
               mountPath: "/var/lib/grafana"
+              {{- if .Values.persistence.subPath }}
               subPath: {{ .Values.persistence.subPath }}
+              {{- end }}
           {{- range .Values.extraSecretMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}

cost-analyzer/charts/grafana/templates/role.yaml

@@ -1,5 +1,4 @@
-{{ if .Values.global.grafana.enabled }}
-{{- if .Values.rbac.create }}
+{{ if and .Values.global.grafana.enabled .Values.rbac.create .Values.rbac.pspEnabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -10,12 +9,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-{{- if .Values.rbac.pspEnabled }}
 rules:
 - apiGroups:      ['extensions']
   resources:      ['podsecuritypolicies']
   verbs:          ['use']
   resourceNames:  [{{ template "grafana.fullname" . }}]
-{{- end }}
-{{- end }}
 {{ end }}

cost-analyzer/charts/grafana/templates/rolebinding.yaml

@@ -1,5 +1,4 @@
-{{ if .Values.global.grafana.enabled }}
-{{- if .Values.rbac.create -}}
+{{ if and .Values.global.grafana.enabled .Values.rbac.create .Values.rbac.pspEnabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -17,5 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "grafana.serviceAccountName" . }}
-{{- end -}}
-{{ end }}
+{{ end }}

cost-analyzer/charts/grafana/values.yaml

@@ -260,13 +260,7 @@ sidecar:
     repository: kiwigrid/k8s-sidecar
     tag: 1.25.1
     pullPolicy: IfNotPresent
-  resources:
-#   limits:
-#     cpu: 100m
-#     memory: 100Mi
-#   requests:
-#     cpu: 50m
-#     memory: 50Mi
+  resources: {}
   dashboards:
     enabled: false
     # label that the configmaps with dashboards are marked with

cost-analyzer/templates/cost-analyzer-deployment-template.yaml

@@ -307,16 +307,18 @@ spec:
             claimName: {{ template "cost-analyzer.fullname" . }}-db
 {{- end }}
 {{- end }}
-      initContainers:
 {{- if .Values.supportNFS }}
+      initContainers:
         - name: config-db-perms-fix
         {{- if .Values.initChownDataImage }}
           image: {{ .Values.initChownDataImage }}
         {{- else }}
           image: busybox
         {{- end }}
+          {{- with .Values.initChownData.resources }}
           resources:
-{{ toYaml .Values.initChownData.resources | indent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- if and (.Values.kubecostModel.etlToDisk | default true) .Values.persistentVolume.dbPVEnabled }}
           command: ["sh", "-c", "/bin/chmod -R 777 /var/configs && /bin/chmod -R 777 /var/db"]
           {{- else }}
@@ -465,10 +467,10 @@ spec:
         - image: {{ .Values.kubecostModel.image }}:{{ .Values.imageVersion }}
         {{- else }}
         - image: {{ .Values.kubecostModel.image }}:prod-{{ $.Chart.AppVersion }}
-        {{ end }}
+        {{- end }}
         {{- else }}
         - image: gcr.io/kubecost1/cost-model:prod-{{ $.Chart.AppVersion }}
-        {{ end }}
+        {{- end }}
           name: cost-model
         {{- if .Values.kubecostModel.extraArgs }}
           args:

cost-analyzer/values.yaml

@@ -531,6 +531,7 @@ kubecostModel:
     #  - secretName: cost-analyzer-model-tls
     #    hosts:
     #      - cost-analyzer-model.local
+  utcOffset: "+00:00"
 
 # etlUtils is a utility currently used by Kubecost internal support to implement specific functionality related to Thanos conversion.
 etlUtils: