From: Mike Elliott <mike.elliott@amdocs.com>
Date: Tue, 30 Apr 2019 19:17:52 +0000 (+0000)
Subject: Merge "Upgrade SDC to use common Cassandra Cluster"
X-Git-Tag: 4.0.0-ONAP~177
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=354afbbf205d4c7e34337d7af184560882966d91;hp=-c;p=oom.git

Merge "Upgrade SDC to use common Cassandra Cluster"
---

354afbbf205d4c7e34337d7af184560882966d91
diff --combined kubernetes/sdc/charts/sdc-dcae-be/values.yaml
index 9ae8f31499,bf1d9b4584..8108d81436
--- a/kubernetes/sdc/charts/sdc-dcae-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-be/values.yaml
@@@ -18,7 -18,7 +18,7 @@@
  global:
    nodePortPrefix: 302
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
  
@@@ -27,9 -27,9 +27,9 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/dcae-be:1.3.0
 +image: onap/dcae-be:1.3-STAGING-latest
  pullPolicy: Always
 -backendInitImage: onap/dcae-tools:1.3.0
 +backendInitImage: onap/dcae-tools:1.3-STAGING-latest
  
  # flag to enable debugging - application support required
  debugEnabled: false
@@@ -88,4 -88,4 +88,4 @@@ resources
      requests:
        cpu: 20m
        memory: 2Gi
-   unlimited: {}
+   unlimited: {}
diff --combined kubernetes/sdc/charts/sdc-dcae-dt/values.yaml
index f04b8fa5f2,2b8fd9027f..cb0b8da239
--- a/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml
@@@ -18,7 -18,7 +18,7 @@@
  global:
    nodePortPrefix: 302
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
  
@@@ -27,7 -27,7 +27,7 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/dcae-dt:1.2.0
 +image: onap/dcae-dt:1.2-STAGING-latest
  pullPolicy: IfNotPresent
  config:
    javaOptions: -XX:MaxPermSize=256m -Xmx1024m -Dconfig.home=config -Dlog.home=/var/lib/jetty/logs/ -Dlogging.config=config/dcae-dt/logback-spring.xml
@@@ -80,4 -80,4 +80,4 @@@ resources
      requests:
        cpu: 20m
        memory: 2Gi
-   unlimited: {}
+   unlimited: {}
diff --combined kubernetes/sdc/charts/sdc-dcae-fe/values.yaml
index 9f544cb9e0,4b40bcea8f..7999952bc6
--- a/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml
@@@ -18,7 -18,7 +18,7 @@@
  global:
    nodePortPrefix: 302
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
  
@@@ -27,7 -27,7 +27,7 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/dcae-fe:1.3.0
 +image: onap/dcae-fe:1.3-STAGING-latest
  pullPolicy: Always
  config:
    javaOptions: -XX:MaxPermSize=256m -Xmx1024m -Dconfig.home=config -Dlog.home=/var/lib/jetty/logs/ -Dlogging.config=config/dcae-fe/logback-spring.xml
@@@ -85,4 -85,4 +85,4 @@@ resources
      requests:
        cpu: 20m
        memory: 2Gi
-   unlimited: {}
+   unlimited: {}
diff --combined kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml
index a22479e8e8,e787948ce2..7e23283578
--- a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml
@@@ -18,7 -18,7 +18,7 @@@
  global:
    nodePortPrefix: 302
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
  
@@@ -27,7 -27,7 +27,7 @@@
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/dcae-tosca-app:1.3.0
 +image: onap/dcae-tosca-app:1.3-STAGING-latest
  pullPolicy: Always
  
  # flag to enable debugging - application support required
@@@ -87,4 -87,4 +87,4 @@@ resources
      requests:
        cpu: 20m
        memory: 2Gi
-   unlimited: {}
+   unlimited: {}