@spinnaker/kubernetes 0.3.2 → 0.5.2

package/dist/pipelines/stages/deployManifest/ManifestDeploymentOptions.d.ts

@@ -19,10 +19,12 @@ export interface IManifestDeploymentOptionsProps {
 }
 export interface IManifestDeploymentOptionsState {
     services: string[];
+    showRedBlackWarningMessage: boolean;
 }
 export declare class ManifestDeploymentOptions extends React.Component<IManifestDeploymentOptionsProps, IManifestDeploymentOptionsState> {
     state: IManifestDeploymentOptionsState;
     private onConfigChange;
+    private updateProps;
     private fetchServices;
     private getServiceOptions;
     private strategyOptionRenderer;

package/dist/pipelines/stages/index.d.ts

@@ -1,4 +1,5 @@
 export * from './deleteManifest/deleteManifestStage';
 export * from './deployManifest/deployManifestStage';
 export * from './patchManifest/patchManifestStage';
+export * from './rolloutRestartManifest/rolloutRestartManifestStage';
 export * from './runJob/runJobStage';

package/dist/pipelines/stages/rolloutRestartManifest/RolloutRestartManifestStageConfig.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import type { Application, IStage, IStageConfigProps } from '@spinnaker/core';
+import type { IManifestSelector } from '../../../manifest/selector/IManifestSelector';
+export interface IKubernetesManifestStageConfigProps extends IStageConfigProps {
+    application: Application;
+    stage: IManifestSelector & IStage;
+    stageFieldUpdated: () => void;
+}
+export declare class RolloutRestartManifestStageConfig extends React.Component<IKubernetesManifestStageConfigProps> {
+    componentDidMount: () => void;
+    private onChange;
+    render(): JSX.Element;
+}

package/dist/pipelines/stages/rolloutRestartManifest/rolloutRestartManifestStage.d.ts

@@ -0,0 +1,4 @@
+import { DeployStatus } from '../deployManifest/manifestStatus/DeployStatus';
+export declare class RolloutRestartStatus extends DeployStatus {
+    static title: string;
+}

package/dist/rolloutStrategy/bluegreen.strategy.d.ts

@@ -0,0 +1,2 @@
+import type { IDeploymentStrategy } from '@spinnaker/core';
+export declare const strategyBlueGreen: IDeploymentStrategy;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@spinnaker/kubernetes",
   "license": "Apache-2.0",
-  "version": "0.3.2",
+  "version": "0.5.2",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "clean": "shx rm -rf dist",
     "prepublishOnly": "npm run build",
@@ -13,7 +16,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.22.2",
+    "@spinnaker/core": "^0.27.0",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/react": "1.0.7",
     "angular": "1.6.10",
@@ -35,8 +38,8 @@
     "rxjs": "6.6.7"
   },
   "devDependencies": {
-    "@spinnaker/eslint-plugin": "^3.0.1",
-    "@spinnaker/scripts": "^0.3.0",
+    "@spinnaker/eslint-plugin": "^3.0.2",
+    "@spinnaker/scripts": "^0.3.1",
     "@types/angular": "1.6.26",
     "@types/angular-ui-bootstrap": "0.13.41",
     "@types/dompurify": "^2.3.3",
@@ -50,5 +53,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "587b5a7a5fe2121cd93bed86e5e83795ee401be0"
+  "gitHead": "217b75396c5ec25d9b2019a849593b0b8d52e916"
 }

package/src/pipelines/stages/deployManifest/ManifestDeploymentOptions.spec.tsx

@@ -49,5 +49,27 @@ describe('<ManifestDeploymentOptions />', () => {
       wrapper = shallow(<ManifestDeploymentOptions {...props} />);
       expect(wrapper.find('input[type="checkbox"]').at(1).props().disabled).toEqual(true);
     });
