@spinnaker/core 0.22.2 → 0.23.1

package/dist/pipeline/config/stages/bake/bakeStageChooseManagedImage.component.d.ts

@@ -0,0 +1,16 @@
+import type { IController } from 'angular';
+export interface IManagedImageOption {
+    id: string;
+    name: string;
+    osType: string;
+}
+export declare class BakeStageChooseManagedImageController implements IController {
+    model: any;
+    managedImageOptions: IManagedImageOption[];
+    onChange: () => any;
+    $onChanges(): void;
+    getManagedImageDescription(managedImageOption: IManagedImageOption): string;
+    getManagedImageDetailedDescription(managedImageOption: IManagedImageOption): string;
+    getManagedImageDisabled(managedImageOption: IManagedImageOption): boolean;
+}
+export declare const PIPELINE_BAKE_STAGE_CHOOSE_MANAGED_IMAGE = "spinnaker.core.pipeline.bake.chooseManagedImage.component";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.22.2",
+  "version": "0.23.1",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -120,5 +120,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "587b5a7a5fe2121cd93bed86e5e83795ee401be0"
+  "gitHead": "8abafe5c6a6680953aef7752b1a56cac093ec9ba"
 }

package/src/help/help.contents.ts

@@ -298,10 +298,12 @@ const helpContents: { [key: string]: string } = {
     '<p>Explicitly evaluate SpEL expressions in overrides just prior to manifest baking. Can be paired with the "Skip SpEL evaluation" option in the Deploy Manifest stage when baking a third-party manifest artifact with expressions not meant for Spinnaker to evaluate as SpEL.</p>',
   'pipeline.config.bake.manifest.templateRenderer': '<p>This is the engine used for rendering your manifest.</p>',
   'pipeline.config.bake.manifest.helm.chartFilePath': `
-    <p>This is the relative path to the Chart.yaml file within your Git repo.</p>
-    <p>e.g.: <b>helm/my-chart/Chart.yaml</b></p>`,
+    <p>This is the relative path to the directory containing the Chart.yaml file within your Git repo.</p>
+    <p>e.g.: <b>helm/my-chart</b></p>`,
   'pipeline.config.bake.manifest.helm.rawOverrides':
     'Use <i>--set</i> instead of <i>--set-string</i> when injecting override values. Values injected using <i>--set</i> will be converted to primitive types by Helm.',
+  'pipeline.config.bake.manifest.helm.includeCRDs':
+    '<p>Include Custom Resource Definitions in the templated output.</p>',
   'pipeline.config.bake.manifest.kustomize.filePath': `
     <p>This is the relative path to the kustomization.yaml file within your Git repo.</p>
     <p>e.g.: <b>examples/wordpress/mysql/kustomization.yaml</b></p>`,
@@ -468,6 +470,8 @@ const helpContents: { [key: string]: string } = {
       Typing into this verification field is annoying! But it serves as a reminder that you are
       changing something in an account deemed important, and prevents you from accidentally changing something
       when you meant to click on the "Cancel" button.`,
+  'pipeline.skipDownstreamOutput':
+    'when checked, the output of the child pipeline is not added to the pipeline context',
   'pipeline.waitForCompletion':
     'if unchecked, marks the stage as successful right away without waiting for the pipeline to complete',
   'jenkins.waitForCompletion':

package/src/pipeline/config/graph/PipelineGraph.tsx

@@ -117,15 +117,22 @@ export class PipelineGraph extends React.Component<IPipelineGraphProps, IPipelin
     if (!node.children.length) {
       return node.phase;
     }
+    const checkedNodeIds = new Set<string | number>();
     const result: number[] = [];
-    this.collect(node.children, result);
+    this.collect(node.children, result, checkedNodeIds);
     return max(result);
   }
 
