From: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Date: Tue, 3 Sep 2019 17:45:29 +0000 (+0000)
Subject: Seperate CDS chart from SDNC in OOM
X-Git-Tag: 5.0.1-ONAP~81^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F94861%2F5;p=oom.git

Seperate CDS chart from SDNC in OOM

Issue-ID: OOM-2085
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I21fed8c9cf33967f62f156cac96deefdcb4f8d47
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
---

diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml
index cdede47d09..a0dc0e8fbe 100644
--- a/kubernetes/cds/values.yaml
+++ b/kubernetes/cds/values.yaml
@@ -1,4 +1,5 @@
-# Copyright © 2019 Bell Canada
+# Copyright © 2019 Orange, Bell Canada
+# Copyright © 2017 Amdocs, Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +13,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+  nodePortPrefix: 302
+  nodePortPrefixExt: 304
+  repository: nexus3.onap.org:10001
+  readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.2
+  loggingRepository: docker.elastic.co
+  loggingImage: beats/filebeat:5.5.0
+  persistence:
+    mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application images
+repository: nexus3.onap.org:10001
+pullPolicy: Always
+
+
+subChartsOnly:
+  enabled: true
+
+# flag to enable debugging - application support required
+debugEnabled: false
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  # necessary to disable liveness probe when setting breakpoints
+  # in debugger so K8s doesn't restart unresponsive container
+  enabled: true
+
+readiness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+
+ingress:
+  enabled: false
+
+
 mariadb-galera:
   config:
       userName: sdnctl
@@ -25,4 +77,25 @@ mariadb-galera:
   replicaCount: 1
   persistence:
     enabled: true
-    mountSubPath: cds/data
\ No newline at end of file
+    mountSubPath: cds/data
+
+#Resource Limit flavor -By Default using small
+flavor: small
+#segregation for different envionment (Small and Large)
+
+resources:
+  small:
+    limits:
+      cpu: 2
+      memory: 4Gi
+    requests:
+      cpu: 1
+      memory: 2Gi
+  large:
+    limits:
+      cpu: 4
+      memory: 8Gi
+    requests:
+      cpu: 2
+      memory: 4Gi
+  unlimited: {}
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 1d1dd8b7a5..8b186c01d6 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -33,6 +33,10 @@ dependencies:
     version: ~5.x-0
     repository: '@local'
     condition: cassandra.enabled
+  - name: cds
+    version: ~5.x-0
+    repository: '@local'
+    condition: cds.enabled
   - name: clamp
     version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 04fbc97f54..c93f2c44f7 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -26,6 +26,8 @@ aai:
   enabled: true
 appc:
   enabled: true
+cds:
+  enabled: true
 clamp:
   enabled: true
 cli:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index c0095049b5..672ae2ef9e 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -77,6 +77,8 @@ appc:
     openStackEncryptedPassword: admin
 cassandra:
   enabled: false
+cds:
+  enabled: false
 clamp:
   enabled: false
 cli:
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 2df38b74e7..0cde728e67 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -103,7 +103,7 @@ config:
 
 # dependency / sub-chart configuration
 cds:
-  enabled: true
+  enabled: false
 
 dmaap-listener:
   nameOverride: sdnc-dmaap-listener