+    it('disables the traffic checkbox when blue/green rollout strategy is selected', () => {
+      props.config.options.strategy = 'bluegreen';
+      wrapper = shallow(<ManifestDeploymentOptions {...props} />);
+      expect(wrapper.find('input[type="checkbox"]').at(1).props().disabled).toEqual(true);
+    });
+
+    it('strategy bluegreen should not display warning label', () => {
+      props.config.options.strategy = 'bluegreen';
+      wrapper = shallow(<ManifestDeploymentOptions {...props} />);
+      expect(wrapper.find('p[id="redBlackWarning"]').exists()).toEqual(false);
+    });
+    it('strategy highlander should not display warning label', () => {
+      props.config.options.strategy = 'highlander';
+      wrapper = shallow(<ManifestDeploymentOptions {...props} />);
+      expect(wrapper.find('p[id="redBlackWarning"]').exists()).toEqual(false);
+    });
+
+    it('strategy redblack should display warning label', () => {
+      props.config.options.strategy = 'redblack';
+      wrapper = shallow(<ManifestDeploymentOptions {...props} />);
+      expect(wrapper.find('p[id="redBlackWarning"]').exists()).toEqual(true);
+    });
   });
 });

package/src/pipelines/stages/deployManifest/ManifestDeploymentOptions.tsx

