Merge "Add override flag to the ingress template"

[oom.git] / kubernetes / appc / values.yaml

diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 12defea..ac96820 100644 (file)
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -25,13 +25,21 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
 
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - uid: "db-root-pass"
+    externalSecret: '{{- include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" (index .Values "mariadb-galera" "nameOverride")) }}'
+    type: password
+
 #################################################################
 # Application configuration defaults.
 #################################################################
 flavor: small
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-image:1.6.4
+image: onap/appc-image:1.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -43,7 +51,6 @@ config:
   odlGid: 101
   ansibleServiceName: appc-ansible-server
   ansiblePort: 8000
-  mariadbRootPassword: secretpassword
   userName: my-user
   userPassword: my-password
   mysqlDatabase: my-database
@@ -163,6 +170,12 @@ persistence:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: appc
+      name: "appc"
+      port: 8443
+  config:
+    ssl: "redirect"
 
 # Configure resource requests and limits
 # ref: http://kubernetes.io/docs/user-guide/compute-resources/