Merge "[AAF] v1.16+ compatible templates"

1 files changed, 4 insertions, 64 deletions

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 5a1c5f2709..bedf243639 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -29,7 +29,7 @@ global:
   loggingImage: beats/filebeat:5.5.0
   # BusyBox image
   busyboxRepository: registry.hub.docker.com
-  busyboxImage: library/busybox:latest
+  busyboxImage: library/busybox:1.31
   persistence:
     enabled: true
   # Standard OOM
@@ -58,50 +58,19 @@ global:
 
     config:
       image: onap/aaf/aaf_config:2.1.20
-    cass:
-      replicas: 1
-      image: onap/aaf/aaf_cass:2.1.20
-      fqdn: "aaf-cass"
-      cluster_name: "osaaf"
-      heap_new_size: "512M"
-      max_heap_size: "1024M"
-      storage_port: 7000
-      ssl_storage_port: 7001
-      native_trans_port: 9042
-      rpc_port: 9160
-      dc: "dc1"
+
     service:
-      replicas: 1
       fqdn: "aaf-service"
       internal_port: 8100
       public_port: 31110
     locate:
-      replicas: 1
       fqdn: "aaf-locate"
       internal_port: 8095
       public_port: 31111
     oauth:
-      replicas: 1
-      fqdn: "aaf0oauth"
+      fqdn: "aaf-oauth"
       internal_port: 8140
       public_port: 31112
-    gui:
-      replicas: 1
-      fqdn: "aaf-gui"
-      internal_port: 8200
-      public_port: 31113
-    cm:
-      replicas: 1
-      fqdn: "aaf-cm"
-      internal_port: 8150
-      public_port: 31114
-    fs:
-      replicas: 1
-      fqdn: "aaf-fs"
-      internal_port: 8096
-      public_port: 31115
-    hello:
-      replicas: 0
 #     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
 
 
@@ -138,35 +107,6 @@ ingress:
   config:
     ssl: "none"
 
-## Persist data to a persitent volume
-persistence:
-  enabled: true
-  config:
-    #existingClaim:
-    volumeReclaimPolicy: Delete
-    accessMode: ReadWriteMany
-    size: 2Gi
-    mountPath: /dockerdata-nfs
-    mountSubPath: "config"
-  logs:
-    #existingClaim:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteMany
-    size: 2Gi
-    mountPath: "/mnt/data/aaf/logs"
-  status:
-    volumeReclaimPolicy: Delete
-    accessMode: ReadWriteMany
-    size: 2M
-    mountPath: /dockerdata-nfs
-    mountSubPath: "status"
-  cass:
-    #existingClaim:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    mountPath: /dockerdata-nfs
-    mountSubPath: "cass"
-
+persistence: {}
 
 resources: {}