Merge branch 'revert-anchore-auth' into 'master'

reverting anchor changes from MR !2811

See merge request !2857

chart/templates/anchore/values.yaml

@@ -66,13 +66,11 @@ postgresql:
   imagePullSecrets: private-registry
   {{- if and .Values.addons.anchore.database.host .Values.addons.anchore.database.port .Values.addons.anchore.database.username .Values.addons.anchore.database.password .Values.addons.anchore.database.database }}
   enabled: false
-  auth:
-    username: {{ .Values.addons.anchore.database.username }}
-    password: {{ .Values.addons.anchore.database.password }}
-    database: {{ .Values.addons.anchore.database.database }}
-  externalEndpoint: "{{ .Values.addons.anchore.database.host }}"
-  containerPorts:
-    postgresql: {{ .Values.addons.anchore.database.port }}
+  postgresUser: {{ .Values.addons.anchore.database.username }}
+  postgresPassword: {{ .Values.addons.anchore.database.password }}
+  postgresDatabase: {{ .Values.addons.anchore.database.database }}
+  externalEndpoint: "{{ .Values.addons.anchore.database.host }}:{{ .Values.addons.anchore.database.port }}"
+  postgresPort: {{ .Values.addons.anchore.database.port }}
   {{- end }}
 
 anchoreGlobal:
@@ -96,13 +94,11 @@ anchore-feeds-db:
   imagePullSecrets: private-registry
   {{- if and .Values.addons.anchore.database.host .Values.addons.anchore.database.port .Values.addons.anchore.database.username .Values.addons.anchore.database.password .Values.addons.anchore.database.feeds_database }}
   enabled: false
-  auth:
-    username: {{ .Values.addons.anchore.database.username }}
-    password: {{ .Values.addons.anchore.database.password }}
-    database: {{ .Values.addons.anchore.database.database }}
-  externalEndpoint: "{{ .Values.addons.anchore.database.host }}"
-  containerPorts:
-    postgresql: {{ .Values.addons.anchore.database.port }}
+  postgresUser: {{ .Values.addons.anchore.database.username }}
+  postgresPassword: {{ .Values.addons.anchore.database.password }}
+  postgresDatabase: {{ .Values.addons.anchore.database.feeds_database }}
+  externalEndpoint: "{{ .Values.addons.anchore.database.host }}:{{ .Values.addons.anchore.database.port }}"
+  postgresPort: {{ .Values.addons.anchore.database.port }}
   {{- end }}
 
 anchoreEnterpriseUi: