[DCAEMOD] Uses new tpls for repos / images

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

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index b1cb254..df6aff5 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.
@@ -20,16 +21,15 @@
 global:
   nodePortPrefix: 302
   # Readiness image
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.2
+  readinessImage: onap/oom/readiness:3.0.1
   # Ubuntu Init image
-  ubuntuInitRepository: registry.hub.docker.com
+  ubuntuInitRepository: docker.io
   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
+  busyboxRepository: docker.io
   busyboxImage: library/busybox:1.31
   persistence:
     enabled: true
@@ -45,10 +45,10 @@ global:
   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"
@@ -60,7 +60,7 @@ 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
+      image: onap/aaf/aaf_config:2.1.23
 
     service:
       fqdn: "aaf-service"
@@ -76,10 +76,6 @@ global:
       public_port: 31112
 #     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
 
-    certServiceClient:
-      secret:
-        name: aaf-cert-service-client-tls-secret
-
 #################################################################
 # Application configuration defaults.
 #################################################################