From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 7 Sep 2020 07:36:21 +0000 (+0000)
Subject: Merge "Removal of zookeeper from portal HELM charts"
X-Git-Tag: 7.0.0~272
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=92878fe491ab5166573fefbf8a3a2e5010813f08;hp=-c;p=oom.git

Merge "Removal of zookeeper from portal HELM charts"
---

92878fe491ab5166573fefbf8a3a2e5010813f08
diff --combined kubernetes/portal/components/portal-app/values.yaml
index bf02948a7a,9664d37765..73306ba773
--- a/kubernetes/portal/components/portal-app/values.yaml
+++ b/kubernetes/portal/components/portal-app/values.yaml
@@@ -20,7 -20,8 +20,7 @@@ global
    env:
      tomcatDir: "/usr/local/tomcat"
    nodePortPrefix: 302
 -  readinessRepository: oomk8s
 -  readinessImage: readiness-check:2.0.0
 +  readinessImage: onap/oom/readiness:3.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
    #AAF service
@@@ -106,9 -107,6 +106,6 @@@ cassandra
    config:
      cassandraUsername: root
      cassandraPassword: Aa123456
- zookeeper:
-   service:
-     name: portal-zookeeper
  messageRouter:
    service:
      name: message-router
diff --combined kubernetes/portal/components/portal-sdk/values.yaml
index e36ae32abb,21b5737475..ebe49e08c2
--- a/kubernetes/portal/components/portal-sdk/values.yaml
+++ b/kubernetes/portal/components/portal-sdk/values.yaml
@@@ -20,7 -20,8 +20,7 @@@ global
    env:
      tomcatDir: "/usr/local/tomcat"
    nodePortPrefix: 302
 -  readinessRepository: oomk8s
 -  readinessImage: readiness-check:2.0.0
 +  readinessImage: onap/oom/readiness:3.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
    persistence: {}
@@@ -100,9 -101,6 +100,6 @@@ cassandra
    config:
      cassandraUsername: root
      cassandraPassword: Aa123456
- zookeeper:
-   service:
-     name: portal-zookeeper
  messageRouter:
    service:
      name: message-router