WKTUI-337 adding missing service account helm chart arg

Author: robertpatrick

webui/src/js/utils/cmd-script-adapter.js

@@ -177,6 +177,12 @@ define(['utils/script-adapter-base'],
         }
 
         const variableRef = this.getVariableReference(variableName);
+        const serviceAccountLines = [
+          `IF "${helmChartValues.serviceAccount}" NEQ "" (`,
+          `${this.indent(1)}SET "${variableName}=${variableRef} --set serviceAccount=${helmChartValues.serviceAccount}"`,
+          ')'
+        ];
+
         const strategyLines = [
           `IF "${helmChartValues.domainNamespaceSelectionStrategy}" EQU "LabelSelector" (`,
           `${this.indent(1)}SET "${variableName}=${variableRef} --set domainNamespaceLabelSelector=${helmChartValues.domainNamespaceLabelSelector}"`,
@@ -255,6 +261,8 @@ define(['utils/script-adapter-base'],
         this._lines.push(
           ...strategyLines,
           '',
+          ...serviceAccountLines,
+          '',
           ...pullSecretsLines,
           '',
           ...roleBindingLines,

webui/src/js/utils/operator-script-generator.js

@@ -207,6 +207,7 @@ define(['models/wkt-project', 'utils/script-generator-base', 'utils/helm-helper'
 
       _gatherHelmChartArgs() {
         return {
+          serviceAccount: this.adapter.getVariableReference('WKO_SERVICE_ACCOUNT'),
           domainNamespaceSelectionStrategy: this.adapter.getVariableReference('WKO_DOMAIN_NAMESPACE_SELECTION_STRATEGY'),
           domainNamespaceLabelSelector: this.adapter.getVariableReference('WKO_DOMAIN_NAMESPACE_LABEL_SELECTOR'),
           domainNamespaces: this.adapter.getVariableReference('WKO_DOMAIN_NAMESPACES'),

webui/src/js/utils/powershell-script-adapter.js

@@ -131,6 +131,12 @@ define(['utils/script-adapter-base'],
         }
 
         const variableRef = this.getVariableReference(variableName);
+        const serviceAccountLines = [
+          `if ("${helmChartValues.serviceAccount}" -ne "") {`,
+          `${this.indent(1)}${variableName}="${variableRef} --set serviceAccount=${helmChartValues.serviceAccount}"`,
+          '}'
+        ];
+
         const strategyLines = [
           `if ("${helmChartValues.domainNamespaceSelectionStrategy}" -eq "LabelSelector") {`,
           `${this.indent(1)}$${variableName}="${variableRef} --set domainNamespaceLabelSelector=${helmChartValues.domainNamespaceLabelSelector}"`,
@@ -203,6 +209,8 @@ define(['utils/script-adapter-base'],
         this._lines.push(
           ...strategyLines,
           '',
+          ...serviceAccountLines,
+          '',
           ...pullSecretsLines,
           '',
           ...roleBindingLines,

webui/src/js/utils/sh-script-adapter.js

@@ -134,6 +134,12 @@ define(['utils/script-adapter-base'],
         }
 
         const variableRef = this.getVariableReference(variableName);
+        const serviceAccountLines = [
+          `if [ "${helmChartValues.serviceAccount}" != "" ]; then`,
+          `${this.indent(1)}${variableName}="${variableRef} --set serviceAccount=${helmChartValues.serviceAccount}"`,
+          'fi'
+        ];
+
         const strategyLines = [
           `if [ "${helmChartValues.domainNamespaceSelectionStrategy}" = "LabelSelector" ]; then`,
           `${this.indent(1)}${variableName}="${variableRef} --set domainNamespaceLabelSelector=${helmChartValues.domainNamespaceLabelSelector}"`,
@@ -206,6 +212,8 @@ define(['utils/script-adapter-base'],
         this._lines.push(
           ...strategyLines,
           '',
+          ...serviceAccountLines,
+          '',
           ...pullSecretsLines,
           '',
           ...roleBindingLines,