@spinnaker/kubernetes 0.4.0 → 0.6.0

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

@@ -16,12 +16,10 @@ 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;

package/dist/pipelines/stages/deployManifest/manifestStatus/DeployStatus.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { IExecutionDetailsSectionProps, IManifest } from '@spinnaker/core';
+import './DeployStatus.less';
 export interface IManifestSubscription {
     id: string;
     unsubscribe: () => void;

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/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@spinnaker/kubernetes",
   "license": "Apache-2.0",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "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.23.0",
+    "@spinnaker/core": "^0.28.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.4.0",
     "@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": "4d61e53884040e8cae45d29b398c88e3814c6aca"
+  "gitHead": "20d6ca89f39a5f44a802a1ccaffd669587450d76"
 }

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

@@ -192,7 +192,6 @@ 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,7 +17,6 @@ describe('<ManifestDeploymentOptions />', () => {
       config: defaultTrafficManagementConfig,
       onConfigChange: onConfigChangeSpy,
       selectedAccount: null,
-      isDeploymentKind: null,
     };
     wrapper = shallow(<ManifestDeploymentOptions {...props} />);
   });
@@ -72,19 +71,5 @@ describe('<ManifestDeploymentOptions />', () => {
       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,24 +37,18 @@ 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: [],
-    showRedBlackWarningMessage: false,
-    showBlueGreenDeploymentWarningMessage: false,
-  };
+  public state: IManifestDeploymentOptionsState = { services: [], showRedBlackWarningMessage: false };
 
   private onConfigChange = (key: string, value: any): void => {
     this.setState({ showRedBlackWarningMessage: false });
@@ -62,9 +56,6 @@ export class ManifestDeploymentOptions extends React.Component<
       value = 'bluegreen';
       this.setState({ showRedBlackWarningMessage: true });
     }
-    if (value === 'bluegreen' && this.props.isDeploymentKind) {
-      this.setState({ showBlueGreenDeploymentWarningMessage: true });
-    }
     this.updateProps(key, value);
   };
 
@@ -113,14 +104,10 @@ 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) {
@@ -141,7 +128,6 @@ export class ManifestDeploymentOptions extends React.Component<
   public render() {
     const { config } = this.props;
     const { showRedBlackWarningMessage } = this.state;
-    const { showBlueGreenDeploymentWarningMessage } = this.state;
     return (
       <>
         <h4>Rollout Strategy Options</h4>
@@ -208,11 +194,6 @@ export class ManifestDeploymentOptions extends React.Component<
                   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/deployManifest/manifestStatus/DeployStatus.less

@@ -0,0 +1,11 @@
+.deploy-status .collapsible-element {
+  margin-bottom: 20px;
+
+  .alert {
+    margin-bottom: 0;
+  }
+
+  .content {
+    padding: 0;
+  }
+}

package/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx

@@ -2,12 +2,14 @@ import { get } from 'lodash';
 import React from 'react';
 
 import type { IExecutionDetailsSectionProps, IManifest } from '@spinnaker/core';
-import { ExecutionDetailsSection, StageFailureMessage } from '@spinnaker/core';
+import { CollapsibleElement, ExecutionDetailsSection, SETTINGS, StageFailureMessage } from '@spinnaker/core';
 
 import { ManifestStatus } from './ManifestStatus';
 import type { IStageManifest } from '../../../../manifest/manifest.service';
 import { KubernetesManifestService } from '../../../../manifest/manifest.service';
 
+import './DeployStatus.less';
+
 export interface IManifestSubscription {
   id: string;
   unsubscribe: () => void;
@@ -87,22 +89,32 @@ export class DeployStatus extends React.Component<IExecutionDetailsSectionProps,
     const { name: sectionName, current: currentSection, stage } = this.props;
     const manifests: IManifest[] = this.state.subscriptions.filter((sub) => !!sub.manifest).map((sub) => sub.manifest);
     return (
-      <ExecutionDetailsSection name={sectionName} current={currentSection}>
-        <StageFailureMessage stage={stage} message={stage.failureMessage} />
-        {manifests && (
-          <div className="row">
-            <div className="col-md-12">
-              <div className="well alert alert-info">
-                {manifests.map((manifest) => {
-                  const uid =
-                    manifest.manifest.metadata.uid || KubernetesManifestService.manifestIdentifier(manifest.manifest);
-                  return <ManifestStatus key={uid} manifest={manifest} account={stage.context.account} />;
-                })}
+      <div className="deploy-status">
+        <ExecutionDetailsSection name={sectionName} current={currentSection}>
+          {SETTINGS.feature.multiBlockFailureMessages ? (
+            stage.failureMessages.map((failureMessage) => (
+              <CollapsibleElement key={failureMessage} maxHeight={150}>
+                <StageFailureMessage stage={stage} message={failureMessage} />
+              </CollapsibleElement>
+            ))
+          ) : (
+            <StageFailureMessage stage={stage} message={stage.failureMessage} />
+          )}
+          {!!manifests?.length && (
+            <div className="row">
+              <div className="col-md-12">
+                <div className="well alert alert-info">
+                  {manifests.map((manifest) => {
+                    const uid =
+                      manifest.manifest.metadata.uid || KubernetesManifestService.manifestIdentifier(manifest.manifest);
+                    return <ManifestStatus key={uid} manifest={manifest} account={stage.context.account} />;
+                  })}
+                </div>
               </div>
             </div>
-          </div>
-        )}
-      </ExecutionDetailsSection>
+          )}
+        </ExecutionDetailsSection>
+      </div>
     );
   }
 }

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/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', 'serverGroupManagers']}
+          includeSpinnakerKinds={['serverGroups']}
         />
       </div>
     );