diff options
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/aai/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/aai/values.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/cli/values.yaml | 23 | ||||
| -rw-r--r-- | kubernetes/robot/templates/deployment.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/robot/values.yaml | 41 | ||||
| -rw-r--r-- | kubernetes/uui/charts/uui-server/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/uui/charts/uui-server/values.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/uui/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/uui/values.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/vnfsdk/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/vnfsdk/values.yaml | 19 |
11 files changed, 111 insertions, 57 deletions
diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml index dc65cef187..17ba83b8d7 100644 --- a/kubernetes/aai/templates/deployment.yaml +++ b/kubernetes/aai/templates/deployment.yaml @@ -80,7 +80,7 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} resources: -{{ toYaml .Values.resources | indent 12 }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 99699a0031..25f8ddf55b 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -196,6 +196,8 @@ dockerhubRepository: registry.hub.docker.com image: aaionap/haproxy:1.2.4 pullPolicy: Always +flavor: small + # flag to enable debugging - application support required debugEnabled: false @@ -240,7 +242,6 @@ service: ingress: enabled: false -resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -251,10 +252,18 @@ resources: {} # ref: http://kubernetes.io/docs/user-guide/compute-resources/ # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi
\ No newline at end of file +resources: + small: + limits: + cpu: 2 + memory: 4Gi + requests: + cpu: 2 + memory: 4Gi + large: + limits: + cpu: 4 + memory: 8Gi + requests: + cpu: 4 + memory: 8Gi diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml index 5766c810e4..223a484122 100644 --- a/kubernetes/cli/values.yaml +++ b/kubernetes/cli/values.yaml @@ -64,7 +64,6 @@ service: ingress: enabled: false -resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -75,10 +74,18 @@ resources: {} # ref: http://kubernetes.io/docs/user-guide/compute-resources/ # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi +resources: + small: + limits: + cpu: 1 + memory: 2Gi + requests: + cpu: 1 + memory: 2Gi + large: + limits: + cpu: 4 + memory: 8Gi + requests: + cpu: 4 + memory: 8Gi diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml index cebc7f5898..319ef59386 100644 --- a/kubernetes/robot/templates/deployment.yaml +++ b/kubernetes/robot/templates/deployment.yaml @@ -57,7 +57,7 @@ spec: - name: robot-logs mountPath: /share/logs resources: -{{ toYaml .Values.resources | indent 12 }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 2951b6098b..146c0be941 100755 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -84,6 +84,25 @@ nodeSelector: {} affinity: {} +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) +resources: + small: + limits: + cpu: 2000m + memory: 4Gi + requests: + cpu: 500m + memory: 1Gi + large: + limits: + cpu: 4000m + memory: 8Gi + requests: + cpu: 1000m + memory: 2Gi + # probe configuration parameters liveness: initialDelaySeconds: 10 @@ -96,7 +115,6 @@ readiness: initialDelaySeconds: 10 periodSeconds: 10 - service: name: robot type: NodePort @@ -105,30 +123,9 @@ service: internalPort: 88 nodePort: "09" - ingress: enabled: false - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # - # Example: - # Configure resource requests and limits - # ref: http://kubernetes.io/docs/user-guide/compute-resources/ - # Minimum memory for development is 2 CPU cores and 4GB memory - # Minimum memory for production is 4 CPU cores and 8GB memory -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi - ## Persist data to a persitent volume persistence: enabled: true diff --git a/kubernetes/uui/charts/uui-server/templates/deployment.yaml b/kubernetes/uui/charts/uui-server/templates/deployment.yaml index e1c0d77baa..0a73fff646 100644 --- a/kubernetes/uui/charts/uui-server/templates/deployment.yaml +++ b/kubernetes/uui/charts/uui-server/templates/deployment.yaml @@ -45,6 +45,8 @@ spec: initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end -}} + resources: +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} diff --git a/kubernetes/uui/charts/uui-server/values.yaml b/kubernetes/uui/charts/uui-server/values.yaml index 25a9538866..ecc93c0a7b 100644 --- a/kubernetes/uui/charts/uui-server/values.yaml +++ b/kubernetes/uui/charts/uui-server/values.yaml @@ -21,6 +21,8 @@ global: subChartsOnly: enabled: true +flavor: small + # application image repository: nexus3.onap.org:10001 image: onap/usecase-ui/usecase-ui-server:1.1.1 @@ -63,7 +65,6 @@ service: ingress: enabled: false -resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -74,10 +75,18 @@ resources: {} # ref: http://kubernetes.io/docs/user-guide/compute-resources/ # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi +resources: + small: + limits: + cpu: 250m + memory: 250Mi + requests: + cpu: 250m + memory: 250Mi + large: + limits: + cpu: 500m + memory: 500Mi + requests: + cpu: 500m + memory: 500Mi diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml index 9578d9c5d8..5d564cf902 100644 --- a/kubernetes/uui/templates/deployment.yaml +++ b/kubernetes/uui/templates/deployment.yaml @@ -58,7 +58,7 @@ spec: - name: MSB_ADDR value: {{ tpl .Values.msbaddr . }} resources: -{{ toYaml .Values.resources | indent 12 }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml index 66b277837e..95be04ba7c 100644 --- a/kubernetes/uui/values.yaml +++ b/kubernetes/uui/values.yaml @@ -21,6 +21,8 @@ global: subChartsOnly: enabled: true +flavor: small + # application image repository: nexus3.onap.org:10001 image: onap/usecase-ui:1.1.1 @@ -63,7 +65,6 @@ service: ingress: enabled: false -resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -74,10 +75,18 @@ resources: {} # ref: http://kubernetes.io/docs/user-guide/compute-resources/ # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi +resources: + small: + limits: + cpu: 250m + memory: 1Gi + requests: + cpu: 250m + memory: 1Gi + large: + limits: + cpu: 500m + memory: 1Gi + requests: + cpu: 500m + memory: 1Gi diff --git a/kubernetes/vnfsdk/templates/deployment.yaml b/kubernetes/vnfsdk/templates/deployment.yaml index 5b6f9237ce..ee779f408f 100644 --- a/kubernetes/vnfsdk/templates/deployment.yaml +++ b/kubernetes/vnfsdk/templates/deployment.yaml @@ -52,6 +52,8 @@ spec: - image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }} name: {{ include "common.name" . }} + resources: +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} env: - name: POSTGRES_SERVICE_HOST value: "$(VNFSDK_DBSET_SERVICE_HOST)" diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml index 0db7744523..89630c9876 100644 --- a/kubernetes/vnfsdk/values.yaml +++ b/kubernetes/vnfsdk/values.yaml @@ -61,6 +61,25 @@ nodeSelector: {} affinity: {} +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) +resources: + small: + limits: + cpu: 2000m + memory: 4Gi + requests: + cpu: 500m + memory: 1Gi + large: + limits: + cpu: 4000m + memory: 8Gi + requests: + cpu: 1000m + memory: 2Gi + # probe configuration parameters liveness: initialDelaySeconds: 10 |