Skip to content
Snippets Groups Projects
Commit 782a3e93 authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

replace intelliform adapter with eingang-adapter

parent dced4153
No related branches found
No related tags found
1 merge request!8Revert deleting of intelliform-helm charts
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 34 deletions
src/main/helm/Chart.yaml
+ 2
− 3
View file @ 782a3e93
......@@ -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
src/main/helm/templates/deployment.yaml
+ 2
− 2
View file @ 782a3e93
......@@ -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
......
src/main/helm/values.yaml
+ 1
− 2
View file @ 782a3e93
......@@ -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
......
src/test/helm/deployment_63_chars_test.yaml
+ 3
− 3
View file @ 782a3e93
......@@ -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: {}
src/test/helm/deployment_defaults_labels_test.yaml
+ 4
− 5
View file @ 782a3e93
......@@ -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
src/test/helm/deployment_defaults_spec_containers_test.yaml
+ 2
− 2
View file @ 782a3e93
......@@ -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
......
src/test/helm/deployment_routing_strategy_env_test.yaml
+ 2
− 2
View file @ 782a3e93
......@@ -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
src/test/helm/deployment_routing_zufi_test.yaml
+ 3
− 3
View file @ 782a3e93
......@@ -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"
src/test/helm/ingress_test.yaml
+ 6
− 8
View file @ 782a3e93
......@@ -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
src/test/helm/service_monitor_test.yaml
+ 2
− 2
View file @ 782a3e93
......@@ -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
......
src/test/helm/service_test.yaml
+ 2
− 2
View file @ 782a3e93
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit