Skip to content

Commit a3d3ebf

Browse files
authored
Merge pull request #178 from pagopa/release-uat
feat: Promote to Main
2 parents f279734 + bc6ab91 commit a3d3ebf

File tree

6 files changed

+49
-10
lines changed

6 files changed

+49
-10
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# see https://help.github.com/en/articles/about-code-owners#example-of-a-codeowners-file
22

3-
* @pagopa/idpay-app-maintainer-team @dariopelliccioli @antonioT90 @frtrinca @Benedetta-fabbri @FrancescoGraziano @stedelia
3+
* @pagopa/idpay-app-maintainer-team @stedelia

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN mvn clean package -DskipTests
1111
#
1212
# Docker RUNTIME
1313
#
14-
FROM amazoncorretto:17-alpine3.20@sha256:1b1d0653d890ff313a1f7afadd1fd81f5ea742c9c48670d483b1bbccef98bb8b AS runtime
14+
FROM amazoncorretto:17-alpine3.20@sha256:38b44a49bfd11b925015b281d3d35c845daaeca5f0e3827f8e1df9bedf7b256a AS runtime
1515

1616
RUN apk --no-cache add shadow
1717
RUN useradd --uid 10000 runner
@@ -21,7 +21,7 @@ WORKDIR /app
2121

2222
COPY --from=buildtime /build/target/*.jar /app/app.jar
2323
# The agent is enabled at runtime via JAVA_TOOL_OPTIONS.
24-
ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.6.1/applicationinsights-agent-3.6.1.jar /app/applicationinsights-agent.jar
24+
ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.7.0/applicationinsights-agent-3.7.0.jar /app/applicationinsights-agent.jar
2525

2626
RUN chown -R runner:runner /app
2727

helm/values-dev.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ microservice-chart:
1212
memory: "768Mi"
1313
cpu: "150m"
1414
limits:
15-
memory: "768Mi"
15+
memory: "1Gi"
1616
cpu: "600m"
1717

1818
autoscaling:
@@ -41,4 +41,20 @@ microservice-chart:
4141
# affinity: {}
4242

4343
envConfig:
44-
JAVA_TOOL_OPTIONS: "-Xms256m -Xmx512m -Djava.util.concurrent.ForkJoinPool.common.parallelism=7 -Dio.netty.eventLoopThreads=100 -javaagent:/app/applicationinsights-agent.jar -Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json -agentlib:jdwp=transport=dt_socket,server=y,address=8001,suspend=n -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=3002 -Dcom.sun.management.jmxremote.rmi.port=3003 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
44+
JAVA_TOOL_OPTIONS: >-
45+
-XX:InitialRAMPercentage=75.0
46+
-XX:MaxRAMPercentage=85.0
47+
-XX:+UseG1GC
48+
-XX:+UseContainerSupport
49+
-Djava.security.egd=file:/dev/./urandom
50+
-Djava.util.concurrent.ForkJoinPool.common.parallelism=7
51+
-Dio.netty.eventLoopThreads=100
52+
-javaagent:/app/applicationinsights-agent.jar
53+
-Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json
54+
-agentlib:jdwp=transport=dt_socket,server=y,address=8001,suspend=n
55+
-Dcom.sun.management.jmxremote=true
56+
-Dcom.sun.management.jmxremote.port=3002
57+
-Dcom.sun.management.jmxremote.rmi.port=3003
58+
-Djava.rmi.server.hostname=127.0.0.1
59+
-Dcom.sun.management.jmxremote.authenticate=false
60+
-Dcom.sun.management.jmxremote.ssl=false

helm/values-prod.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ microservice-chart:
1212
memory: "768Mi"
1313
cpu: "150m"
1414
limits:
15-
memory: "768Mi"
15+
memory: "1Gi"
1616
cpu: "600m"
1717

1818
autoscaling:
@@ -42,4 +42,14 @@ microservice-chart:
4242
# affinity: {}
4343

4444
envConfig:
45-
JAVA_TOOL_OPTIONS: "-Xms256m -Xmx512m -Djava.util.concurrent.ForkJoinPool.common.parallelism=7 -Dio.netty.eventLoopThreads=100 -javaagent:/app/applicationinsights-agent.jar -Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json"
45+
JAVA_TOOL_OPTIONS: >-
46+
-XX:InitialRAMPercentage=75.0
47+
-XX:MaxRAMPercentage=85.0
48+
-XX:+UseG1GC
49+
-XX:+UseContainerSupport
50+
-Djava.security.egd=file:/dev/./urandom
51+
-Djava.util.concurrent.ForkJoinPool.common.parallelism=7
52+
-Dio.netty.eventLoopThreads=100
53+
-javaagent:/app/applicationinsights-agent.jar
54+
-Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json
55+
-agentlib:jdwp=transport=dt_socket,server=y,address=8001,suspend=n

helm/values-uat.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ microservice-chart:
1212
memory: "768Mi"
1313
cpu: "150m"
1414
limits:
15-
memory: "768Mi"
15+
memory: "1Gi"
1616
cpu: "600m"
1717

1818
autoscaling:
@@ -42,4 +42,11 @@ microservice-chart:
4242
# affinity: {}
4343

4444
envConfig:
45-
JAVA_TOOL_OPTIONS: '-Xms256m -Xmx512m -javaagent:/app/applicationinsights-agent.jar -Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json'
45+
JAVA_TOOL_OPTIONS: >-
46+
-XX:InitialRAMPercentage=75.0
47+
-XX:MaxRAMPercentage=85.0
48+
-XX:+UseG1GC
49+
-XX:+UseContainerSupport
50+
-Djava.security.egd=file:/dev/./urandom
51+
-javaagent:/app/applicationinsights-agent.jar
52+
-Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@
134134
<artifactId>reactor-test</artifactId>
135135
<scope>test</scope>
136136
</dependency>
137+
138+
<dependency>
139+
<groupId>net.minidev</groupId>
140+
<artifactId>json-smart</artifactId>
141+
<version>2.5.2</version>
142+
</dependency>
137143
</dependencies>
138144

139145
<dependencyManagement>
@@ -150,7 +156,7 @@
150156
<groupId>io.netty</groupId>
151157
<artifactId>netty-bom</artifactId>
152158
<!-- Forced to >= 4.1.104 due to https://nvd.nist.gov/vuln/detail/CVE-2023-44487 -->
153-
<version>4.1.113.Final</version>
159+
<version>4.1.118.Final</version>
154160
<type>pom</type>
155161
<scope>import</scope>
156162
</dependency>

0 commit comments

Comments
 (0)