Merge pull request #27 from catenax-ng/drs-2.0.1

New release

CHANGELOG.md

@@ -8,13 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 NA
 
-## [2.0.0] - 2023-03-07
+## [2.0.0] - 2023-03-16
 
 ### Changed
-- upgrade Spring Boot to 3.0.3
-- upgrade Snakeyaml to 2.0 as 1.33 has security issue
+- Upgrade Spring Boot to 3.0.3
+- Upgrade Snakeyaml to 2.0 as 1.33 has security issue
 - New application.properties changes
-- sprint boot upgrade, keycloak upgrade
+- Spring boot upgrade, keycloak upgrade
+- Changed base image
 
 
 ## [1.0.6] - 2023-02-22

Dockerfile

@@ -1,31 +1,27 @@
-#FROM openjdk:17 as build
-FROM maven:3.8.5-openjdk-18-slim as build
+FROM maven:3.9.0-eclipse-temurin-19 as build
 
 COPY . /drs/
 
 WORKDIR /drs
 
-#RUN microdnf install dos2unix && microdnf clean all
-#RUN dos2unix mvnw
-#RUN chmod +x mvnw
-#RUN dos2unix .mvn/wrapper/maven-wrapper.properties
-
-#RUN ./mvnw clean install -Dmaven.test.skip=true
-
 RUN mvn clean install -Dmaven.test.skip=true
 
 RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar)
 
-FROM bellsoft/liberica-openjdk-alpine:17.0.4.1-1
+FROM eclipse-temurin:17.0.6_10-jdk-alpine
+
 RUN apk update && apk upgrade
 ARG DEPENDENCY=/drs/target/dependency
 
 COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
 COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
+
 RUN adduser -DH drs && addgroup drs drs
 USER drs
 
 ENTRYPOINT ["java", "-cp", "app:app/lib/*", "org.eclipse.tractusx.dapsreg.DapsregApplication"]
+
 EXPOSE 8080
 
+HEALTHCHECK CMD curl --fail http://localhost:8080 || exit 1   

INSTALL.md

@@ -2,9 +2,7 @@
 
 Helm charts are provided inside https://github.com/eclipse-tractusx/daps-registration-service
 
-1.) Using helm commands:- <br />
-
-How to install application using helm:-
+1.) Using helm:  <br />
     helm install ReleaseName ChartName
 
     a.) Add helm repository in tractusx:-
@@ -18,18 +16,17 @@ How to install application using helm:-
 2.) Local installation:
 
     a.) git clone https://github.com/eclipse-tractusx/daps-registration-service.git <br />
-    b.) Modify values file according to your requirement.  <br />
-    c.) You need to define the secrets as well in values.yaml  <br />
-        secret:  <br />
+    b.) Modify values file according to your requirement.
+    c.) You need to define the secrets as well in values.yaml
+        secret:
           clientId:  -> Client id for DAPS.   
-          clientSecret:   -> Client Secret for DAPS  <br />
-          authServerUrl:   -> Auth URL for keycloak. <br />
-          realm:   -> Realm for portal keycloak    <br />
-          resource:   -> Resource for portal keycloak.   <br />
-          apiUri:  ->   DAPS API URL.  <br />
-          tokenUri:   -> DAPS token URL.  <br /> 
-
-    d.) These secrets should be defined in Hashicorp vault. <br />
-    e.) Deploy in a kubernetes cluster  <br />
-        helm install daps-reg-svc charts/daps-reg-service/ -n NameSpace  <br />
-
+          clientSecret:   -> Client Secret for DAPS
+          authServerUrl:   -> Auth URL for keycloak
+          realm:   -> Realm for portal keycloak
+          resource:   -> Resource for portal keycloak
+          apiUri:  ->   DAPS API URL
+          tokenUri:   -> DAPS token URL
+
+    d.) These secrets should be defined in Hashicorp vault
+    e.) Deploy in a kubernetes cluster
+        helm install daps-reg-svc charts/daps-reg-service/ -n NameSpace

README.md

@@ -46,7 +46,7 @@ Other parameters are optional:
 - referringConnector: url of the Connector. By convention, we add BPN number at the
   end of the URL to keep reference to the BPN inside of DAT token
 
-## Example:#
+## Example:
 ```http request
 POST api/v1/daps?clientName=MyCompany HTTP/1.1
 Content-Type: multipart/form-data; boundary=---------------------------9051914041544843365972754266

charts/daps-reg-service/values-beta.yaml

@@ -45,8 +45,8 @@ ingress:
 # -- Pod resources requests and limits configuration
 resources:
   limits:
-    cpu: 200m
-    memory: 300Mi
+    cpu: 500m
+    memory: 400Mi
   requests:
     cpu: 200m
     memory: 300Mi

charts/daps-reg-service/values-dev.yaml

@@ -40,8 +40,8 @@ ingress:
 # -- Pod resources requests and limits configuration
 resources:
   limits:
-    cpu: 200m
-    memory: 300Mi
+    cpu: 500m
+    memory: 400Mi
   requests:
     cpu: 200m
     memory: 300Mi

charts/daps-reg-service/values-int.yaml

@@ -41,8 +41,8 @@ ingress:
 # -- Pod resources requests and limits configuration
 resources:
   limits:
-    cpu: 200m
-    memory: 300Mi
+    cpu: 500m
+    memory: 400Mi
   requests:
     cpu: 200m
     memory: 300Mi

charts/daps-reg-service/values-pen.yaml

@@ -40,10 +40,11 @@ ingress:
 
 
 # -- Pod resources requests and limits configuration
+resources:
 resources:
   limits:
-    cpu: 200m
-    memory: 300Mi
+    cpu: 500m
+    memory: 400Mi
   requests:
     cpu: 200m
     memory: 300Mi

charts/daps-reg-service/values.yaml

@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -112,11 +112,12 @@ drs:
 
 resources:
   limits:
-    cpu: 200m
-    memory: 300Mi
+    cpu: 500m
+    memory: 400Mi
   requests:
     cpu: 200m
     memory: 300Mi
+
   # 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