diff --git a/deploy/install.sh b/deploy/install.sh
index 9bf61305..55f06f4d 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
fi
NS=kernel
-CHART_VERSION=1.3.0
+CHART_VERSION=1.3.1-develop
echo Create $NS namespace
kubectl create ns $NS
diff --git a/helm/auditmanager/Chart.yaml b/helm/auditmanager/Chart.yaml
index 9180ecb2..1f9afdd7 100644
--- a/helm/auditmanager/Chart.yaml
+++ b/helm/auditmanager/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
name: auditmanager
description: A Helm chart for MOSIP Auditmanager module
type: application
-version: 1.3.0
+version: 1.3.1-develop
appVersion: ""
dependencies:
- name: common
diff --git a/helm/auditmanager/values.yaml b/helm/auditmanager/values.yaml
index 5f7f16c9..f125d5dc 100644
--- a/helm/auditmanager/values.yaml
+++ b/helm/auditmanager/values.yaml
@@ -46,8 +46,8 @@ service:
externalTrafficPolicy: Cluster
image:
registry: docker.io
- repository: mosipid/kernel-auditmanager-service
- tag: 1.3.0
+ repository: mosipqa/kernel-auditmanager-service
+ tag: 1.3.x
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -117,11 +117,21 @@ resources:
memory: 5000Mi
requests:
cpu: 1000m
- memory: 3000Mi
+ memory: 2500Mi
additionalResources:
## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
## Example: java_opts: "-Xms500M -Xmx500M"
- javaOpts: "-Xms2250M -Xmx3750M"
+ javaOpts: >-
+ -XX:+UseZGC -XX:+ZGenerational -XX:+ZProactive
+ -XX:ZCollectionInterval=3 -XX:+ZUncommit -XX:ZUncommitDelay=60
+ -XX:ConcGCThreads=2 -Xms1875m -Xmx3200m
+ -XX:SoftMaxHeapSize=2600m -XX:+AlwaysPreTouch
+ -XX:ActiveProcessorCount=2 -XX:+UseContainerSupport
+ -XX:MaxMetaspaceSize=256m -XX:ReservedCodeCacheSize=192m
+ -XX:+UseCodeCacheFlushing -XX:+TieredCompilation
+ -XX:TieredStopAtLevel=4 -XX:SoftRefLRUPolicyMSPerMB=50
+ -XX:+DisableExplicitGC -XX:+ExitOnOutOfMemoryError
+ -Djava.security.egd=file:/dev/./urandom
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
## Clamav container already runs as 'mosip' user, so we may not need to enable this
containerSecurityContext:
diff --git a/kernel/kernel-auditmanager-api/pom.xml b/kernel/kernel-auditmanager-api/pom.xml
index c8729037..666eba99 100644
--- a/kernel/kernel-auditmanager-api/pom.xml
+++ b/kernel/kernel-auditmanager-api/pom.xml
@@ -7,7 +7,7 @@
io.mosip.kernel
kernel-auditmanager-api
- 1.3.0
+ 1.3.1-SNAPSHOT
UTF-8
@@ -22,7 +22,7 @@
2.3
0.7.0
- 1.3.0
+ 1.3.1-SNAPSHOT
0.8.11
**/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java
diff --git a/kernel/kernel-auditmanager-service/Dockerfile b/kernel/kernel-auditmanager-service/Dockerfile
index 1fbf9b2b..84733517 100644
--- a/kernel/kernel-auditmanager-service/Dockerfile
+++ b/kernel/kernel-auditmanager-service/Dockerfile
@@ -73,13 +73,20 @@ COPY ./target/kernel-auditmanager-service-*.jar /home/${container_user}/kernel-a
# set working directory for the user
WORKDIR /home/${container_user}
+COPY configure_start.sh ${work_dir}/configure_start.sh
+
+# change permissions of file inside working dir
+RUN sed -i 's/\r$//' ${work_dir}/configure_start.sh \
+ && chmod +x ${work_dir}/configure_start.sh \
+ && chown -R ${container_user}:${container_user} ${work_dir}
+
# select container user for all tasks
USER ${container_user_uid}:${container_user_gid}
# can expose required port
EXPOSE 8081
+ENTRYPOINT ["sh", "configure_start.sh"]
+
# the command to run when the container starts
-CMD wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
- java -XX:+ExplicitGCInvokesConcurrent -XX:+UseZGC -XX:+ZGenerational -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops \
- -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar kernel-auditmanager-service.jar ; \
+CMD java -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar kernel-auditmanager-service.jar ; \
diff --git a/kernel/kernel-auditmanager-service/configure_start.sh b/kernel/kernel-auditmanager-service/configure_start.sh
new file mode 100644
index 00000000..240963a8
--- /dev/null
+++ b/kernel/kernel-auditmanager-service/configure_start.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#installs the pre-requisites.
+set -e
+
+echo "Downloading pre-requisites install scripts"
+
+wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
+
+echo "Installating pre-requisites completed."
+
+exec "$@"
\ No newline at end of file
diff --git a/kernel/kernel-auditmanager-service/pom.xml b/kernel/kernel-auditmanager-service/pom.xml
index 31c71469..878b0fa1 100644
--- a/kernel/kernel-auditmanager-service/pom.xml
+++ b/kernel/kernel-auditmanager-service/pom.xml
@@ -5,7 +5,7 @@
io.mosip.kernel
kernel-auditmanager-service
- 1.3.0
+ 1.3.1-SNAPSHOT
UTF-8
@@ -21,12 +21,12 @@
0.7.0
- 1.3.0
- 1.3.0
- 1.3.0
- 1.3.0
+ 1.3.1-SNAPSHOT
+ 1.3.1-SNAPSHOT
+ 1.3.1-SNAPSHOT
+ 1.3.1-SNAPSHOT
1.3.0
- 1.3.0
+ 1.3.1-SNAPSHOT
**/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java"
**/dto/**,**/entity/**,**/config/**
diff --git a/kernel/pom.xml b/kernel/pom.xml
index 89de5ab0..41aadcba 100644
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 1.3.0
+ 1.3.1-SNAPSHOT
io.mosip.kernel
audit-manager
pom