Merge pull request #31 from catenax-ng/R1.2.8

release1.2.8
eclipse-tractusx · May 15, 2023 · 1e26c87 · 1e26c87
2 parents c8b019a + 2c4ff37
commit 1e26c87
Show file tree

Hide file tree

Showing 9 changed files with 135 additions and 89 deletions.
diff --git a/.tractusx b/.tractusx
@@ -0,0 +1,2 @@
+product: "autosetup-backend"
+leadingRepository: "https://github.com/eclipse-tractusx/autosetup-backend"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
  - NA
 
+
+## [1.2.6] - 2023-05-10
+
+### Added
+ - Added .tractusx file
+
+### Fixed
+ - Veracode security issue fixes
+ - Fixed DEPENDENCIES file issue
+ - Specified runAsUser for securitycontext of container
+ - Specified base image in Readme
+
 ## [1.2.5] - 2023-04-21
 
 ### Added

diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/INSTALL.md b/INSTALL.md
@@ -8,9 +8,9 @@ How to install application using helm:  <br />
     helm install ReleaseName ChartName
 
     a.) Add helm repository in tractusx:
-           helm repo add autosetup https://eclipse-tractusx.github.io/charts/dev
+           helm repo add orchestrator https://eclipse-tractusx.github.io/charts/dev
     b.) To search the specific repo in helm repositories 
-           helm search repo tractusx-dev
+           helm search repo orchestrator/autosetup
     c.) To install using helm command:   
-           helm install autosetup tractusx-dev/autosetup
+           helm install orchestrator orchestrator/autosetup
 
diff --git a/README.md b/README.md
@@ -12,12 +12,25 @@ This service will help service provider to set up DFT/SDE with EDC and EDC as se
 ### Software Version
 
 ```shell
-Application version: 1.2.5
-Helm release version: 1.2.5
+Application version: 1.2.6
+Helm release version: 1.2.6
 ```
 
+### Container images
 
-##### For installation guide:
+This application provides container images for demonstration purposes. The base image used, to build this demo application image is eclipse-temurin:17-jdk-alpine
+
+Docker Hub:
+
+ - eclipse-temurin(https://hub.docker.com/_/eclipse-temurin)
+ - 17.0.6_10-jdk(https://hub.docker.com/layers/library/eclipse-temurin/17.0.6_10-jdk/images/sha256-ec8d3b91c6e30208bf69ecbbc3abdbc0f9aeaa2b955162e46c089fd6e07f4fb0?context=explore)
+
+Source:
+
+ - temurin-build(https://github.com/adoptium/temurin-build)
+ - temurin docker repo info(https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin)
+
+### For installation guide:
 
 [INSTALL.md](INSTALL.md)
 

diff --git a/charts/orchestrator/Chart.yaml b/charts/orchestrator/Chart.yaml
@@ -38,15 +38,14 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.5
-
+version: 1.2.6
 
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.2.5"
+appVersion: "1.2.6"
 
 dependencies:
   - condition: postgresql.enabled

diff --git a/charts/orchestrator/README.md b/charts/orchestrator/README.md
@@ -1,6 +1,6 @@
 # autosetup
 
-![Version: 1.2.5](https://img.shields.io/badge/Version-1.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.5](https://img.shields.io/badge/AppVersion-1.2.5-informational?style=flat-square)
+![Version: 1.2.6](https://img.shields.io/badge/Version-1.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.6](https://img.shields.io/badge/AppVersion-1.2.6-informational?style=flat-square)
 
 This service will help service provider to set up DFT/SDE with EDC and EDC as service in service provider environment.
 

diff --git a/charts/orchestrator/values.yaml b/charts/orchestrator/values.yaml
@@ -44,11 +44,12 @@ podAnnotations: {}
 portContainer: 9999
 
 podSecurityContext:
-  #fsGroup: 2000
+  fsGroup: 2000
 
 securityContext:
     # -- Controls whether a process can gain more privilege
   allowPrivilegeEscalation: false
+  runAsUser: 1000
 probe:
   endpoint: "/api/healthz"
 
@@ -78,14 +79,14 @@ ingress:
 resources:
   limits:
     # -- set a maximum amount of allows CPU utilization by specifying a limit on the container.
-    cpu: 800m
+    cpu: 600m
     # -- set a maximum amount of allows memory utilization by specifying a limit on the container.
     memory: 2Gi
   requests:
     # -- sets the minimum amount of CPU required for the container
-    cpu: 300m
+    cpu: 600m
     # -- set a minimum amount of allows memory utilization by specifying a limit on the container.
-    memory: 1Gi
+    memory: 2Gi
 
 autoscaling:
   enabled: false

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>auto-setup</artifactId>
-	<version>1.2.5</version>
+	<version>1.2.6</version>
 	<name>auto-setup</name>
 	<description>auto-setup</description>
 	<properties>
@@ -34,11 +34,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>6.0.7</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -192,11 +187,21 @@
 					<groupId>org.springframework.security</groupId>
 					<artifactId>spring-security-core</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-web</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-web</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
@@ -221,13 +226,27 @@
 					<groupId>net.minidev</groupId>
 					<artifactId>json-smart</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-web</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 			<version>6.0.8</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>6.0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>6.0.3</version>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		product: "autosetup-backend"
		leadingRepository: "https://github.com/eclipse-tractusx/autosetup-backend"