Merge "Change ingress hosnames for exposed services"

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

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 0109a5e..5a1c5f2 100644 (file)
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications © 2020 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,10 +18,18 @@
 #################################################################
 global:
   nodePortPrefix: 302
+  # Readiness image
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.2
+  # Ubuntu Init image
   ubuntuInitRepository: registry.hub.docker.com
   ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+  # Logging image
+  loggingRepository: docker.elastic.co
+  loggingImage: beats/filebeat:5.5.0
+  # BusyBox image
+  busyboxRepository: registry.hub.docker.com
+  busyboxImage: library/busybox:latest
   persistence:
     enabled: true
   # Standard OOM
@@ -33,7 +42,7 @@ global:
 
   aaf:
     readiness: false
-    image: onap/aaf/aaf_core:2.1.15
+    image: onap/aaf/aaf_core:2.1.20
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
     aaf_release: "El Alto"
@@ -48,10 +57,10 @@ global:
     cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
 
     config:
-      image: onap/aaf/aaf_config:2.1.15
+      image: onap/aaf/aaf_config:2.1.20
     cass:
       replicas: 1
-      image: onap/aaf/aaf_cass:2.1.15
+      image: onap/aaf/aaf_cass:2.1.20
       fqdn: "aaf-cass"
       cluster_name: "osaaf"
       heap_new_size: "512M"
@@ -93,6 +102,8 @@ global:
       public_port: 31115
     hello:
       replicas: 0
+#     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
+
 
 #################################################################
 # Application configuration defaults.
@@ -120,6 +131,12 @@ readiness:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "aaf.api"
+      name: "aaf-service"
+      port: 8100
+  config:
+    ssl: "none"
 
 ## Persist data to a persitent volume
 persistence:
@@ -129,20 +146,18 @@ persistence:
     volumeReclaimPolicy: Delete
     accessMode: ReadWriteMany
     size: 2Gi
-    storageClass: "manual"
-    mountPath: "/mnt/data/aaf/config"
+    mountPath: /dockerdata-nfs
+    mountSubPath: "config"
   logs:
     #existingClaim:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteMany
     size: 2Gi
-    storageClass: "manual"
     mountPath: "/mnt/data/aaf/logs"
   status:
     volumeReclaimPolicy: Delete
     accessMode: ReadWriteMany
     size: 2M
-    storageClass: "manual"
     mountPath: /dockerdata-nfs
     mountSubPath: "status"
   cass:
@@ -150,8 +165,8 @@ persistence:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteOnce
     size: 10Gi
-    storageClass: "manual"
     mountPath: /dockerdata-nfs
     mountSubPath: "cass"
 
+
 resources: {}