diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml index 2b05d0cc44865405be7186d55cd52125e5caeddd..118bc6f74779ce79a8a15dfdbedd450131fd3e29 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 b59bb1cc41fbfbba0098590a4986042bd510300e..ff60598c9d00093ed3d2f002245182fa95f8e116 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 118009532b1262af86efb421e2108e41dae7775c..541998250aa42636af92686d9a033224c7809966 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 41714473932411899a910a547e47af4600dbdfc7..a40e1b8e4a6bf3dacdb94c28a87860a586a3b029 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 4e2d5f7fd51431f4d91582e5cc50dd5d8ba1d837..89894411abf15ec1c22d11b9f38956ebb1e21b2f 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 07d4b6ee79c603f06057055482c46a6b79e85db6..55f0afcf7350eb0581e6d2446868ce03db17a49a 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 e70cff6f10669ad7574fb80dcbf96f3c11aee715..92220ea51710cd2db8fb318c97f754cd7ea55bcc 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 85c3e1b73b83bca9bc5f183d2a4a03bb96963d3b..a2d8aac381f5af75209966cf8f9374cac2b680e4 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 ee0b43da744be9805ca8e9a5930f532f34e502db..1b41eb85c9edf55b7035253fcc67e414e8e7e527 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 c85a7a6b6cb599d55d1bd699bd84f2f2ac6f387c..8c4a1b5b04308778216b89a24fcc8bd50e9a76a2 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 ebc38d5c4c073721252e15a296588b7a73af23bf..bec1a28db12893cbcfd07fe0f88fa19e10502aa5 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