From 7d61c3307143fd12f586ad026e177fc13ea54fc9 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 09:31:44 +0100
Subject: [PATCH 01/12] OZG-7573 add grpc autoconfiguration
---
...boot.autoconfigure.AutoConfiguration.imports | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 formcycle-adapter/formcycle-adapter-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/formcycle-adapter/formcycle-adapter-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..0085992ee
--- /dev/null
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,17 @@
+net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
+net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration
+net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
+net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
+net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
+net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcAdviceAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcHealthServiceAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcMetadataConsulConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcMetadataEurekaConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcMetadataNacosConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcMetadataZookeeperConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcReflectionServiceAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcServerMetricAutoConfiguration
+net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration
\ No newline at end of file
--
GitLab
From d3bc3c393990a03ccfbb09b74b1076d339efbdfa Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 09:44:51 +0100
Subject: [PATCH 02/12] OZG-7573 move grpc autoconfiguration to forwarder
---
...g.springframework.boot.autoconfigure.AutoConfiguration.imports | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename {formcycle-adapter/formcycle-adapter-impl => forwarder}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/forwarder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from formcycle-adapter/formcycle-adapter-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to forwarder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
--
GitLab
From 26710f0db606bc0c12351ebcf67206194cc4cdac Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 10:27:12 +0100
Subject: [PATCH 03/12] OZG-7573 update vorgang-manager version
---
Jenkinsfile | 7 ++++---
eingang-manager-interface/pom.xml | 2 +-
formcycle-adapter/formcycle-adapter-interface/pom.xml | 4 ++--
pom.xml | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 38488fb06..5ff66e125 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,20 +53,21 @@ pipeline {
def commonVersion = getParentPomVersion('common/pom.xml')
def routerVersion = getParentPomVersion('router/pom.xml')
+ def forwarderVersion = getParentPomVersion('forwarder/pom.xml')
def formCycleAdapterVersion = getParentPomVersion('formcycle-adapter/pom.xml')
def enterpriseAdapterVersion = getParentPomVersion('enterprise-adapter/pom.xml')
if(env.BRANCH_NAME == 'release'){
- if ( !isReleaseVersion([rootVersion, vorgangManagerVersion, commonVersion, routerVersion, formCycleAdapterVersion, enterpriseAdapterVersion])) {
+ if ( !isReleaseVersion([rootVersion, vorgangManagerVersion, commonVersion, routerVersion, forwarderVersion, formCycleAdapterVersion, enterpriseAdapterVersion])) {
error("Keine Release Version für Branch ${env.BRANCH_NAME}.")
}
} else {
- if ( !isSnapshotVersion([rootVersion, commonVersion, routerVersion, formCycleAdapterVersion, enterpriseAdapterVersion])) {
+ if ( !isSnapshotVersion([rootVersion, commonVersion, routerVersion, forwarderVersion, formCycleAdapterVersion, enterpriseAdapterVersion])) {
error("Keine Snapshot Version für Branch ${env.BRANCH_NAME}.")
}
}
- if ( !isSameVersion([commonVersion, routerVersion, formCycleAdapterVersion, enterpriseAdapterVersion], rootVersion)) {
+ if ( !isSameVersion([commonVersion, routerVersion, forwarderVersion, formCycleAdapterVersion, enterpriseAdapterVersion], rootVersion)) {
error("Versionen sind nicht identisch")
}
}
diff --git a/eingang-manager-interface/pom.xml b/eingang-manager-interface/pom.xml
index b877903e6..81ee18525 100644
--- a/eingang-manager-interface/pom.xml
+++ b/eingang-manager-interface/pom.xml
@@ -45,7 +45,7 @@
<inceptionYear>2025</inceptionYear>
<properties>
- <vorgang-manager.version>2.23.0</vorgang-manager.version>
+ <vorgang-manager.version>2.24.0-SNAPSHOT</vorgang-manager.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml
index ce3c539bb..9e72b2c36 100644
--- a/formcycle-adapter/formcycle-adapter-interface/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml
@@ -41,7 +41,7 @@
<version>2.19.0-SNAPSHOT</version>
<properties>
- <vorgang-manager.version>2.0.0</vorgang-manager.version>
+ <vorgang-manager.version>2.24.0-SNAPSHOT</vorgang-manager.version>
<java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -102,4 +102,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4d92bb83e..ef5a79c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
</modules>
<properties>
- <vorgang-manager.version>2.24.0-OZG-7573-forwarding-interface-SNAPSHOT</vorgang-manager.version>
+ <vorgang-manager.version>2.24.0-SNAPSHOT</vorgang-manager.version>
<zufi-manager.version>1.7.0</zufi-manager.version>
<jsoup.version>1.14.3</jsoup.version>
--
GitLab
From 0e19f26ad13c48ee99be79e7392cb2c004bdd03a Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 10:30:21 +0100
Subject: [PATCH 04/12] OZG-7573 move forwarder dependency to common
---
common/pom.xml | 6 ++++++
formcycle-adapter/pom.xml | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index d3a815c3c..19f384dc1 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -40,6 +40,12 @@
<name>Eingangs Adapter - Common</name>
<dependencies>
+ <!-- OZG-Cloud -->
+ <dependency>
+ <groupId>de.ozgcloud.eingang</groupId>
+ <artifactId>forwarder</artifactId>
+ </dependency>
+
<!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml
index 04849487d..2e7f85ed2 100644
--- a/formcycle-adapter/pom.xml
+++ b/formcycle-adapter/pom.xml
@@ -63,10 +63,6 @@
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
</dependency>
- <dependency>
- <groupId>de.ozgcloud.eingang</groupId>
- <artifactId>forwarder</artifactId>
- </dependency>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
--
GitLab
From 616b5308b5a89f78a1e6222f5c67656e91828db7 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 10:41:50 +0100
Subject: [PATCH 05/12] OZG-7573 put forwarder dependency in enterprise adapter
and formcycle
---
common/pom.xml | 6 ------
enterprise-adapter/pom.xml | 4 ++++
formcycle-adapter/pom.xml | 5 +++++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index 19f384dc1..d3a815c3c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -40,12 +40,6 @@
<name>Eingangs Adapter - Common</name>
<dependencies>
- <!-- OZG-Cloud -->
- <dependency>
- <groupId>de.ozgcloud.eingang</groupId>
- <artifactId>forwarder</artifactId>
- </dependency>
-
<!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/enterprise-adapter/pom.xml b/enterprise-adapter/pom.xml
index 109660c3b..9e3d45ca7 100644
--- a/enterprise-adapter/pom.xml
+++ b/enterprise-adapter/pom.xml
@@ -46,6 +46,10 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>common</artifactId>
</dependency>
+ <dependency>
+ <groupId>de.ozgcloud.eingang</groupId>
+ <artifactId>forwarder</artifactId>
+ </dependency>
<dependency>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>semantik-adapter</artifactId>
diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml
index 2e7f85ed2..8c249502d 100644
--- a/formcycle-adapter/pom.xml
+++ b/formcycle-adapter/pom.xml
@@ -49,6 +49,11 @@
</properties>
<dependencies>
+ <!-- OZG-Cloud -->
+ <dependency>
+ <groupId>de.ozgcloud.eingang</groupId>
+ <artifactId>forwarder</artifactId>
+ </dependency>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
--
GitLab
From 438a23b3994356182c6a501dc377b5f1f7c689f8 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 10:57:31 +0100
Subject: [PATCH 06/12] OZG-7573 add forwarder to fim adapter
---
fim-adapter/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fim-adapter/pom.xml b/fim-adapter/pom.xml
index e672e58fb..bac822463 100644
--- a/fim-adapter/pom.xml
+++ b/fim-adapter/pom.xml
@@ -45,6 +45,10 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>semantik-adapter</artifactId>
</dependency>
+ <dependency>
+ <groupId>de.ozgcloud.eingang</groupId>
+ <artifactId>forwarder</artifactId>
+ </dependency>
<!--test -->
<dependency>
--
GitLab
From 7388a031ddc3ffdca41120b107dd30feac755d88 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 12:47:35 +0100
Subject: [PATCH 07/12] OZG-7573 build forwarder as own image
---
Jenkinsfile | 3 ++
enterprise-adapter/pom.xml | 4 ---
fim-adapter/pom.xml | 4 ---
formcycle-adapter/pom.xml | 4 ---
forwarder/pom.xml | 26 ++++++++++++++++
.../src/main/resources/application-local.yml | 21 +++++++++++++
forwarder/src/main/resources/application.yml | 31 +++++++++++++++++++
7 files changed, 81 insertions(+), 12 deletions(-)
create mode 100644 forwarder/src/main/resources/application-local.yml
create mode 100644 forwarder/src/main/resources/application.yml
diff --git a/Jenkinsfile b/Jenkinsfile
index 5ff66e125..b5e12d24f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -142,14 +142,17 @@ pipeline {
tagAndPushDockerImage('formcycle-adapter', IMAGE_TAG)
tagAndPushDockerImage('enterprise-adapter', IMAGE_TAG)
+ tagAndPushDockerImage('forwarder', IMAGE_TAG)
if (env.BRANCH_NAME == 'main') {
tagAndPushDockerImage('formcycle-adapter', 'snapshot-latest')
tagAndPushDockerImage('enterprise-adapter', 'snapshot-latest')
+ tagAndPushDockerImage('forwarder', 'snapshot-latest')
}
else if (env.BRANCH_NAME == 'release') {
tagAndPushDockerImage('formcycle-adapter', 'latest')
tagAndPushDockerImage('enterprise-adapter', 'latest')
+ tagAndPushDockerImage('forwarder', 'latest')
}
}
}
diff --git a/enterprise-adapter/pom.xml b/enterprise-adapter/pom.xml
index 9e3d45ca7..109660c3b 100644
--- a/enterprise-adapter/pom.xml
+++ b/enterprise-adapter/pom.xml
@@ -46,10 +46,6 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>common</artifactId>
</dependency>
- <dependency>
- <groupId>de.ozgcloud.eingang</groupId>
- <artifactId>forwarder</artifactId>
- </dependency>
<dependency>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>semantik-adapter</artifactId>
diff --git a/fim-adapter/pom.xml b/fim-adapter/pom.xml
index bac822463..e672e58fb 100644
--- a/fim-adapter/pom.xml
+++ b/fim-adapter/pom.xml
@@ -45,10 +45,6 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>semantik-adapter</artifactId>
</dependency>
- <dependency>
- <groupId>de.ozgcloud.eingang</groupId>
- <artifactId>forwarder</artifactId>
- </dependency>
<!--test -->
<dependency>
diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml
index 8c249502d..19cc12fb2 100644
--- a/formcycle-adapter/pom.xml
+++ b/formcycle-adapter/pom.xml
@@ -50,10 +50,6 @@
<dependencies>
<!-- OZG-Cloud -->
- <dependency>
- <groupId>de.ozgcloud.eingang</groupId>
- <artifactId>forwarder</artifactId>
- </dependency>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index 4fabecd6a..afd9753ee 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -124,4 +124,30 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>ci-build</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>de.ozgcloud.eingang.formcycle.FormcycleAdapterApplication</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-image</id>
+ <phase>install</phase>
+ <goals>
+ <goal>build-image-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/forwarder/src/main/resources/application-local.yml b/forwarder/src/main/resources/application-local.yml
new file mode 100644
index 000000000..1a493ac91
--- /dev/null
+++ b/forwarder/src/main/resources/application-local.yml
@@ -0,0 +1,21 @@
+logging:
+ config: classpath:log4j2-local.xml
+
+server:
+ port: 9293
+ error:
+ include-stacktrace: always
+
+management:
+ server.port: 8084
+
+ozgcloud:
+ adapter:
+ targetVorgangManagerName: local
+ fallbackStrategy: DENY
+
+grpc:
+ client:
+ vorgang-manager-local:
+ address: static://127.0.0.1:9090
+ negotiationType: PLAINTEXT
diff --git a/forwarder/src/main/resources/application.yml b/forwarder/src/main/resources/application.yml
new file mode 100644
index 000000000..3a1d31c30
--- /dev/null
+++ b/forwarder/src/main/resources/application.yml
@@ -0,0 +1,31 @@
+logging:
+ level:
+ ROOT: WARN
+ '[de.ozgcloud]': INFO
+
+management:
+ server:
+ port: 8081
+ health:
+ livenessState:
+ enabled: true
+ readinessState:
+ enabled: true
+ endpoint:
+ health:
+ group:
+ exploratory:
+ include: livenessState,readinessState,ping
+ show-details: always
+ probes:
+ enabled: true
+ prometheus:
+ enabled: true
+ endpoints:
+ web:
+ exposure:
+ include: health,prometheus
+
+ozgcloud:
+ adapter:
+ routingStrategy: SINGLE
\ No newline at end of file
--
GitLab
From 59a0e5fec9cac3f3551425036e3aea399b413dc0 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 12:52:28 +0100
Subject: [PATCH 08/12] OZG-7573 rollout of forwarder
---
Jenkinsfile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index b5e12d24f..b31a66a84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -297,11 +297,13 @@ String getElementAccessToken() {
Void setNewDevAdapterVersion() {
setNewFormcycleAdapterVersion('dev')
setNewEnterpriseAdapterVersion('dev')
+ setNewForwarderVersion('dev')
}
Void setNewTestAdapterVersion() {
setNewFormcycleAdapterVersion('test')
setNewEnterpriseAdapterVersion('test')
+ // setNewForwarderVersion('test') Not needed for now. Also the file is not present yet.
}
Void setNewFormcycleAdapterVersion(String environment) {
@@ -328,6 +330,18 @@ Void setNewEnterpriseAdapterVersion(String environment) {
}
}
+Void setNewForwarderVersion(String environment) {
+ dir("gitops") {
+ def envFile = "${environment}/application/values/forwarder-values.yaml"
+ def envVersions = readYaml file: envFile
+
+ envVersions.enterprise_adapter.image.tag = IMAGE_TAG
+ envVersions.enterprise_adapter.helm.version = HELM_CHART_VERSION
+
+ writeYaml file: envFile, data: envVersions, overwrite: true
+ }
+}
+
Void pushNewDevVersion() {
pushNewGitopsVersion('dev')
}
--
GitLab
From b37a93c94e9be8843979dac4a1bd89b36af9cb0c Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 13:21:53 +0100
Subject: [PATCH 09/12] OZG-7573 fix rollout
---
Jenkinsfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b31a66a84..3ce858404 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -303,7 +303,6 @@ Void setNewDevAdapterVersion() {
Void setNewTestAdapterVersion() {
setNewFormcycleAdapterVersion('test')
setNewEnterpriseAdapterVersion('test')
- // setNewForwarderVersion('test') Not needed for now. Also the file is not present yet.
}
Void setNewFormcycleAdapterVersion(String environment) {
@@ -335,8 +334,8 @@ Void setNewForwarderVersion(String environment) {
def envFile = "${environment}/application/values/forwarder-values.yaml"
def envVersions = readYaml file: envFile
- envVersions.enterprise_adapter.image.tag = IMAGE_TAG
- envVersions.enterprise_adapter.helm.version = HELM_CHART_VERSION
+ envVersions.forwarder.image.tag = IMAGE_TAG
+ envVersions.forwarder.helm.version = HELM_CHART_VERSION
writeYaml file: envFile, data: envVersions, overwrite: true
}
--
GitLab
From f7aca381b3ff2e6394674009372371bda55180f8 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 14:10:39 +0100
Subject: [PATCH 10/12] OZG-7573 set default service account name for forwarder
---
src/main/helm/templates/_helpers.tpl | 2 ++
src/test/helm/service_account_test.yaml | 14 ++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index b0f54ef2d..de5fd15f5 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -105,6 +105,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- printf "formcycle-adapter-service-account" }}
{{- else if eq (.Values.image).name "enterprise-adapter" }}
{{- printf "enterprise-adapter-service-account" }}
+{{- else if eq (.Values.image).name "forwarder" }}
+{{- printf "forwarder-service-account" }}
{{- end }}
{{- end -}}
diff --git a/src/test/helm/service_account_test.yaml b/src/test/helm/service_account_test.yaml
index e25b18bcf..3c145c3fa 100644
--- a/src/test/helm/service_account_test.yaml
+++ b/src/test/helm/service_account_test.yaml
@@ -57,6 +57,20 @@ tests:
- equal:
path: metadata.namespace
value: sh-helm-test
+ - it: should create default forwarder service account name
+ set:
+ image.name: forwarder
+ serviceAccount:
+ create: true
+ asserts:
+ - isKind:
+ of: ServiceAccount
+ - equal:
+ path: metadata.name
+ value: forwarder-service-account
+ - equal:
+ path: metadata.namespace
+ value: sh-helm-test
- it: should create service account with name
set:
serviceAccount:
--
GitLab
From 4a422e9e4ccd4eda33e7abfa50862ccccb68b956 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 14:27:26 +0100
Subject: [PATCH 11/12] OZG-7573 fix forwarder pom
---
forwarder/pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index afd9753ee..684b4926a 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -133,9 +133,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <mainClass>de.ozgcloud.eingang.formcycle.FormcycleAdapterApplication</mainClass>
- </configuration>
<executions>
<execution>
<id>build-image</id>
--
GitLab
From 086c2bfda193efb68cc013ab8a646854c7dffb42 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 24 Mar 2025 14:56:54 +0100
Subject: [PATCH 12/12] OZG-7573 add spring-boot-starter-actuator and banner
---
forwarder/pom.xml | 4 ++++
forwarder/src/main/resources/banner.txt | 6 ++++++
2 files changed, 10 insertions(+)
create mode 100644 forwarder/src/main/resources/banner.txt
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index 684b4926a..abb7d8eaf 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -59,6 +59,10 @@
</dependency>
<!-- spring -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
diff --git a/forwarder/src/main/resources/banner.txt b/forwarder/src/main/resources/banner.txt
new file mode 100644
index 000000000..2c1200feb
--- /dev/null
+++ b/forwarder/src/main/resources/banner.txt
@@ -0,0 +1,6 @@
+ ______ __
+ / ____/___ ______ ______ __________/ /__ _____
+ / /_ / __ \/ ___/ | /| / / __ `/ ___/ __ / _ \/ ___/
+ / __/ / /_/ / / | |/ |/ / /_/ / / / /_/ / __/ /
+/_/ \____/_/ |__/|__/\__,_/_/ \__,_/\___/_/
+${spring-boot.version} ${application.version}
--
GitLab