[COMMON] Increase limits for SMALL environments

Adjust settings for SO-API, CDS-SDC-LISTENER and MULTICLOUD_K8S

Issue-ID: OOM-3332

Change-Id: I66214a895575ccffa0cbf804784c51830968cb50
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index 4658b57..b270dc6 100644 (file)
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -97,7 +97,7 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: "1"
+      cpu: "1500m"
       memory: "700Mi"
     requests:
       cpu: "0.5"

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index f22dfa7..5109244 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -174,14 +174,14 @@ flavor: large
 resources:
   small:
     limits:
-      cpu: "200m"
+      cpu: "400m"
       memory: "500Mi"
     requests:
       cpu: "10m"
       memory: "10Mi"
   large:
     limits:
-      cpu: "400m"
+      cpu: "600m"
       memory: "1Gi"
     requests:
       cpu: "10m"

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 8742059..3aeec82 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -47,7 +47,6 @@ global:
     dbUser: root
     dbPassword: secretpassword
     # dbCredsExternalSecret: some secret
-  msbEnabled: true
   app:
     siteName: onapheat
     auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
@@ -183,370 +182,6 @@ service:
     - name: http
       port: *containerPort
       nodePort: '77'
-  annotations:
-    msb.onap.org/service-info: |
-      {{ if .Values.global.msbEnabled -}}[
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/activate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/deactivate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}/{requestId}/unlock",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}/unlock",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/activate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/deactivate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][7]}/serviceInstances/assign",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/unassign",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/enablePort",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/disablePort",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/activate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/deactivate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/addRelationships",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/removeRelationships",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/replace",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/applyUpdatedConfig",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/replace",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/inPlaceSoftwareUpdate",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/deactivateAndCloudDelete",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        },
-        {
-          "serviceName": "so",
-          "version": "v1",
-          "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"0",
-          "lb_policy":"ip_hash"
-        }
-      ]{{ end }}
 
 updateStrategy:
   type: RollingUpdate
@@ -565,7 +200,7 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: "1"
+      cpu: "1500m"
       memory: "4Gi"
     requests:
       cpu: "0.5"