feat(provider/kubernetes): namespace deployManifest (spinnaker#7016)

adds fields for namespaceOverride to allow users to define the namespace their manifests are deployed into (particularly for manifests baked from Helm charts).
maggieneterval · May 17, 2019 · 4f4c32b · 4f4c32b
1 parent 8e97d59
commit 4f4c32b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx
@@ -19,7 +19,7 @@ export function ManifestBasicSettings({
   selectedAccount,
 }: IManifestBasicSettingsProps) {
   return (
-    <div className="container-fluid form-horizontal">
+    <div className="form-horizontal">
       <div className="form-group">
         <div className="col-md-3 sm-label-right">
           Account <HelpField id="kubernetes.manifest.account" />

diff --git a/...pts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/DeployManifestStageForm.tsx b/...pts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/DeployManifestStageForm.tsx
@@ -23,6 +23,7 @@ import { CopyFromTemplateButton } from './CopyFromTemplateButton';
 import { IManifestBindArtifact } from './ManifestBindArtifactsSelector';
 import { ManifestDeploymentOptions } from './ManifestDeploymentOptions';
 import { ManifestBindArtifactsSelectorDelegate } from './ManifestBindArtifactsSelectorDelegate';
+import { NamespaceSelector } from './NamespaceSelector';
 
 interface IDeployManifestStageConfigFormProps {
   accounts: IAccountDetails[];
@@ -31,6 +32,7 @@ interface IDeployManifestStageConfigFormProps {
 
 interface IDeployManifestStageConfigFormState {
   rawManifest: string;
+  overrideNamespace: boolean;
 }
 
 export class DeployManifestStageForm extends React.Component<
@@ -48,10 +50,12 @@ export class DeployManifestStageForm extends React.Component<
 
   public constructor(props: IDeployManifestStageConfigFormProps & IFormikStageConfigInjectedProps) {
     super(props);
+    const stage = this.props.formik.values;
     const manifests: any[] = get(props.formik.values, 'manifests');
     const isTextManifest: boolean = get(props.formik.values, 'source') === this.textSource;
     this.state = {
       rawManifest: !isEmpty(manifests) && isTextManifest ? yamlDocumentsToString(manifests) : '',
+      overrideNamespace: get(stage, 'namespaceOverride', '') !== '',
     };
   }
 
@@ -105,6 +109,13 @@ export class DeployManifestStageForm extends React.Component<
     this.props.formik.setFieldValue('requiredArtifacts', bindings.filter(b => b.artifact));
   };
 
+  private overrideNamespaceChange(checked: boolean) {
+    if (!checked) {
+      this.props.formik.setFieldValue('namespaceOverride', '');
+    }
+    this.setState({ overrideNamespace: checked });
+  }
+
   public render() {
     const stage = this.props.formik.values;
     return (
@@ -116,6 +127,23 @@ export class DeployManifestStageForm extends React.Component<
           onAccountSelect={accountName => this.props.formik.setFieldValue('account', accountName)}
           selectedAccount={stage.account}
         />
+        <StageConfigField label="Override Namespace">
+          <CheckboxInput
+            checked={this.state.overrideNamespace}
+            onChange={(e: any) => this.overrideNamespaceChange(e.target.checked)}
+          />
+        </StageConfigField>
+        {this.state.overrideNamespace && (
+          <StageConfigField label="Namespace">
+            <NamespaceSelector
+              createable={true}
+              accounts={this.props.accounts}
+              selectedAccount={stage.account}
+              selectedNamespace={stage.namespaceOverride || ''}
+              onChange={namespace => this.props.formik.setFieldValue('namespaceOverride', namespace)}
+            />
+          </StageConfigField>
+        )}
         <hr />
         <h4>Manifest Configuration</h4>
         <StageConfigField label="Manifest Source" helpKey="kubernetes.manifest.source">