Merge branch 'main' into drs-2.0.0

eclipse-tractusx · Mar 7, 2023 · cece65e · cece65e
2 parents a6a3dbe + d619d23
commit cece65e
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/dapsreg-pipeline.yml b/.github/workflows/dapsreg-pipeline.yml
@@ -81,4 +81,4 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,7 +38,6 @@ NA
 - Created new helm charts for DAPS registration service
 - The latest version for daps registration service is 1.0.4
 
-
 ## [1.0.4] - 2022-02-13
 
 ### Added

diff --git a/INSTALL.md b/INSTALL.md
@@ -32,4 +32,4 @@ How to install application using helm:-
     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 />
-        
+
diff --git a/README.md b/README.md
@@ -129,7 +129,6 @@ java -jar target/dapsreg-2.0.0.jar
 Please note the name of jar-file as it may differ if version is changed.
 
 
-
 ## Installation Steps
 
 

diff --git a/charts/daps-reg-service/.helmignore b/charts/daps-reg-service/.helmignore
@@ -7,4 +7,3 @@
 .gitignore
 values?*.yaml
 values?*.yml
-
diff --git a/charts/daps-reg-service/templates/secret.yaml b/charts/daps-reg-service/templates/secret.yaml
@@ -32,4 +32,3 @@ stringData:
   apiUri: {{ .Values.drs.secret.apiUri | default "https://apiUri" }}
   tokenUri: {{ .Values.drs.secret.tokenUri | default "https://tokenUri" }}
   jwkSetUri: {{ .Values.drs.secret.jwkSetUri | default "https://jwk-set-uri" }}
-
diff --git a/charts/daps-reg-service/values-dev.yaml b/charts/daps-reg-service/values-dev.yaml
@@ -32,12 +32,11 @@ ingress:
         - path: /
           pathType: ImplementationSpecific
 
-
   tls:
     enabled: true
     secretName: tls-secret
     host: "drs.dev.demo.catena-x.net"
-      
+
 # -- Pod resources requests and limits configuration
 resources:
   limits:
@@ -46,7 +45,7 @@ resources:
   requests:
     cpu: 200m
     memory: 300Mi
-    
+
 drs:
   secret:
     clientId: "<path:essential-services/data/daps#clientId>"

diff --git a/pom.xml b/pom.xml
@@ -105,7 +105,6 @@
 
 
 	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,4 +81,4 @@ jobs:
		push: ${{ github.event_name != 'pull_request' }}
		tags: ${{ steps.meta.outputs.tags }}
		labels: ${{ steps.meta.outputs.labels }}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ How to install application using helm:-
		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 />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -129,7 +129,6 @@ java -jar target/dapsreg-2.0.0.jar
		Please note the name of jar-file as it may differ if version is changed.



		## Installation Steps


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,3 @@ stringData:
		apiUri: {{ .Values.drs.secret.apiUri \| default "https://apiUri" }}
		tokenUri: {{ .Values.drs.secret.tokenUri \| default "https://tokenUri" }}
		jwkSetUri: {{ .Values.drs.secret.jwkSetUri \| default "https://jwk-set-uri" }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,6 @@ @@
     	</dependencies>
     	<build>
     		<plugins>
     			<plugin>
@@ Expand Down @@