Merge "[AAF] No resources limits on PODs"
authorBorislav Glozman <Borislav.Glozman@amdocs.com>
Wed, 11 Dec 2019 14:19:12 +0000 (14:19 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 11 Dec 2019 14:19:12 +0000 (14:19 +0000)
1  2 
kubernetes/aaf/charts/aaf-cm/values.yaml
kubernetes/aaf/charts/aaf-fs/values.yaml
kubernetes/aaf/charts/aaf-gui/values.yaml
kubernetes/aaf/charts/aaf-hello/values.yaml
kubernetes/aaf/charts/aaf-locate/values.yaml
kubernetes/aaf/charts/aaf-oauth/values.yaml
kubernetes/aaf/charts/aaf-service/values.yaml

@@@ -52,28 -52,21 +52,27 @@@ service
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aafcm"
 +      name: "aaf-cm"
 +      port: 8150
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #  small:
- #    limits:
- #      cpu: 200m
- #      memory: 800Mi
- #    requests:
- #      cpu: 20m
- #      memory: 500Mi
- #  large:
- #    limits:
- #      cpu: 400m
- #      memory: 1Gi
- #    requests:
- #      cpu: 40m
- #      memory: 600Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 20m
+      memory: 300Mi
+    requests:
+      cpu: 1m
+      memory: 200Mi
+  large:
+    limits:
+      cpu: 400m
+      memory: 1Gi
+    requests:
+      cpu: 40m
+      memory: 600Mi
+  unlimited: {}
@@@ -54,28 -54,21 +54,27 @@@ service
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aaffs"
 +      name: "aaf-fs"
 +      port: 8096
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #  small:
- #    limits:
- #      cpu: 200m
- #      memory: 800Mi
- #    requests:
- #      cpu: 10m
- #      memory: 300Mi
- #  large:
- #    limits:
- #      cpu: 500m
- #      memory: 700Mi
- #    requests:
- #      cpu: 100m
- #      memory: 400Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 200m
+      memory: 110Mi
+    requests:
+      cpu: 1m
+      memory: 80Mi
+  large:
+    limits:
+      cpu: 500m
+      memory: 700Mi
+    requests:
+      cpu: 100m
+      memory: 400Mi
+  unlimited: {}
@@@ -56,29 -56,21 +56,27 @@@ service
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aafgui"
 +      name: "aaf-gui"
 +      port: 8200
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #resources:
- #  small:
- #    limits:
- #      cpu: 100m
- #      memory: 500Mi
- #    requests:
- #      cpu: 10m
- #      memory: 200Mi
- #  large:
- #    limits:
- #      cpu: 200m
- #      memory: 1Gi
- #    requests:
- #      cpu: 100m
- #      memory: 500Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 20m
+      memory: 280Mi
+    requests:
+      cpu: 1m
+      memory: 170Mi
+  large:
+    limits:
+      cpu: 200m
+      memory: 1Gi
+    requests:
+      cpu: 100m
+      memory: 500Mi
+  unlimited: {}
@@@ -71,29 -71,21 +71,27 @@@ readiness
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aafhello"
 +      name: "aaf-hello"
 +      port: 8130
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #resources:
- #  small:
- #    limits:
- #      cpu: 200m
- #      memory: 500Mi
- #    requests:
- #      cpu: 10m
- #      memory: 200Mi
- #  large:
- #    limits:
- #      cpu: 400m
- #      memory: 1Gi
- #    requests:
- #      cpu: 20m
- #      memory: 500Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 200m
+      memory: 500Mi
+    requests:
+      cpu: 10m
+      memory: 200Mi
+  large:
+    limits:
+      cpu: 400m
+      memory: 1Gi
+    requests:
+      cpu: 20m
+      memory: 500Mi
+  unlimited: {}
@@@ -52,29 -52,21 +52,27 @@@ service
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aaflocate"
 +      name: "aaf-locate"
 +      port: 8095
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #resources:
- #  small:
- #    limits:
- #      cpu: 200m
- #      memory: 600Mi
- #    requests:
- #      cpu: 20m
- #      memory: 300Mi
- #  large:
- #    limits:
- #      cpu: 400m
- #      memory: 1Gi
- #    requests:
- #      cpu: 40m
- #      memory: 500Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 40m
+      memory: 320Mi
+    requests:
+      cpu: 1m
+      memory: 210Mi
+  large:
+    limits:
+      cpu: 400m
+      memory: 1Gi
+    requests:
+      cpu: 40m
+      memory: 500Mi
+  unlimited: {}
@@@ -51,29 -51,21 +51,27 @@@ service
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aafoauth"
 +      name: "aaf-oauth"
 +      port: 8140
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #resources:
- #  small:
- #    limits:
- #      cpu: 200m
- #      memory: 400Mi
- #    requests:
- #      cpu: 20m
- #      memory: 200Mi
- #  large:
- #    limits:
- #      cpu: 400m
- #      memory: 600Mi
- #    requests:
- #      cpu: 40m
- #      memory: 200Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 40m
+      memory: 320Mi
+    requests:
+      cpu: 1m
+      memory: 210Mi
+  large:
+    limits:
+      cpu: 400m
+      memory: 600Mi
+    requests:
+      cpu: 40m
+      memory: 200Mi
+  unlimited: {}
@@@ -52,29 -52,21 +52,27 @@@ service
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aafservice"
 +      name: "aaf-service"
 +      port: 8100
 +  config:
 +    ssl: "none"
  
  # Configure resource requests and limits
- resources: {}
- # Allow END users to do this, if they want.  Detrimental to Test services
- #resources:
- #  small:
- #    limits:
- #      cpu: 200m
- #      memory: 800Mi
- #    requests:
- #      cpu: 20m
- #      memory: 300Mi
- #  large:
- #    limits:
- #      cpu: 400m
- #      memory: 1Gi
- #    requests:
- #      cpu: 40m
- #      memory: 300Mi
- #  unlimited: {}
+ resources:
+  small:
+    limits:
+      cpu: 250m
+      memory: 360Mi
+    requests:
+      cpu: 10m
+      memory: 250Mi
+  large:
+    limits:
+      cpu: 400m
+      memory: 1Gi
+    requests:
+      cpu: 40m
+      memory: 300Mi
+  unlimited: {}