remove formsolutions from helm

src/main/helm/templates/_helpers.tpl

@@ -91,8 +91,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- define "app.ingress.host" }}
 {{- if (.Values.ingress).adapterBezeichner }}
 {{- printf "%s-%s.%s" (include "app.ozgcloudBezeichner" .) .Values.ingress.adapterBezeichner .Values.baseUrl }}
-{{- else if eq (.Values.image).name "formsolutions-adapter" }}
-{{- printf "%s-fs.%s" (include "app.ozgcloudBezeichner" .) .Values.baseUrl }}
 {{- else if eq (.Values.image).name "formcycle-adapter" }}
 {{- printf "%s-formcycle.%s" (include "app.ozgcloudBezeichner" .) .Values.baseUrl }}
 {{- else }}
@@ -105,8 +103,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- 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" }}

src/test/helm/deployment_service_account_test.yaml

@@ -42,15 +42,6 @@ tests:
       - equal:
           path: spec.template.spec.serviceAccountName
           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
@@ -81,4 +72,4 @@ tests:
   - it: should use default service account
     asserts:
       - isNull:
-          path: spec.template.spec.serviceAccountName
\ No newline at end of file
+          path: spec.template.spec.serviceAccountName

src/test/helm/ingress_nginx_test.yaml

@@ -29,7 +29,7 @@ templates:
 set:
   ozgcloud:
     bezeichner: helm
-    
+
 tests:
   - it: should create afm ingress tls
     release:
@@ -38,15 +38,6 @@ tests:
       - equal:
           path: spec.tls[0].secretName
           value: helm-afm-adapter-tls
-  - it: should create afm ingress tls
-    release:
-      name: fs-adapter
-    set:
-      image.name: formsolutions-adapter
-    asserts:
-      - equal:
-          path: spec.tls[0].secretName
-          value: helm-fs-adapter-tls
 
   - it: should not set secretName
     set:
@@ -65,4 +56,4 @@ tests:
     asserts:
       - equal:
           path: spec.ingressClassName
-          value: nginx
\ No newline at end of file
+          value: nginx

src/test/helm/ingress_test.yaml

@@ -72,17 +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
-    asserts:
-      - equal:
-          path: spec.rules[0].host
-          value: helm-fs.test.sh.ozg-cloud.de
-      - 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

src/test/helm/service_account_test.yaml

@@ -42,21 +42,6 @@ tests:
       - equal:
           path: metadata.name
           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
@@ -105,4 +90,4 @@ tests:
   - it: should not create service account
     asserts:
       - hasDocuments:
-        count: 0
\ No newline at end of file
+        count: 0