From 782a3e93e1b4f20a5055dba42bc02bd691758025 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Fri, 7 Feb 2025 16:17:43 +0100
Subject: [PATCH] replace intelliform adapter with eingang-adapter
---
src/main/helm/Chart.yaml | 5 ++---
src/main/helm/templates/deployment.yaml | 4 ++--
src/main/helm/values.yaml | 3 +--
src/test/helm/deployment_63_chars_test.yaml | 6 +++---
src/test/helm/deployment_defaults_labels_test.yaml | 9 ++++-----
.../deployment_defaults_spec_containers_test.yaml | 4 ++--
.../helm/deployment_routing_strategy_env_test.yaml | 4 ++--
src/test/helm/deployment_routing_zufi_test.yaml | 6 +++---
src/test/helm/ingress_test.yaml | 14 ++++++--------
src/test/helm/service_monitor_test.yaml | 4 ++--
src/test/helm/service_test.yaml | 4 ++--
11 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml
index 2b05d0cc4..118bc6f74 100644
--- a/src/main/helm/Chart.yaml
+++ b/src/main/helm/Chart.yaml
@@ -24,8 +24,7 @@
apiVersion: v1
appVersion: "1.1"
-description: A Helm chart for Intelliform Adapter
-name: Intelliform-Adapter
+description: A Helm chart for Eingang Adapter
+name: eingang-adapter
version: 0.0.0-MANAGED-BY-JENKINS
icon: https://simpleicons.org/icons/helm.svg
-
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index b59bb1cc4..ff60598c9 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -62,7 +62,7 @@ spec:
- name: SERVICE_BINDING_ROOT
value: "/bindings"
{{- range (.Values.env).grpc }}
- - name: {{ .name }}
+ - name: {{ .name }}
value: {{ .value }}
{{- end }}
- name: spring_profiles_active
@@ -95,7 +95,7 @@ spec:
{{- end }}
image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
imagePullPolicy: Always
- name: intelliform-adapter
+ name: eingang-adapter
ports:
- containerPort: 8080
name: 8080tcp1
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 118009532..541998250 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -26,10 +26,9 @@ baseUrl: test.sh.ozg-cloud.de
image:
repo: docker.ozg-sh.de
- name: intelliform-adapter # [default: intelliform-adapter]
+ name: eingang-adapter # [default: eingang-adapter]
tag: latest # [default: latest]
-
ingress:
enabled: true
# overrideHost: kiel-afm.dev.by.ozg-cloud.de
diff --git a/src/test/helm/deployment_63_chars_test.yaml b/src/test/helm/deployment_63_chars_test.yaml
index 417144739..a40e1b8e4 100644
--- a/src/test/helm/deployment_63_chars_test.yaml
+++ b/src/test/helm/deployment_63_chars_test.yaml
@@ -26,7 +26,7 @@ suite: test deyploment less than 63 chars
release:
name: eingang-manager
namespace: sh-helm-test
-
+
chart:
name: eingang-manager
set:
@@ -50,7 +50,7 @@ tests:
version: 1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890
asserts:
- failedTemplate:
- errorMessage: .Chart.Name-.Chart.Version Intelliform-Adapter-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
+ errorMessage: .Chart.Name-.Chart.Version eingang-adapter-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
- it: should not fail on .Chart.Name-.Chart.Version length less than 63 characters
asserts:
- - notFailedTemplate: {}
\ No newline at end of file
+ - notFailedTemplate: {}
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 4e2d5f7fd..89894411a 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -24,7 +24,7 @@
suite: test deployment default label
release:
- name: intelliform-adapter
+ name: eingang-adapter
namespace: sh-helm-test
templates:
- templates/deployment.yaml
@@ -37,13 +37,12 @@ tests:
asserts:
- equal:
path: metadata.labels
- value:
+ value:
app.kubernetes.io/instance: afm-adapter
app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: intelliform-adapter
+ app.kubernetes.io/name: eingang-adapter
app.kubernetes.io/namespace: sh-helm-test
app.kubernetes.io/part-of: ozgcloud
app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
- helm.sh/chart: Intelliform-Adapter-0.0.0-MANAGED-BY-JENKINS
+ helm.sh/chart: eingang-adapter-0.0.0-MANAGED-BY-JENKINS
ozg-component: eingangsadapter
-
diff --git a/src/test/helm/deployment_defaults_spec_containers_test.yaml b/src/test/helm/deployment_defaults_spec_containers_test.yaml
index 07d4b6ee7..55f0afcf7 100644
--- a/src/test/helm/deployment_defaults_spec_containers_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_test.yaml
@@ -36,13 +36,13 @@ tests:
asserts:
- equal:
path: spec.template.spec.containers[0].image
- value: docker.ozg-sh.de/intelliform-adapter:latest
+ value: docker.ozg-sh.de/eingang-adapter:latest
- equal:
path: spec.template.spec.containers[0].imagePullPolicy
value: Always
- equal:
path: spec.template.spec.containers[0].name
- value: intelliform-adapter
+ value: eingang-adapter
- equal:
path: spec.template.spec.containers[0].ports[0].containerPort
value: 8080
diff --git a/src/test/helm/deployment_routing_strategy_env_test.yaml b/src/test/helm/deployment_routing_strategy_env_test.yaml
index e70cff6f1..92220ea51 100644
--- a/src/test/helm/deployment_routing_strategy_env_test.yaml
+++ b/src/test/helm/deployment_routing_strategy_env_test.yaml
@@ -24,7 +24,7 @@
suite: test deployment routing strategy
release:
- name: intelliform-adapter
+ name: eingang-adapter
namespace: sh-helm-test
templates:
- deployment.yaml
@@ -77,4 +77,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
- value: PLAINTEXT
\ No newline at end of file
+ value: PLAINTEXT
diff --git a/src/test/helm/deployment_routing_zufi_test.yaml b/src/test/helm/deployment_routing_zufi_test.yaml
index 85c3e1b73..a2d8aac38 100644
--- a/src/test/helm/deployment_routing_zufi_test.yaml
+++ b/src/test/helm/deployment_routing_zufi_test.yaml
@@ -24,7 +24,7 @@
suite: test deployment zufi routing
release:
- name: intelliform-adapter
+ name: eingang-adapter
namespace: sh-helm-test
templates:
- deployment.yaml
@@ -51,7 +51,7 @@ tests:
content:
name: grpc_client_zufi-manager_negotiationType
value: "TLS"
-
+
- it: should not set zufi routing values when zufi is disabled
asserts:
- notContains:
@@ -86,4 +86,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_zufi-manager_negotiationType
- value: "PLAINTEXT"
\ No newline at end of file
+ value: "PLAINTEXT"
diff --git a/src/test/helm/ingress_test.yaml b/src/test/helm/ingress_test.yaml
index ee0b43da7..1b41eb85c 100644
--- a/src/test/helm/ingress_test.yaml
+++ b/src/test/helm/ingress_test.yaml
@@ -24,7 +24,7 @@
suite: test ingress creation
release:
- name: intelliform-adapter
+ name: eingang-adapter
namespace: sh-helm-test
templates:
- templates/ingress.yaml
@@ -39,7 +39,7 @@ tests:
apiVersion: networking.k8s.io/v1
- equal:
path: metadata.name
- value: intelliform-adapter
+ value: eingang-adapter
- equal:
path: metadata.namespace
value: sh-helm-test
@@ -52,12 +52,12 @@ tests:
asserts:
- equal:
path: spec.rules[0].http.paths[0].backend.service.name
- value: intelliform-adapter
+ value: eingang-adapter
- it: should match service path
asserts:
- equal:
path: spec.rules[0].http.paths[0].path
- value: ''
+ value: ""
- it: should match service pathType
asserts:
- equal:
@@ -72,7 +72,6 @@ tests:
path: spec.tls[0].hosts[0]
value: helm-afm.test.sh.ozg-cloud.de
-
- it: should create fs host
set:
image.name: formsolutions-adapter
@@ -83,7 +82,7 @@ tests:
- equal:
path: spec.tls[0].hosts[0]
value: helm-fs.test.sh.ozg-cloud.de
-
+
- it: should create formcycle host
set:
image.name: formcycle-adapter
@@ -95,7 +94,6 @@ tests:
path: spec.tls[0].hosts[0]
value: helm-formcycle.test.sh.ozg-cloud.de
-
- it: should create custom adapter host
set:
ingress.adapterBezeichner: test
@@ -144,4 +142,4 @@ tests:
asserts:
- equal:
path: metadata.annotations["nginx.ingress.kubernetes.io/proxy-body-size"]
- value: 42m
\ No newline at end of file
+ value: 42m
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index c85a7a6b6..8c4a1b5b0 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -44,7 +44,7 @@ tests:
- equal:
path: metadata.labels["component"]
value: afm-adapter-service-monitor
-
+
- it: should contain default lables and component lables
asserts:
- equal:
@@ -57,7 +57,7 @@ tests:
app.kubernetes.io/part-of: ozgcloud
app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
component: afm-adapter-service-monitor
- helm.sh/chart: Intelliform-Adapter-0.0.0-MANAGED-BY-JENKINS
+ helm.sh/chart: eingang-adapter-0.0.0-MANAGED-BY-JENKINS
ozg-component: eingangsadapter
- it: should have the metrics endpoint configured by default
diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml
index ebc38d5c4..bec1a28db 100644
--- a/src/test/helm/service_test.yaml
+++ b/src/test/helm/service_test.yaml
@@ -96,5 +96,5 @@ tests:
app.kubernetes.io/part-of: ozgcloud
app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
component: afm-adapter-service
- helm.sh/chart: Intelliform-Adapter-0.0.0-MANAGED-BY-JENKINS
- ozg-component: eingangsadapter
\ No newline at end of file
+ helm.sh/chart: eingang-adapter-0.0.0-MANAGED-BY-JENKINS
+ ozg-component: eingangsadapter
--
GitLab