-  private collect(nodes: IPipelineGraphNode[], result: number[]) {
+  private collect(nodes: IPipelineGraphNode[], result: number[], checkedNodeIds: Set<string | number>) {
     nodes.forEach((node) => {
+      if (checkedNodeIds.has(node.id)) {
+        return;
+      } else {
+        checkedNodeIds.add(node.id);
+      }
+
       if (node.children.length) {
-        this.collect(node.children, result);
+        this.collect(node.children, result, checkedNodeIds);
       } else {
         result.push(node.phase);
       }

package/src/pipeline/config/stages/bake/bakeStage.module.js

@@ -3,6 +3,7 @@
 import { module } from 'angular';
 
 import { CORE_PIPELINE_CONFIG_STAGES_BAKE_BAKESTAGE } from './bakeStage';
+import { PIPELINE_BAKE_STAGE_CHOOSE_MANAGED_IMAGE } from './bakeStageChooseManagedImage.component';
 import { PIPELINE_BAKE_STAGE_CHOOSE_OS } from './bakeStageChooseOs.component';
 import { CORE_PIPELINE_CONFIG_STAGES_BAKE_MODAL_ADDEXTENDEDATTRIBUTE_CONTROLLER_MODAL } from './modal/addExtendedAttribute.controller.modal';
 
@@ -12,4 +13,5 @@ module(CORE_PIPELINE_CONFIG_STAGES_BAKE_BAKESTAGE_MODULE, [
   CORE_PIPELINE_CONFIG_STAGES_BAKE_BAKESTAGE,
   CORE_PIPELINE_CONFIG_STAGES_BAKE_MODAL_ADDEXTENDEDATTRIBUTE_CONTROLLER_MODAL,
   PIPELINE_BAKE_STAGE_CHOOSE_OS,
+  PIPELINE_BAKE_STAGE_CHOOSE_MANAGED_IMAGE,
 ]);

package/src/pipeline/config/stages/bake/bakeStageChooseManagedImage.component.html

@@ -0,0 +1,12 @@
+<ui-select ng-model="$ctrl.model" on-select="$ctrl.onChange()" class="form-control input-sm">
+  <ui-select-match placeholder="Select a Managed Image">
+    <span ng-bind-html="$ctrl.getManagedImageDescription($select.selected)"></span>
+  </ui-select-match>
+  <ui-select-choices
+    repeat="managedImageOption.id as managedImageOption in $ctrl.managedImageOptions | filter: $select.search"
+    ui-disable-choice="$ctrl.getManagedImageDisabled(managedImageOption)"
+  >
+    <strong ng-bind-html="$ctrl.getManagedImageDescription(managedImageOption)"></strong>
+    <div ng-bind-html="$ctrl.getManagedImageDetailedDescription(managedImageOption)"></div>
+  </ui-select-choices>
+</ui-select>

package/src/pipeline/config/stages/bake/bakeStageChooseManagedImage.component.ts

@@ -0,0 +1,49 @@
+import type { IComponentOptions, IController } from 'angular';
+import { module } from 'angular';
+import { SETTINGS } from '../../../../config/settings';
+
+export interface IManagedImageOption {
+  id: string;
+  name: string;
+  osType: string;
+}
+
+export class BakeStageChooseManagedImageController implements IController {
+  public model: any;
+  public managedImageOptions: IManagedImageOption[];
+  public onChange: () => any;
+
+  public $onChanges(): void {}
+
+  public getManagedImageDescription(managedImageOption: IManagedImageOption): string {
+    return managedImageOption?.name || '';
+  }
+
+  public getManagedImageDetailedDescription(managedImageOption: IManagedImageOption): string {
+    if (managedImageOption?.osType) {
+      return `${managedImageOption.name} (${managedImageOption.osType})`;
+    }
+    return `${managedImageOption.name}`;
+  }
+
+  public getManagedImageDisabled(managedImageOption: IManagedImageOption): boolean {
+    const disabledImages = SETTINGS.disabledImages || [];
+    return disabledImages.includes(managedImageOption.id);
+  }
+}
+
+const bakeStageChooseManagedImageComponent: IComponentOptions = {
+  bindings: {
+    managedImageOptions: '<',
+    model: '=',
+    onChange: '=',
+  },
+  controller: BakeStageChooseManagedImageController,
+  templateUrl: require('./bakeStageChooseManagedImage.component.html'),
+};
+
+export const PIPELINE_BAKE_STAGE_CHOOSE_MANAGED_IMAGE = 'spinnaker.core.pipeline.bake.chooseManagedImage.component';
+module(PIPELINE_BAKE_STAGE_CHOOSE_MANAGED_IMAGE, []).component(
+  'bakeStageChooseManagedImage',
+  bakeStageChooseManagedImageComponent,
+);

package/src/pipeline/config/stages/bake/bakeStageChooseOs.component.html

@@ -2,7 +2,6 @@
   ng-if="!$ctrl.showRadioButtons"
   ng-model="$ctrl.model"
   on-select="$ctrl.onChange()"
-  required
   class="form-control input-sm"
 >
   <ui-select-match placeholder="Select a base OS">

package/src/pipeline/config/stages/bakeManifest/helm/BakeHelmConfigForm.spec.tsx

@@ -129,4 +129,48 @@ describe('<BakeHelmConfigForm />', () => {
     expect(component.find('.Select-value-label > span').text().includes(expectedArtifactDisplayName)).toBe(true);
     expect(component.find(StageConfigField).findWhere((x) => x.text() === helmChartFilePathFieldName).length).toBe(1);
   });
+
+  it('render the include crds checkbox if the template render is HELM3', async () => {
+    const stage = ({
+      templateRenderer: 'HELM3',
+    } as unknown) as IStage;
+
+    const props = getProps();
+
+    const component = mount(
+      <SpinFormik
+        initialValues={stage}
+        onSubmit={() => null}
+        validate={() => null}
+        render={(formik) => <BakeHelmConfigForm {...props} formik={formik} />}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve)); // wait one js tick for promise to resolve
+    component.setProps({}); // force a re-render
+
+    expect(component.find('span.label-text').findWhere((x) => x.text() === 'Include CRDs').length).toBe(1);
+  });
+
+  it('does not render the include crds checkbox if the template render is HELM2', async () => {
+    const stage = ({
+      templateRenderer: 'HELM2',
+    } as unknown) as IStage;
+
+    const props = getProps();
+
+    const component = mount(
+      <SpinFormik
+        initialValues={stage}
+        onSubmit={() => null}
+        validate={() => null}
+        render={(formik) => <BakeHelmConfigForm {...props} formik={formik} />}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve)); // wait one js tick for promise to resolve
+    component.setProps({}); // force a re-render
+
+    expect(component.find('span.label-text').findWhere((x) => x.text() === 'Include CRDs').length).toBe(0);
+  });
 });