@@ -41,19 +41,29 @@ export interface IManifestDeploymentOptionsProps {
 
 export interface IManifestDeploymentOptionsState {
   services: string[];
+  showRedBlackWarningMessage: boolean;
 }
 
 export class ManifestDeploymentOptions extends React.Component<
   IManifestDeploymentOptionsProps,
   IManifestDeploymentOptionsState
 > {
-  public state: IManifestDeploymentOptionsState = { services: [] };
+  public state: IManifestDeploymentOptionsState = { services: [], showRedBlackWarningMessage: false };
 
   private onConfigChange = (key: string, value: any): void => {
+    this.setState({ showRedBlackWarningMessage: false });
+    if (value === 'redblack') {
+      value = 'bluegreen';
+      this.setState({ showRedBlackWarningMessage: true });
+    }
+    this.updateProps(key, value);
+  };
+
+  private updateProps(key: string, value: any) {
     const updatedConfig = cloneDeep(this.props.config);
     set(updatedConfig, key, value);
     this.props.onConfigChange(updatedConfig);
-  };
+  }
 
   private fetchServices = (): void => {
     const namespace = this.props.config.options.namespace;
@@ -93,25 +103,31 @@ export class ManifestDeploymentOptions extends React.Component<
 
   public componentDidMount() {
     this.fetchServices();
+    this.setState({ showRedBlackWarningMessage: false });
+    if (this.props.config.options.strategy === 'redblack') {
+      this.setState({ showRedBlackWarningMessage: true });
+      this.updateProps('options.strategy', 'bluegreen');
+    }
   }
 
   public componentDidUpdate(prevProps: IManifestDeploymentOptionsProps) {
     if (prevProps.selectedAccount !== this.props.selectedAccount) {
-      this.onConfigChange('options.namespace', null);
+      this.updateProps('options.namespace', null);
     }
 
     if (prevProps.config.options.namespace !== this.props.config.options.namespace) {
-      this.onConfigChange('options.services', null);
+      this.updateProps('options.services', null);
       this.fetchServices();
     }
 
     if (!this.props.config.options.enableTraffic && !!this.props.config.options.strategy) {
-      this.onConfigChange('options.enableTraffic', true);
+      this.updateProps('options.enableTraffic', true);
     }
   }
 
   public render() {
     const { config } = this.props;
+    const { showRedBlackWarningMessage } = this.state;
     return (
       <>
         <h4>Rollout Strategy Options</h4>
@@ -162,6 +178,7 @@ export class ManifestDeploymentOptions extends React.Component<
             </StageConfigField>
             <StageConfigField fieldColumns={8} helpKey="kubernetes.manifest.rolloutStrategy" label="Strategy">
               <Select
+                id={'strategyDropdown'}
                 clearable={false}
                 onChange={(option: Option<IDeploymentStrategy>) => this.onConfigChange('options.strategy', option.key)}
                 options={rolloutStrategies}
@@ -171,6 +188,12 @@ export class ManifestDeploymentOptions extends React.Component<
                 valueKey="key"
                 valueRenderer={(o) => <>{o.label}</>}
               />
+              {showRedBlackWarningMessage && (
+                <p id={'redBlackWarning'} style={{ color: 'orange' }}>
+                  Warning: Red/black strategy is deprecated and will be removed soon. We automatically selected
+                  blue/green instead!
+                </p>
+              )}
             </StageConfigField>
           </>
         )}

package/src/pipelines/stages/index.ts

@@ -1,4 +1,5 @@
 export * from './deleteManifest/deleteManifestStage';
 export * from './deployManifest/deployManifestStage';
 export * from './patchManifest/patchManifestStage';
+export * from './rolloutRestartManifest/rolloutRestartManifestStage';
 export * from './runJob/runJobStage';

package/src/pipelines/stages/rolloutRestartManifest/RolloutRestartManifestStageConfig.tsx

@@ -0,0 +1,46 @@
+import { defaults } from 'lodash';
+import React from 'react';
+
+import type { Application, IStage, IStageConfigProps } from '@spinnaker/core';
+
+import type { IManifestSelector } from '../../../manifest/selector/IManifestSelector';
+import { SelectorMode } from '../../../manifest/selector/IManifestSelector';
+import { ManifestSelector } from '../../../manifest/selector/ManifestSelector';
+
+export interface IKubernetesManifestStageConfigProps extends IStageConfigProps {
+  application: Application;
+  stage: IManifestSelector & IStage;
+  stageFieldUpdated: () => void;
+}
+
+export class RolloutRestartManifestStageConfig extends React.Component<IKubernetesManifestStageConfigProps> {
+  public componentDidMount = (): void => {
+    defaults(this.props.stage, {
+      app: this.props.application.name,
+      cloudProvider: 'kubernetes',
+    });
+    this.props.stageFieldUpdated();
+  };
+
+  private onChange = (stage: IManifestSelector): void => {
+    Object.assign(this.props.stage, stage);
+    this.props.stageFieldUpdated();
+  };
+
+  public render() {
+    const selector = { ...this.props.stage };
+    return (
+      <div className="form-horizontal">
+        <h4>Manifest</h4>
+        <div className="horizontal-rule" />
+        <ManifestSelector
+          application={this.props.application}
+          selector={selector}
+          modes={[SelectorMode.Static, SelectorMode.Dynamic, SelectorMode.Label]}
+          onChange={this.onChange}
+          includeSpinnakerKinds={null}
+        />
+      </div>
+    );
+  }
+}

package/src/pipelines/stages/rolloutRestartManifest/rolloutRestartManifestStage.ts

@@ -0,0 +1,20 @@
+import { ExecutionDetailsTasks, Registry } from '@spinnaker/core';
+
+import { RolloutRestartManifestStageConfig } from './RolloutRestartManifestStageConfig';
+import { DeployStatus } from '../deployManifest/manifestStatus/DeployStatus';
+import { manifestSelectorValidators } from '../validators/manifestSelectorValidators';
+
+export class RolloutRestartStatus extends DeployStatus {
+  public static title = 'RolloutRestartStatus';
+}
+
+const STAGE_NAME = 'Rollout Restart (Manifest)';
+Registry.pipeline.registerStage({
+  label: STAGE_NAME,
+  description: 'Perform a rolling restart of a manifest.',
+  key: 'rollingRestartManifest',
+  cloudProvider: 'kubernetes',
+  component: RolloutRestartManifestStageConfig,
+  executionDetailsSections: [RolloutRestartStatus, ExecutionDetailsTasks],
+  validators: manifestSelectorValidators(STAGE_NAME),
+});

package/src/rolloutStrategy/bluegreen.strategy.ts

@@ -0,0 +1,7 @@
+import type { IDeploymentStrategy } from '@spinnaker/core';
+
+export const strategyBlueGreen: IDeploymentStrategy = {
+  label: 'Blue/Green',
+  description: 'Disables <i>all</i> previous ReplicaSets in the cluster as soon as the new ReplicaSet is ready',
+  key: 'bluegreen',
+};

package/src/rolloutStrategy/index.ts

@@ -1,5 +1,6 @@
+import { strategyBlueGreen } from './bluegreen.strategy';
 import { strategyHighlander } from './highlander.strategy';
 import { strategyNone } from './none.strategy';
 import { strategyRedBlack } from './redblack.strategy';
 
-export const rolloutStrategies = [strategyNone, strategyRedBlack, strategyHighlander];
+export const rolloutStrategies = [strategyNone, strategyRedBlack, strategyHighlander, strategyBlueGreen];

package/src/rolloutStrategy/redblack.strategy.ts

@@ -1,7 +1,7 @@
 import type { IDeploymentStrategy } from '@spinnaker/core';
 
 export const strategyRedBlack: IDeploymentStrategy = {
-  label: 'Red/Black',
+  label: 'Red/Black (Deprecated)',
   description: 'Disables <i>all</i> previous ReplicaSets in the cluster as soon as the new ReplicaSet is ready',
   key: 'redblack',
 };