Merge "Removal of zookeeper from portal HELM charts"

diff --combined kubernetes/portal/components/portal-app/values.yaml
index bf02948,9664d37..73306ba
--- 1/kubernetes/portal/components/portal-app/values.yaml
--- 2/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 e36ae32,21b5737..ebe49e0
--- 1/kubernetes/portal/components/portal-sdk/values.yaml
--- 2/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