package/src/pipeline/config/stages/bakeManifest/helm/BakeHelmConfigForm.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 
 import type { IFormikStageConfigInjectedProps } from '../../FormikStageConfig';
+import { ManifestRenderers } from '../ManifestRenderers';
 import { AccountService } from '../../../../../account';
 import {
   ArtifactTypePatterns,
@@ -257,6 +258,19 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
             onChange={() => this.props.formik.setFieldValue('rawOverrides', !stage.rawOverrides)}
           />
         </StageConfigField>
+        {stage.templateRenderer === ManifestRenderers.HELM3 && (
+          <StageConfigField
+            fieldColumns={6}
+            helpKey={'pipeline.config.bake.manifest.helm.includeCRDs'}
+            label="Include CRDs"
+          >
+            <CheckboxInput
+              value={stage.includeCRDs}
+              text={''}
+              onChange={() => this.props.formik.setFieldValue('includeCRDs', !stage.includeCRDs)}
+            />
+          </StageConfigField>
+        )}
         <StageConfigField
           fieldColumns={6}
           helpKey={'pipeline.config.bake.manifest.overrideExpressionEvaluation'}

package/src/pipeline/config/stages/pipeline/pipelineStage.html

@@ -105,6 +105,9 @@
       </div>
     </div>
   </div>
+  <stage-config-field label="Skip downstream output" help-key="pipeline.skipDownstreamOutput">
+    <input type="checkbox" class="input-sm" name="skipDownstreamOutput" ng-model="stage.skipDownstreamOutput" />
+  </stage-config-field>
   <stage-config-field label="Wait for results" help-key="pipeline.waitForCompletion">
     <input type="checkbox" class="input-sm" name="waitForCompletion" ng-model="stage.waitForCompletion" />
   </stage-config-field>

package/src/pipeline/executions/execution/ExecutionMarker.tsx

@@ -95,18 +95,24 @@ export class ExecutionMarker extends React.Component<IExecutionMarkerProps, IExe
   public render() {
     const { stage, application, execution, active, previousStageActive, width } = this.props;
     let stageType = (stage.activeStageType || stage.type).toLowerCase(); // support groups
-    stage.stages.forEach((childStage: IStage) => {
-      if (childStage.type == 'pipeline') {
-        const childPipeline = application.executions.data.find((p: any) => p.id === childStage.context.executionId);
-        if (childPipeline != undefined) {
-          childPipeline.stages.forEach((stageToCheck: IStage) => {
-            if (stageToCheck.type == 'manualJudgment' && stageToCheck.status == 'RUNNING') {
-              stageType = 'manualjudgment';
-            }
-          });
+    if (SETTINGS.feature.manualJudgmentParentPipeline) {
+      stage.stages.forEach((childStage: IStage) => {
+        if (
+          childStage.type == 'pipeline' &&
+          application.executions != undefined &&
+          application.executions.data != undefined
+        ) {
+          const childPipeline = application.executions.data.find((p: any) => p.id === childStage.context.executionId);
+          if (childPipeline != undefined) {
+            childPipeline.stages.forEach((stageToCheck: IStage) => {
+              if (stageToCheck.type == 'manualJudgment' && stageToCheck.status == 'RUNNING') {
+                stageType = 'manualjudgment';
+              }
+            });
+          }
         }
-      }
-    });
+      });
+    }
     const pipelineStatus = this.stageStatus(stage.status.toLowerCase());
     const markerClassName = [
       stage.type !== 'group' ? 'clickable' : '',

package/src/serverGroup/configure/common/v2instanceArchetypeSelector.component.ts

@@ -22,6 +22,16 @@ class V2InstanceArchetypeSelectorController implements IComponentController {
     const { $scope } = this;
     this.instanceTypeService.getCategories(this.command.selectedProvider).then((categories) => {
       $scope.instanceProfiles = categories;
+      // Resetting the 'unavailable' properties to avoid caching initially.
+      categories.forEach((profile) => {
+        if (profile.type === this.command.viewState.instanceProfile) {
+          profile.families.forEach((family) => {
+            family.instanceTypes.forEach((instanceType) => {
+              instanceType.unavailable = false;
+            });
+          });
+        }
+      });
       if ($scope.instanceProfiles.length % 3 === 0) {
         $scope.columns = 3;
       }

package/src/widgets/accountNamespaceClusterSelector.component.js

@@ -25,74 +25,76 @@ module(CORE_WIDGETS_ACCOUNTNAMESPACECLUSTERSELECTOR_COMPONENT, []).directive(
       templateUrl: require('./accountNamespaceClusterSelector.component.html'),
       controllerAs: 'vm',
       controller: function controller() {
-        this.clusterField = this.clusterField || 'cluster';
+        this.$onInit = () => {
+          this.clusterField = this.clusterField || 'cluster';
 
-        const vm = this;
-        let isTextInputForClusterFiled;
+          const vm = this;
+          let isTextInputForClusterFiled;
 
-        let namespaces;
+          let namespaces;
 
-        const setNamespaceList = () => {
-          const accountFilter = (cluster) => (cluster ? cluster.account === vm.component.credentials : true);
-          // TODO(lwander): Move away from regions to namespaces here.
-          const namespaceList = AppListExtractor.getRegions([vm.application], accountFilter);
-          vm.namespaces = namespaceList.length ? namespaceList : namespaces;
-        };
+          const setNamespaceList = () => {
+            const accountFilter = (cluster) => (cluster ? cluster.account === vm.component.credentials : true);
+            // TODO(lwander): Move away from regions to namespaces here.
+            const namespaceList = AppListExtractor.getRegions([vm.application], accountFilter);
+            vm.namespaces = namespaceList.length ? namespaceList : namespaces;
+          };
 
-        const setClusterList = () => {
-          const namespaceField = vm.component.namespaces;
-          // TODO(lwander): Move away from regions to namespaces here.
-          const clusterFilter = AppListExtractor.clusterFilterForCredentialsAndRegion(
-            vm.component.credentials,
-            namespaceField,
-          );
-          vm.clusterList = AppListExtractor.getClusters([vm.application], clusterFilter);
-        };
+          const setClusterList = () => {
+            const namespaceField = vm.component.namespaces;
+            // TODO(lwander): Move away from regions to namespaces here.
+            const clusterFilter = AppListExtractor.clusterFilterForCredentialsAndRegion(
+              vm.component.credentials,
+              namespaceField,
+            );
+            vm.clusterList = AppListExtractor.getClusters([vm.application], clusterFilter);
+          };
 
-        vm.namespaceChanged = () => {
-          setClusterList();
-          if (!isTextInputForClusterFiled && !_.includes(vm.clusterList, vm.component[this.clusterField])) {
-            vm.component[this.clusterField] = undefined;
-          }
-        };
+          vm.namespaceChanged = () => {
+            setClusterList();
+            if (!isTextInputForClusterFiled && !_.includes(vm.clusterList, vm.component[this.clusterField])) {
+              vm.component[this.clusterField] = undefined;
+            }
+          };
 
-        const setToggledState = () => {
-          vm.namespaces = namespaces;
-          isTextInputForClusterFiled = true;
-        };
+          const setToggledState = () => {
+            vm.namespaces = namespaces;
+            isTextInputForClusterFiled = true;
+          };
 
-        const setUnToggledState = () => {
-          vm.component[this.clusterField] = undefined;
-          isTextInputForClusterFiled = false;
-          setNamespaceList();
-        };
+          const setUnToggledState = () => {
+            vm.component[this.clusterField] = undefined;
+            isTextInputForClusterFiled = false;
+            setNamespaceList();
+          };
 
-        vm.clusterSelectInputToggled = (isToggled) => {
-          isToggled ? setToggledState() : setUnToggledState();
-        };
+          vm.clusterSelectInputToggled = (isToggled) => {
+            isToggled ? setToggledState() : setUnToggledState();
+          };
 
-        vm.accountUpdated = () => {
-          vm.component[this.clusterField] = undefined;
-          setNamespaceList();
-          setClusterList();
-        };
+          vm.accountUpdated = () => {
+            vm.component[this.clusterField] = undefined;
+            setNamespaceList();
+            setClusterList();
+          };
 
-        const init = () => {
-          AccountService.getUniqueAttributeForAllAccounts(vm.component.cloudProviderType, 'namespaces')
-            .then((allNamespaces) => {
-              namespaces = allNamespaces;
-              return allNamespaces;
-            })
-            .then((allNamespaces) => {
-              setNamespaceList();
-              setClusterList();
-              vm.namespaces = _.includes(vm.clusterList, vm.component[this.clusterField])
-                ? vm.namespaces
-                : allNamespaces;
-            });
-        };
+          const init = () => {
+            AccountService.getUniqueAttributeForAllAccounts(vm.component.cloudProviderType, 'namespaces')
+              .then((allNamespaces) => {
+                namespaces = allNamespaces;
+                return allNamespaces;
+              })
+              .then((allNamespaces) => {
+                setNamespaceList();
+                setClusterList();
+                vm.namespaces = _.includes(vm.clusterList, vm.component[this.clusterField])
+                  ? vm.namespaces
+                  : allNamespaces;
+              });
+          };
 
-        init();
+          init();
+        };
       },
     };
   },