Merge "Remove unused properties from config files"

diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml
index 7b0767c..b6bf77f 100644 (file)
--- a/kubernetes/appc/charts/appc-ansible-server/values.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml
@@ -87,7 +87,7 @@ persistence:
   ## If undefined (the default) or set to null, no storageClassName spec is
   ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
   ##   GKE, AWS & OpenStack)
-  accessMode: ReadWriteMany
+  accessMode: ReadWriteOnce
   size: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: appc/ansible
@@ -112,5 +112,3 @@ resources:
       cpu: 1
       memory: 1Gi
   unlimited: {}
-
-

diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
index ec2ce6b..c17c2f4 100755 (executable)
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@ -106,6 +106,11 @@ blueprintsprocessor.messageconsumer.self-service-api.pollMillSec=1000
 
 # Self Service Response Kafka Message Producer
 blueprintsprocessor.messageproducer.self-service-api.bootstrapServers=message-router-kafka:9092
+
+
+# Used in Health Check
+endpoints.user.name=ccsdkapps
+endpoints.user.password=ccsdkapps
 blueprintsprocessor.messageproducer.self-service-api.type=kafka-basic-auth
 blueprintsprocessor.messageproducer.self-service-api.clientId=cds-client
 blueprintsprocessor.messageproducer.self-service-api.topic=cds-producer

diff --git a/kubernetes/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml
index 5f31c79..8bf6100 100644 (file)
--- a/kubernetes/clamp/charts/mariadb/values.yaml
+++ b/kubernetes/clamp/charts/mariadb/values.yaml
@@ -70,7 +70,7 @@ persistence:
   ##   GKE, AWS & OpenStack)
   ##
   # storageClass: "-"
-  accessMode: ReadWriteMany
+  accessMode: ReadWriteOnce
   size: 2Gi
   mountPath: /dockerdata-nfs
   mountSubPath: clamp/mariadb/data

diff --git a/kubernetes/log/charts/log-elasticsearch/values.yaml b/kubernetes/log/charts/log-elasticsearch/values.yaml
index 9c3525a..11e3727 100644 (file)
--- a/kubernetes/log/charts/log-elasticsearch/values.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/values.yaml
@@ -75,7 +75,7 @@ persistence:
   ## If undefined (the default) or set to null, no storageClassName spec is
   ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
   ##   GKE, AWS & OpenStack)
-  accessMode: ReadWriteMany
+  accessMode: ReadWriteOnce
   size: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: log/elasticsearch/data
@@ -113,4 +113,4 @@ resources:
     requests:
       cpu: 1
       memory: 4Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}

diff --git a/kubernetes/pomba/charts/pomba-data-router/values.yaml b/kubernetes/pomba/charts/pomba-data-router/values.yaml
index ec70f4b..3929e41 100644 (file)
--- a/kubernetes/pomba/charts/pomba-data-router/values.yaml
+++ b/kubernetes/pomba/charts/pomba-data-router/values.yaml
@@ -24,7 +24,7 @@ global:
   persistence: {}
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.0
-  
+
 # application image
 repository: nexus3.onap.org:10001
 image: onap/data-router:1.3.3
@@ -88,7 +88,7 @@ persistence:
   ##   GKE, AWS & OpenStack)
   ##
   ## storageClass: "-"
-  accessMode: ReadWriteMany
+  accessMode: ReadWriteOnce
   size: 2Gi
   mountPath: /dockerdata-nfs
   mountSubPath: pomba/data-router/logs

diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/values.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/values.yaml
index 00eb921..8201eff 100644 (file)
--- a/kubernetes/pomba/charts/pomba-elasticsearch/values.yaml
+++ b/kubernetes/pomba/charts/pomba-elasticsearch/values.yaml
@@ -74,7 +74,7 @@ persistence:
   ## If undefined (the default) or set to null, no storageClassName spec is
   ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
   ##   GKE, AWS & OpenStack)
-  accessMode: ReadWriteMany
+  accessMode: ReadWriteOnce
   size: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: pomba/elasticsearch/data

diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 8d9cee0..a0c3d36 100644 (file)
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -95,11 +95,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 10Gi
+      cpu: 2.2
+      memory: 800Mi
     requests:
-      cpu: 1
-      memory: 6Gi
+      cpu: 30m
+      memory: 460Mi
   large:
     limits:
       cpu: 4

diff --git a/kubernetes/portal/charts/portal-cassandra/values.yaml b/kubernetes/portal/charts/portal-cassandra/values.yaml
index e08f59b..65fcdbe 100644 (file)
--- a/kubernetes/portal/charts/portal-cassandra/values.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/values.yaml
@@ -98,11 +98,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: 500m
+      memory: 3.75Gi
     requests:
-      cpu: 1
-      memory: 4Gi
+      cpu: 160m
+      memory: 2.8Gi
   large:
     limits:
       cpu: 4

diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index e6896f1..e6aab2a 100644 (file)
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -132,11 +132,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 800m
-      memory: 1Gi
+      cpu: 460m
+      memory: 175Mi
     requests:
-      cpu: 400m
-      memory: 500Mi
+      cpu: 10m
+      memory: 100Mi
   large:
     limits:
       cpu: 2

diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 4a0124d..8daa148 100644 (file)
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -89,11 +89,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 4
-      memory: 10Gi
+      cpu: 600m
+      memory: 1.6Gi
     requests:
-      cpu: 2
-      memory: 5Gi
+      cpu: 10m
+      memory: 1.3Gi
   large:
     limits:
       cpu: 8

diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml
index 37f4294..7a02509 100644 (file)
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@ -75,10 +75,10 @@ resources:
   small:
     limits:
       cpu: 1
-      memory: 4Gi
+      memory: 430Mi
     requests:
-      cpu: 500m
-      memory: 2Gi
+      cpu: 1m
+      memory: 360Mi
   large:
     limits:
       cpu: 2

diff --git a/kubernetes/portal/charts/portal-zookeeper/values.yaml b/kubernetes/portal/charts/portal-zookeeper/values.yaml
index c7c8030..6037d24 100644 (file)
--- a/kubernetes/portal/charts/portal-zookeeper/values.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/values.yaml
@@ -62,11 +62,11 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 500m
-      memory: 600Mi
+      cpu: 100m
+      memory: 200Mi
     requests:
-      cpu: 250m
-      memory: 300Mi
+      cpu: 1m
+      memory: 80Mi
   large:
     limits:
       cpu: 1

diff --git a/kubernetes/robot b/kubernetes/robot
index 868374d..5526182 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 868374dc9e41555fa9e75a0ca63deb7cd6780ab9
+Subproject commit 5526182fa60a7a61c8158c98b6be8dfc66c8330b