From 2bed3b1dd695111cf2f3a857bdd015f68bd9029c Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Wed, 10 Jan 2024 11:19:26 +0100 Subject: [PATCH] adapter default service account name --- src/main/helm/templates/_helpers.tpl | 12 ++++- .../helm/deployment_service_account_test.yaml | 32 ++++++++++++- src/test/helm/service_account_test.yaml | 47 ++++++++++++++++++- 3 files changed, 86 insertions(+), 5 deletions(-) diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl index 10c105666..82a7d4757 100644 --- a/src/main/helm/templates/_helpers.tpl +++ b/src/main/helm/templates/_helpers.tpl @@ -83,5 +83,15 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} {{- end -}} {{- define "app.serviceAccountName" -}} -{{ printf "%s" ( (.Values.serviceAccount).name | default "eingang-manager-service-account" ) }} +{{- if (.Values.serviceAccount).name }} +{{- printf "%s" .Values.serviceAccount.name }} +{{- else if eq (.Values.image).name "intelliform-adapter" }} +{{- printf "afm-adapter-service-account" }} +{{- else if eq (.Values.image).name "formsolutions-adapter" }} +{{- printf "fs-adapter-service-account" }} +{{- else if eq (.Values.image).name "formcycle-adapter" }} +{{- printf "formcycle-adapter-service-account" }} +{{- else if eq (.Values.image).name "enterprise-adapter" }} +{{- printf "enterprise-adapter-service-account" }} +{{- end }} {{- end -}} \ No newline at end of file diff --git a/src/test/helm/deployment_service_account_test.yaml b/src/test/helm/deployment_service_account_test.yaml index c3108cff4..43aa6fcf5 100644 --- a/src/test/helm/deployment_service_account_test.yaml +++ b/src/test/helm/deployment_service_account_test.yaml @@ -29,14 +29,42 @@ release: templates: - templates/deployment.yaml tests: - - it: should use service account with default name + - it: should use afm-adapter service account name set: + image.name: intelliform-adapter serviceAccount: create: true asserts: - equal: path: spec.template.spec.serviceAccountName - value: eingang-manager-service-account + value: afm-adapter-service-account + - it: should use fs-adapter service account name + set: + image.name: formsolutions-adapter + serviceAccount: + create: true + asserts: + - equal: + path: spec.template.spec.serviceAccountName + value: fs-adapter-service-account + - it: should use formcycle-adapter service account name + set: + image.name: formcycle-adapter + serviceAccount: + create: true + asserts: + - equal: + path: spec.template.spec.serviceAccountName + value: formcycle-adapter-service-account + - it: should use enterprise-adapter service account name + set: + image.name: enterprise-adapter + serviceAccount: + create: true + asserts: + - equal: + path: spec.template.spec.serviceAccountName + value: enterprise-adapter-service-account - it: should use service account with name set: serviceAccount: diff --git a/src/test/helm/service_account_test.yaml b/src/test/helm/service_account_test.yaml index 4f8f2fe84..52561bed1 100644 --- a/src/test/helm/service_account_test.yaml +++ b/src/test/helm/service_account_test.yaml @@ -29,8 +29,9 @@ release: templates: - templates/service_account.yaml tests: - - it: should create service account with default name + - it: should create default afm adapter service account name set: + image.name: intelliform-adapter serviceAccount: create: true asserts: @@ -38,7 +39,49 @@ tests: of: ServiceAccount - equal: path: metadata.name - value: eingang-manager-service-account + value: afm-adapter-service-account + - equal: + path: metadata.namespace + value: sh-helm-test + - it: should create default fs adapter service account name + set: + image.name: formsolutions-adapter + serviceAccount: + create: true + asserts: + - isKind: + of: ServiceAccount + - equal: + path: metadata.name + value: fs-adapter-service-account + - equal: + path: metadata.namespace + value: sh-helm-test + - it: should create default formcycle adapter service account name + set: + image.name: formcycle-adapter + serviceAccount: + create: true + asserts: + - isKind: + of: ServiceAccount + - equal: + path: metadata.name + value: formcycle-adapter-service-account + - equal: + path: metadata.namespace + value: sh-helm-test + - it: should create default enterprise adapter service account name + set: + image.name: enterprise-adapter + serviceAccount: + create: true + asserts: + - isKind: + of: ServiceAccount + - equal: + path: metadata.name + value: enterprise-adapter-service-account - equal: path: metadata.namespace value: sh-helm-test -- GitLab