Configuration fixes for vpa and external-secrets (#72)

* add quote step for vpa updateMode

* add gitignore

* rework apiVersion config for ExternalSecret

* bump version

Author: MuriukiPM

.gitignore

@@ -0,0 +1,6 @@
+*.tgz
+/.idea/*
+.vscode
+.DS_Store
+.aider*
+.env

standard-app/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: standard-app
 description: A Helm chart library by Cloudkite
 type: application
-version: 1.2.0
+version: 1.2.1
 maintainters:
   - email: [email protected]
     name: cloudkite

standard-app/templates/autoscaling/vpa.yaml

@@ -17,7 +17,7 @@ spec:
     kind:       {{ if $appConfig.rollout }}Rollout{{ else }}Deployment{{ end }}
     name:       {{ $appName }}
   updatePolicy:
-    updateMode: {{ $appConfig.vpa.mode | default "Off" }}
+    updateMode: {{ $appConfig.vpa.mode | default "Off" | quote }}
   {{- with $appConfig.vpa.resources }}
   resourcePolicy:
     containerPolicies:

standard-app/templates/configs/_externalsecret.tpl

@@ -1,4 +1,5 @@
 {{- define "standard-app.externalSecret" -}}
+{{- $apiVersion := .apiVersion }}
 {{- $name := .name }}
 {{- $userLabels := .labels | default dict }}
 {{- $globalLabels := $.Values.labels | default dict }}
@@ -10,11 +11,7 @@
 {{- $secretPath := .secretPath }}
 {{- $refreshInterval := .refreshInterval | default "1m" }}
 
-{{ if and (.Capabilities) (.Capabilities.APIVersions.Has "external-secrets.io/v1/ExternalSecret") }}
-apiVersion: external-secrets.io/v1
-{{ else }}
-apiVersion: external-secrets.io/v1beta1
-{{ end }}
+apiVersion: {{ $apiVersion }}
 kind: ExternalSecret
 metadata:
   name: {{ $name }}

standard-app/templates/configs/externalsecret.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.externalSecret }}
+{{- $apiVersion := ternary "external-secrets.io/v1" "external-secrets.io/v1beta1" ($.Capabilities.APIVersions.Has "external-secrets.io/v1/ExternalSecret") -}}
 {{- $type := .Values.externalSecret.type }}
 {{- $storeName := .Values.externalSecret.secretStoreName }}
 {{- $secretPath := .Values.externalSecret.secretPath }}
@@ -11,6 +12,7 @@
     {{- range $name, $config := index $appConfig $containerType }}
       {{- if $config.secrets }}
         {{- template "standard-app.externalSecret" (dict
+            "apiVersion" $apiVersion
             "name" $name
             "labels" (merge (dict "app" $appName "product" $.Release.Name) (default dict $.Values.labels))
             "secrets" $config.secrets
@@ -28,6 +30,7 @@
 
   {{- if $appConfig.secrets }}
     {{- template "standard-app.externalSecret" (dict
+        "apiVersion" $apiVersion
         "name" $appName
         "labels" (merge (dict "app" $appName "product" $.Release.Name) (default dict $.Values.labels))
         "secrets" $appConfig.secrets
@@ -47,6 +50,7 @@
 {{- range $jobName, $jobConfig := .Values.jobs }}
   {{- if $jobConfig.secrets }}
     {{- template "standard-app.externalSecret" (dict
+        "apiVersion" $apiVersion
         "name" $jobName
         "labels" (merge (dict "app" $jobName "product" $.Release.Name) (default dict $.Values.labels))
         "secrets" $jobConfig.secrets
@@ -67,6 +71,7 @@
     {{- range $name, $config := index $cronjobConfig $containerType }}
       {{- if $config.secrets }}
         {{- template "standard-app.externalSecret" (dict
+            "apiVersion" $apiVersion
             "name" $name
             "labels" (merge (dict "app" $cronjobName "product" $.Release.Name) (default dict $.Values.labels))
             "secrets" $config.secrets
@@ -84,6 +89,7 @@
 
   {{- if $cronjobConfig.secrets }}
     {{- template "standard-app.externalSecret" (dict
+        "apiVersion" $apiVersion
         "name" $cronjobName
         "labels" (merge (dict "app" $cronjobName "product" $.Release.Name) (default dict $.Values.labels))
         "secrets" $cronjobConfig.secrets
@@ -102,6 +108,7 @@
 # Global secret
 {{- if .Values.secrets }}
   {{- template "standard-app.externalSecret" (dict
+      "apiVersion" $apiVersion
       "name" $.Release.Name
       "labels" (merge (dict "app" $.Release.Name) (default dict $.Values.labels))
       "secrets" .Values.secrets