feat(edge/stacks): use namespace in manifest [EE-4507] (#8145)

app/edge/components/edit-edge-stack-form/editEdgeStackForm.html

@@ -48,21 +48,33 @@
     </editor-description>
   </web-editor-form>
 
-  <web-editor-form
-    ng-if="$ctrl.model.DeploymentType === 1"
-    value="$ctrl.model.StackFileContent"
-    yml="true"
-    identifier="kube-manifest-editor"
-    placeholder="# Define or paste the content of your manifest here"
-    on-change="($ctrl.onChangeKubeManifest)"
-  >
-    <editor-description>
-      <p>
-        You can get more information about Kubernetes file format in the
-        <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/" target="_blank">official documentation</a>.
-      </p>
-    </editor-description>
-  </web-editor-form>
+  <div ng-if="$ctrl.model.DeploymentType === 1">
+    <div class="form-group">
+      <div class="col-sm-12">
+        <por-switch-field
+          label="'Use namespace(s) specified from manifest'"
+          tooltip="'If you have defined namespaces in your deployment file turning this on will enforce the use of those only in the deployment'"
+          checked="$ctrl.formValues.UseManifestNamespaces"
+          on-change="($ctrl.onChangeUseManifestNamespaces)"
+        ></por-switch-field>
+      </div>
+    </div>
+
+    <web-editor-form
+      value="$ctrl.model.StackFileContent"
+      yml="true"
+      identifier="kube-manifest-editor"
+      placeholder="# Define or paste the content of your manifest here"
+      on-change="($ctrl.onChangeKubeManifest)"
+    >
+      <editor-description>
+        <p>
+          You can get more information about Kubernetes file format in the
+          <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/" target="_blank">official documentation</a>.
+        </p>
+      </editor-description>
+    </web-editor-form>
+  </div>
 
   <!-- actions -->
   <div class="col-sm-12 form-section-title"> Actions </div>

app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js

@@ -22,6 +22,13 @@ export class EditEdgeStackFormController {
     this.onChangeDeploymentType = this.onChangeDeploymentType.bind(this);
     this.removeLineBreaks = this.removeLineBreaks.bind(this);
     this.onChangeFileContent = this.onChangeFileContent.bind(this);
+    this.onChangeUseManifestNamespaces = this.onChangeUseManifestNamespaces.bind(this);
+  }
+
+  onChangeUseManifestNamespaces(value) {
+    this.$scope.$evalAsync(() => {
+      this.model.UseManifestNamespaces = value;
+    });
   }
 
   hasKubeEndpoint() {

app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js

@@ -16,6 +16,7 @@ export default class CreateEdgeStackViewController {
       ComposeFilePathInRepository: '',
       Groups: [],
       DeploymentType: 0,
+      UseManifestNamespaces: false,
     };
 
     this.state = {
@@ -166,30 +167,32 @@ export default class CreateEdgeStackViewController {
   }
 
   createStackFromFileContent(name) {
-    const { StackFileContent, Groups, DeploymentType } = this.formValues;
+    const { StackFileContent, Groups, DeploymentType, UseManifestNamespaces } = this.formValues;
 
     return this.EdgeStackService.createStackFromFileContent({
       name,
       StackFileContent,
       EdgeGroups: Groups,
       DeploymentType,
+      UseManifestNamespaces,
     });
   }
 
   createStackFromFileUpload(name) {
-    const { StackFile, Groups, DeploymentType } = this.formValues;
+    const { StackFile, Groups, DeploymentType, UseManifestNamespaces } = this.formValues;
     return this.EdgeStackService.createStackFromFileUpload(
       {
         Name: name,
         EdgeGroups: Groups,
         DeploymentType,
+        UseManifestNamespaces,
       },
       StackFile
     );
   }
 
   createStackFromGitRepository(name) {
-    const { Groups, DeploymentType } = this.formValues;
+    const { Groups, DeploymentType, UseManifestNamespaces } = this.formValues;
     const repositoryOptions = {
       RepositoryURL: this.formValues.RepositoryURL,
       RepositoryReferenceName: this.formValues.RepositoryReferenceName,
@@ -203,6 +206,7 @@ export default class CreateEdgeStackViewController {
         name,
         EdgeGroups: Groups,
         DeploymentType,
+        UseManifestNamespaces,
       },
       repositoryOptions
     );

app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.controller.js

@@ -11,10 +11,20 @@ class KubeManifestFormController {
     this.onChangeFormValues = this.onChangeFormValues.bind(this);
     this.onChangeFile = this.onChangeFile.bind(this);
     this.onChangeMethod = this.onChangeMethod.bind(this);
+    this.onChangeUseManifestNamespaces = this.onChangeUseManifestNamespaces.bind(this);
   }
 
-  onChangeFormValues(values) {
-    this.formValues = values;
+  onChangeFormValues(newValues) {
+    return this.$async(async () => {
+      this.formValues = {
+        ...this.formValues,
+        ...newValues,
+      };
+    });
+  }
+
+  onChangeUseManifestNamespaces(value) {
+    this.onChangeFormValues({ UseManifestNamespaces: value });
   }
 
   onChangeFileContent(value) {

app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.html

@@ -1,3 +1,14 @@
+<div class="form-group">
+  <div class="col-sm-12">
+    <por-switch-field
+      label="'Use namespace(s) specified from manifest'"
+      tooltip="'If you have defined namespaces in your deployment file turning this on will enforce the use of those only in the deployment'"
+      checked="$ctrl.formValues.UseManifestNamespaces"
+      on-change="($ctrl.onChangeUseManifestNamespaces)"
+    ></por-switch-field>
+  </div>
+</div>
+
 <div class="col-sm-12 form-section-title"> Build method </div>
 <box-selector radio-name="'method'" value="$ctrl.state.Method" options="$ctrl.methodOptions" on-change="($ctrl.onChangeMethod)"></box-selector>
 

app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js

@@ -39,6 +39,7 @@ export class EditEdgeStackViewController {
       this.formValues = {
         StackFileContent: file,
         EdgeGroups: this.stack.EdgeGroups,
+        UseManifestNamespaces: this.stack.UseManifestNamespaces,
         DeploymentType: this.stack.DeploymentType,
       };
       this.oldFileContent = this.formValues.StackFileContent;
@@ -79,7 +80,7 @@ export class EditEdgeStackViewController {
   async deployStackAsync() {
     this.state.actionInProgress = true;
     try {
-      if (this.originalFileContent != this.formValues.StackFileContent) {
+      if (this.originalFileContent != this.formValues.StackFileContent || this.formValues.UseManifestNamespaces !== this.stack.UseManifestNamespaces) {
         this.formValues.Version = this.stack.Version + 1;
       }
       await this.EdgeStackService.updateStack(this.stack.Id, this.formValues);