[AAF] Remove aaf-hello

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

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 8eaead5..b014360 100644 (file)
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications © 2020 AT&T
+# Modifications Copyright © 2020 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,36 +17,22 @@
 #################################################################
 # Global configuration defaults.
 #################################################################
+
 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
   pullPolicy: "Always"
-  repository: "nexus3.onap.org:10001"
-
-  # Use Local
-  #pullPolicy: IfNotPresent
-  #repository: "nexus3.onap.org:10003"
 
+  cmpv2Enabled: true
+  addTestingComponents: false
   aaf:
     readiness: false
-    image: onap/aaf/aaf_core:2.1.20
+    image: onap/aaf/aaf_core:2.1.23
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
-    aaf_release: "El Alto"
+    aaf_release: "Frankfurt"
   # DUBLIN ONLY - for M4 compatibility with Casablanca
   #  aaf_locator_name: "public.%NS.%N"
   #  aaf_locator_name_oom: "%NS.%N"
@@ -57,53 +44,20 @@ 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.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"
+      image: onap/aaf/aaf_config:2.1.23
+
     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
-
 
 #################################################################
 # Application configuration defaults.
@@ -131,36 +85,20 @@ readiness:
 
 ingress:
   enabled: false
-
-## Persist data to a persitent volume
-persistence:
-  enabled: true
+  service:
+    - baseaddr: "aaf.api"
+      name: "aaf-service"
+      port: 8100
   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"
+    ssl: "none"
 
+persistence: {}
 
 resources: {}
+
+aaf-authz:
+  enabled: true
+aaf-sms:
+  enabled: true
+aaf-sshsm:
+  enabled: false