Skip to content
Snippets Groups Projects
Commit f3c5357e authored by Rostislav Vatolin [SLB]'s avatar Rostislav Vatolin [SLB]
Browse files

Merge branch 'setup-autoscaling' into 'master'

Add memory limits

Closes #17

See merge request !94
parents a6ae9c6b abdd2cf1
No related branches found
No related tags found
1 merge request!94Add memory limits
Pipeline #68448 failed
...@@ -223,7 +223,7 @@ The following software have components provided under the terms of this license: ...@@ -223,7 +223,7 @@ The following software have components provided under the terms of this license:
- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf) - Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf)
- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
- QpidJMS Client (from ) - QpidJMS Client (from )
- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) - Reactor Netty with all modules (from https://github.com/reactor/reactor-netty)
- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
- Servlet Specification 2.5 API (from http://jetty.mortbay.org) - Servlet Specification 2.5 API (from http://jetty.mortbay.org)
- SnakeYAML (from http://www.snakeyaml.org) - SnakeYAML (from http://www.snakeyaml.org)
...@@ -623,7 +623,6 @@ The following software have components provided under the terms of this license: ...@@ -623,7 +623,6 @@ The following software have components provided under the terms of this license:
- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions) - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
- JUL to SLF4J bridge (from http://www.slf4j.org) - JUL to SLF4J bridge (from http://www.slf4j.org)
- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Java JWT (from http://www.jwt.io)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
...@@ -655,6 +654,7 @@ The following software have components provided under the terms of this license: ...@@ -655,6 +654,7 @@ The following software have components provided under the terms of this license:
- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java) - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
- java jwt (from https://github.com/auth0/java-jwt)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-core (from https://github.com/micrometer-metrics/micrometer)
- mockito-core (from https://github.com/mockito/mockito) - mockito-core (from https://github.com/mockito/mockito)
- mockito-core (from https://github.com/mockito/mockito) - mockito-core (from https://github.com/mockito/mockito)
......
...@@ -15,4 +15,11 @@ image: ...@@ -15,4 +15,11 @@ image:
branch: #{ENVIRONMENT_NAME}# branch: #{ENVIRONMENT_NAME}#
tag: #{Build.SourceVersion}# tag: #{Build.SourceVersion}#
istioDnsHost: #{ISTIO_DNS_HOST}# istioDnsHost: #{ISTIO_DNS_HOST}#
\ No newline at end of file
env: #{ENVIRONMENT_NAME}#
featureFlag:
resourceLimits:
enabledEnvs:
- demo
...@@ -45,6 +45,15 @@ spec: ...@@ -45,6 +45,15 @@ spec:
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 80 - containerPort: 80
{{- if has .Values.env .Values.featureFlag.resourceLimits.enabledEnvs }}
resources:
requests:
cpu: "100m"
memory: "600Mi"
limits:
cpu: "1000m"
memory: "1Gi"
{{- end }}
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
......
...@@ -22,4 +22,11 @@ image: ...@@ -22,4 +22,11 @@ image:
branch: master branch: master
tag: latest tag: latest
istioDnsHost: "" istioDnsHost: ""
\ No newline at end of file
env: demo
featureFlag:
resourceLimits:
enabledEnvs:
- demo
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment