Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/storage into fix_swagger_for_collaboration

devops/gc/deploy/README.md

@@ -49,8 +49,8 @@ First you need to set variables in **values.yaml** file using any code editor. S
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
-**data.requestsCpu** | amount of requested CPU | string | `250m` | yes
-**data.requestsMemory** | amount of requested memory| string | `1024M` | yes
+**data.requestsCpu** | amount of requested CPU | string | `10m` | yes
+**data.requestsMemory** | amount of requested memory| string | `650Mi` | yes
 **data.limitsCpu** | CPU limit | string | `1` | yes
 **data.limitsMemory** | memory limit | string | `3G` | yes
 **data.image** | path to the image in a registry | string | - | yes
@@ -80,10 +80,12 @@ First you need to set variables in **values.yaml** file using any code editor. S
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
-**istio.proxyCPU** | CPU request for Envoy sidecars | string | 25m | yes
+**istio.proxyCPU** | CPU request for Envoy sidecars | string | 10m | yes
 **istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | 200m | yes
-**istio.proxyMemory** | memory request for Envoy sidecars | string | 64Mi | yes
+**istio.proxyMemory** | memory request for Envoy sidecars | string | 100Mi | yes
 **istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | 256Mi | yes
+**istio.bootstrapProxyCPU** | CPU request for Envoy sidecars | string | 10m | yes
+**istio.bootstrapProxyCPULimit** | CPU limit for Envoy sidecars | string | 100m | yes
 
 ## Install the Helm chart
 

devops/gc/deploy/templates/deploy-redis.yaml

@@ -14,7 +14,8 @@ spec:
       labels:
         app: {{ printf "redis-%s" .Values.conf.appName | quote }}
       annotations:
-        sidecar.istio.io/proxyCPU: 30m
+        sidecar.istio.io/proxyCPU: 10m
+        sidecar.istio.io/proxyMemory: 100Mi
     spec:
       containers:
       - args:
@@ -31,5 +32,6 @@ spec:
           protocol: TCP
         resources:
           requests:
-            memory: 100Mi
+            cpu: 10m
+            memory: 50Mi
 {{ end }}

devops/gc/deploy/values.yaml

@@ -17,8 +17,8 @@ data:
   defaultLegalTag: "default-data-tag"
   dataPartitionId: ""
   # deployments
-  requestsCpu: "250m"
-  requestsMemory: "1024M"
+  requestsCpu: "10m"
+  requestsMemory: "650Mi"
   limitsCpu: "1"
   limitsMemory: "3G"
   bootstrapImage: ""
@@ -45,9 +45,9 @@ conf:
   storageRedisSecretName: "storage-redis-secret"
 
 istio:
-  proxyCPU: "25m"
+  proxyCPU: "10m"
   proxyCPULimit: "200m"
-  proxyMemory: "64Mi"
+  proxyMemory: "100Mi"
   proxyMemoryLimit: "256Mi"
   bootstrapProxyCPU: "10m"
   bootstrapProxyCPULimit: "100m"