[v8] Backport: "helm: Fix indenting on database autodiscovery"

examples/chart/teleport-kube-agent/aws-and-manual-db.yaml

@@ -0,0 +1,21 @@
+authToken: auth-token
+proxyAddr: proxy.example.com:3080
+roles: db
+awsDatabases:
+- types: ["rds"]
+  regions: ["us-east-1"]
+  tags:
+    "*": "*"
+- types: ["rds"]
+  regions: ["us-west-2"]
+  tags:
+    "env": "development"
+databases:
+- name: aurora
+  uri: "postgres-aurora-instance-1.xxx.us-east-1.rds.amazonaws.com:5432"
+  protocol: "postgres"
+  labels:
+    database: staging
+annotations:
+  serviceAccount:
+    eks.amazonaws.com/role-arn: arn:aws:iam::1234567890:role/my-rds-autodiscovery-role

examples/chart/teleport-kube-agent/templates/config.yaml

@@ -56,9 +56,8 @@ data:
       {{- if not (or (.Values.awsDatabases) (.Values.databases)) }}
         {{- fail "'awsDatabases' and/or 'databases' is required in chart values when db role is enabled, see README" }}
       {{- end }}
-      databases:
       {{- if .Values.awsDatabases }}
-        aws:
+      aws:
         {{- range $awsDb := .Values.awsDatabases }}
           {{- if not (hasKey $awsDb "types") }}
             {{- fail "'types' is required for all 'awsDatabases' in chart values when key is set and db role is enabled, see README" }}
@@ -70,13 +69,11 @@ data:
             {{- fail "'tags' is required for all 'awsDatabases' in chart values when key is set and db role is enabled, see README" }}
           {{- end }}
         {{- end }}
-        {{- toYaml .Values.awsDatabases | nindent 8 }}
+        {{- toYaml .Values.awsDatabases | nindent 6 }}
       {{- end }}
       {{- if .Values.databases }}
+      databases:
         {{- range $db := .Values.databases }}
-          {{- if (and ($.Values.awsDatabases) (hasKey $db "aws")) }}
-            {{- fail "The 'aws' key cannot be used under 'databases' when 'awsDatabases' is also set - use autodiscovery for AWS databases, or run a separate agent without awsDatabases" }}
-          {{- end }}
           {{- if not (hasKey $db "name") }}
             {{- fail "'name' is required for all 'databases' in chart values when db role is enabled, see README" }}
           {{- end }}
@@ -88,9 +85,9 @@ data:
           {{- end }}
         {{- end }}
         {{- toYaml .Values.databases | nindent 6 }}
-      {{- else }}
-      enabled: false
       {{- end }}
+    {{- else }}
+      enabled: false
     {{- end }}
     {{- end }}