[VOL-4300]: Resource limits defined
Change-Id: Iad73584a4119dfb82d5059de1ef31283f5c85a9b
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 8e6ad7b..ab05d1d 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openolt"
-version: "2.10.0"
+version: "2.10.1"
description: "A Helm chart for Voltha OpenOLT Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 4c9a34b..623c280 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -125,3 +125,18 @@
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
+ resources:
+ requests:
+ {{- if .Values.resources.requests.memory }}
+ memory: {{ .Values.resources.requests.memory }}
+ {{- end }}
+ {{- if .Values.resources.requests.cpu }}
+ cpu: {{ .Values.resources.requests.cpu }}
+ {{- end }}
+ limits:
+ {{- if .Values.resources.limits.memory }}
+ memory: {{ .Values.resources.limits.memory }}
+ {{- end }}
+ {{- if .Values.resources.limits.cpu }}
+ cpu: {{ .Values.resources.limits.cpu }}
+ {{- end }}
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 8e9acc1..431bbfd 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -98,3 +98,11 @@
repository: '{{ .Values.global.image_org }}voltha-openolt-adapter'
tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy | default "Always" }}'
+
+resources:
+ requests:
+ cpu: 0.5
+ memory: 256Mi
+ limits:
+ cpu: ~
+ memory: ~
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 992dfb9..dd43fc5 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.9.2"
+version: "2.9.3"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index cbf1436..ccf984e 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -119,3 +119,18 @@
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
+ resources:
+ requests:
+ {{- if .Values.resources.requests.memory }}
+ memory: {{ .Values.resources.requests.memory }}
+ {{- end }}
+ {{- if .Values.resources.requests.cpu }}
+ cpu: {{ .Values.resources.requests.cpu }}
+ {{- end }}
+ limits:
+ {{- if .Values.resources.limits.memory }}
+ memory: {{ .Values.resources.limits.memory }}
+ {{- end }}
+ {{- if .Values.resources.limits.cpu }}
+ cpu: {{ .Values.resources.limits.cpu }}
+ {{- end }}
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index deba626..2ac4f8c 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -124,3 +124,11 @@
repository: '{{ .Values.global.image_org }}voltha-openonu-adapter-go'
tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy }}'
+
+resources:
+ requests:
+ cpu: 0.5
+ memory: 512Mi
+ limits:
+ cpu: ~
+ memory: ~
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index c2e957c..60088be 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.10.2"
+version: "2.10.3"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 55d36c5..7134aca 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -122,3 +122,18 @@
port: 8080
initialDelaySeconds: 3
periodSeconds: 3
+ resources:
+ requests:
+ {{- if .Values.resources.rw_core.requests.memory }}
+ memory: {{ .Values.resources.rw_core.requests.memory }}
+ {{- end }}
+ {{- if .Values.resources.rw_core.requests.cpu }}
+ cpu: {{ .Values.resources.rw_core.requests.cpu }}
+ {{- end }}
+ limits:
+ {{- if .Values.resources.rw_core.limits.memory }}
+ memory: {{ .Values.resources.rw_core.limits.memory }}
+ {{- end }}
+ {{- if .Values.resources.rw_core.limits.cpu }}
+ cpu: {{ .Values.resources.rw_core.limits.cpu }}
+ {{- end }}
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index ef04d2d..112b348 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -122,3 +122,18 @@
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
+ resources:
+ requests:
+ {{- if .Values.resources.ofagent.requests.memory }}
+ memory: {{ .Values.resources.ofagent.requests.memory }}
+ {{- end }}
+ {{- if .Values.resources.ofagent.requests.cpu }}
+ cpu: {{ .Values.resources.ofagent.requests.cpu }}
+ {{- end }}
+ limits:
+ {{- if .Values.resources.ofagent.limits.memory }}
+ memory: {{ .Values.resources.ofagent.limits.memory }}
+ {{- end }}
+ {{- if .Values.resources.ofagent.limits.cpu }}
+ cpu: {{ .Values.resources.ofagent.limits.cpu }}
+ {{- end }}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index c499be6..2bc6ea6 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -125,3 +125,19 @@
onos_classic:
onosOfPort: 6653
replicas: 1
+
+resources:
+ rw_core:
+ requests:
+ cpu: 500m
+ memory: 100Mi
+ limits:
+ cpu: ~
+ memory: ~
+ ofagent:
+ requests:
+ cpu: 300m
+ memory: 50Mi
+ limits:
+ cpu: ~
+ memory: ~