From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 10 Jun 2020 14:08:26 +0000 (+0000)
Subject: Merge "[COMMON] add pre upgrade script for mariadb-galera"
X-Git-Tag: 7.0.0~387
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b6584466e5aff8904241d8107baa722788a8e6a8;hp=-c;p=oom.git

Merge "[COMMON] add pre upgrade script for mariadb-galera"
---

b6584466e5aff8904241d8107baa722788a8e6a8
diff --combined kubernetes/onap/values.yaml
index dcbfd6d0cf,3bd23ebaad..e60925f21f
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -58,6 -58,16 +58,16 @@@ global
    # logging agent - temporary repo until images migrated to nexus3
    loggingRepository: docker.elastic.co
  
+   # dockerHub main repository
+   dockerHubRepository: docker.io
+ 
+   # busybox repo and image
+   busyboxRepository: docker.io
+   busyboxImage: busybox:1.30
+ 
+   # kubeclt image
+   kubectlImage: "bitnami/kubectl:1.15"
+ 
    # image pull policy
    pullPolicy: Always
  
@@@ -101,27 -111,6 +111,27 @@@
  
    # Enabling CMPv2
    cmpv2Enabled: true
 +  aaf:
 +    certServiceClient:
 +      image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.0.0
 +      secret:
 +        name: aaf-cert-service-client-tls-secret
 +        mountPath: /etc/onap/aaf/certservice/certs/
 +      envVariables:
 +        # Certificate related
 +        cmpv2Organization: "Linux-Foundation"
 +        cmpv2OrganizationalUnit: "ONAP"
 +        cmpv2Location: "San-Francisco"
 +        cmpv2State: "California"
 +        cmpv2Country: "US"
 +        # Client configuration related
 +        caName: "RA"
 +        requestURL: "https://aaf-cert-service:8443/v1/certificate/"
 +        requestTimeout: "20000"
 +        keystorePath: "/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks"
 +        keystorePassword: "secret"
 +        truststorePath: "/etc/onap/aaf/certservice/certs/truststore.jks"
 +        truststorePassword: "secret"
  
    # TLS
    # Set to false if you want to disable TLS for NodePorts. Be aware that this