@spinnaker/kubernetes 0.3.1 → 0.4.0

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

@@ -16,13 +16,17 @@ export interface IManifestDeploymentOptionsProps {
     config: ITrafficManagementConfig;
     onConfigChange: (config: ITrafficManagementConfig) => void;
     selectedAccount: string;
+    isDeploymentKind: boolean;
 }
 export interface IManifestDeploymentOptionsState {
     services: string[];
+    showRedBlackWarningMessage: boolean;
+    showBlueGreenDeploymentWarningMessage: boolean;
 }
 export declare class ManifestDeploymentOptions extends React.Component<IManifestDeploymentOptionsProps, IManifestDeploymentOptionsState> {
     state: IManifestDeploymentOptionsState;
     private onConfigChange;
+    private updateProps;
     private fetchServices;
     private getServiceOptions;
     private strategyOptionRenderer;

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,7 +1,7 @@
 {
   "name": "@spinnaker/kubernetes",
   "license": "Apache-2.0",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,7 +13,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.22.1",
+    "@spinnaker/core": "^0.23.0",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/react": "1.0.7",
     "angular": "1.6.10",
@@ -50,5 +50,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "e6411725682850767e058ddb5d1cab16c246905a"
+  "gitHead": "4d61e53884040e8cae45d29b398c88e3814c6aca"
 }

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

@@ -192,6 +192,7 @@ export class DeployManifestStageForm extends React.Component<
           config={stage.trafficManagement}
           onConfigChange={(config) => this.props.formik.setFieldValue('trafficManagement', config)}
           selectedAccount={stage.account}
+          isDeploymentKind={this.state.rawManifest.includes('kind: Deployment')}
         />
       </div>
     );

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

@@ -17,6 +17,7 @@ describe('<ManifestDeploymentOptions />', () => {
       config: defaultTrafficManagementConfig,
       onConfigChange: onConfigChangeSpy,
       selectedAccount: null,
+      isDeploymentKind: null,
     };
     wrapper = shallow(<ManifestDeploymentOptions {...props} />);
   });
@@ -49,5 +50,41 @@ 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);
+    });
+
+    it('strategy bluegreen with deployment kind should display warning label', () => {
+      props.config.options.strategy = 'bluegreen';
+      props.isDeploymentKind = true;
+      wrapper = shallow(<ManifestDeploymentOptions {...props} />);
+      expect(wrapper.find('p[id="blueGreenWarning"]').exists()).toEqual(true);
+    });
+
+    it('strategy bluegreen with replicaSet kind should not display warning label', () => {
+      props.config.options.strategy = 'bluegreen';
+      props.isDeploymentKind = false;
+      wrapper = shallow(<ManifestDeploymentOptions {...props} />);
+      expect(wrapper.find('p[id="blueGreenWarning"]').exists()).toEqual(false);
+    });
   });
 });

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

@@ -37,23 +37,42 @@ export interface IManifestDeploymentOptionsProps {
   config: ITrafficManagementConfig;
   onConfigChange: (config: ITrafficManagementConfig) => void;
   selectedAccount: string;
+  isDeploymentKind: boolean;
 }
 
 export interface IManifestDeploymentOptionsState {
   services: string[];
+  showRedBlackWarningMessage: boolean;
+  showBlueGreenDeploymentWarningMessage: boolean;
 }
 
 export class ManifestDeploymentOptions extends React.Component<
   IManifestDeploymentOptionsProps,
   IManifestDeploymentOptionsState
 > {
-  public state: IManifestDeploymentOptionsState = { services: [] };
+  public state: IManifestDeploymentOptionsState = {
+    services: [],
+    showRedBlackWarningMessage: false,
+    showBlueGreenDeploymentWarningMessage: false,
+  };
 
   private onConfigChange = (key: string, value: any): void => {
+    this.setState({ showRedBlackWarningMessage: false });
+    if (value === 'redblack') {
+      value = 'bluegreen';
+      this.setState({ showRedBlackWarningMessage: true });
+    }
+    if (value === 'bluegreen' && this.props.isDeploymentKind) {
+      this.setState({ showBlueGreenDeploymentWarningMessage: 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 +112,36 @@ export class ManifestDeploymentOptions extends React.Component<
 
   public componentDidMount() {
     this.fetchServices();
+    this.setState({ showRedBlackWarningMessage: false });
+    this.setState({ showBlueGreenDeploymentWarningMessage: false });
+    if (this.props.config.options.strategy === 'redblack') {
+      this.setState({ showRedBlackWarningMessage: true });
+      this.updateProps('options.strategy', 'bluegreen');
+    }
+    if (this.props.config.options.strategy === 'bluegreen' && this.props.isDeploymentKind) {
+      this.setState({ showBlueGreenDeploymentWarningMessage: true });
+    }
   }
 
   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;
+    const { showBlueGreenDeploymentWarningMessage } = this.state;
     return (
       <>
         <h4>Rollout Strategy Options</h4>
@@ -162,6 +192,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 +202,17 @@ 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>
+              )}
+              {showBlueGreenDeploymentWarningMessage && (
+                <p id={'blueGreenWarning'} style={{ color: 'orange' }}>
+                  Warning: Blue/Green strategy may cause downtime for Deployment kind!
+                </p>
+              )}
             </StageConfigField>
           </>
         )}

package/src/pipelines/stages/traffic/ManifestTrafficStageConfig.tsx

@@ -36,7 +36,7 @@ export class ManifestTrafficStageConfig extends React.Component<IKubernetesManif
           selector={selector}
           modes={[SelectorMode.Static, SelectorMode.Dynamic]}
           onChange={this.onChange}
-          includeSpinnakerKinds={['serverGroups']}
+          includeSpinnakerKinds={['serverGroups', 'serverGroupManagers']}
         />
       </div>
     );

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',
 };