@spinnaker/kubernetes 2026.2.2 → 2026.3.0

package/src/manifest/manifestCommandBuilder.service.ts

@@ -1,6 +1,5 @@
 import { load } from 'js-yaml';
 import { cloneDeep, has } from 'lodash';
-import { $q } from 'ngimport';
 
 import type { Application, IAccountDetails, IArtifactAccount, IMoniker } from '@spinnaker/core';
 import { AccountService } from '@spinnaker/core';
@@ -60,67 +59,54 @@ export class KubernetesManifestCommandBuilder {
     sourceManifest?: any,
     sourceMoniker?: IMoniker,
     sourceAccount?: string,
-  ): PromiseLike<IKubernetesManifestCommandData> {
+  ): Promise<IKubernetesManifestCommandData> {
     if (sourceManifest != null && has(sourceManifest, ['metadata', 'annotations', LAST_APPLIED_CONFIGURATION])) {
       sourceManifest = load(sourceManifest.metadata.annotations[LAST_APPLIED_CONFIGURATION]);
     }
 
-    const dataToFetch = {
-      accounts: AccountService.getAllAccountDetailsForProvider('kubernetes'),
-      artifactAccounts: AccountService.getArtifactAccounts(),
-    };
-
-    // TODO(dpeach): if no callers of this method are Angular controllers,
-    // $q.all may be safely replaced with Promise.all.
-    return $q
-      .all(dataToFetch)
-      .then((backingData: { accounts: IAccountDetails[]; artifactAccounts: IArtifactAccount[] }) => {
-        const { accounts, artifactAccounts } = backingData;
-
-        const account = accounts.some((a) => a.name === sourceAccount)
-          ? accounts.find((a) => a.name === sourceAccount).name
-          : accounts.length
-          ? accounts[0].name
-          : null;
-
-        let manifestArtifactAccount: string = null;
-        const [artifactAccountData] = artifactAccounts;
-        if (artifactAccountData) {
-          manifestArtifactAccount = artifactAccountData.name;
-        }
-
-        const cloudProvider = 'kubernetes';
-        const moniker = sourceMoniker || {
-          app: app.name,
-        };
-
-        const relationships = {
-          loadBalancers: [] as string[],
-          securityGroups: [] as string[],
-        };
-
-        const versioned: any = null;
-
-        return {
-          command: {
-            cloudProvider,
-            manifest: null,
-            manifests: Array.isArray(sourceManifest)
-              ? sourceManifest
-              : sourceManifest != null
-              ? [sourceManifest]
-              : null,
-            relationships,
-            moniker,
-            account,
-            versioned,
-            manifestArtifactAccount,
-            source: ManifestSource.TEXT,
-          },
-          metadata: {
-            backingData,
-          },
-        } as IKubernetesManifestCommandData;
-      });
+    return Promise.all([
+      AccountService.getAllAccountDetailsForProvider('kubernetes'),
+      AccountService.getArtifactAccounts(),
+    ]).then(([accounts, artifactAccounts]: [IAccountDetails[], IArtifactAccount[]]) => {
+      const backingData = { accounts, artifactAccounts };
+
+      const sourceAccountDetails = accounts.find((a) => a.name === sourceAccount);
+      const account = sourceAccountDetails ? sourceAccountDetails.name : accounts.length ? accounts[0].name : null;
+
+      let manifestArtifactAccount: string = null;
+      const [artifactAccountData] = artifactAccounts;
+      if (artifactAccountData) {
+        manifestArtifactAccount = artifactAccountData.name;
+      }
+
+      const cloudProvider = 'kubernetes';
+      const moniker = sourceMoniker || {
+        app: app.name,
+      };
+
+      const relationships = {
+        loadBalancers: [] as string[],
+        securityGroups: [] as string[],
+      };
+
+      const versioned: any = null;
+
+      return {
+        command: {
+          cloudProvider,
+          manifest: null,
+          manifests: Array.isArray(sourceManifest) ? sourceManifest : sourceManifest != null ? [sourceManifest] : null,
+          relationships,
+          moniker,
+          account,
+          versioned,
+          manifestArtifactAccount,
+          source: ManifestSource.TEXT,
+        },
+        metadata: {
+          backingData,
+        },
+      } as IKubernetesManifestCommandData;
+    });
   }
 }

package/src/manifest/rollout/PauseRollout.tsx

@@ -1,10 +1,8 @@
-import { module } from 'angular';
 import React from 'react';
 import { MenuItem } from 'react-bootstrap';
-import { react2angular } from 'react2angular';
 
 import type { Application } from '@spinnaker/core';
-import { ConfirmationModalService, ManifestWriter, robotToHuman, withErrorBoundary } from '@spinnaker/core';
+import { ConfirmationModalService, ManifestWriter, robotToHuman } from '@spinnaker/core';
 
 import type { IAnyKubernetesResource } from '../../interfaces';
 
@@ -38,9 +36,3 @@ export function PauseRollout({ application, resource }: IPauseRolloutProps) {
   };
   return <MenuItem onClick={handleClick}>Pause Rollout</MenuItem>;
 }
-
-export const KUBERNETES_PAUSE_ROLLOUT = 'spinnaker.kubernetes.pause.rollout';
-module(KUBERNETES_PAUSE_ROLLOUT, []).component(
-  'kubernetesPauseRollout',
-  react2angular(withErrorBoundary(PauseRollout, 'kubernetesPauseRollout'), ['application', 'resource']),
-);

package/src/manifest/rollout/ResumeRollout.tsx

@@ -1,10 +1,8 @@
-import { module } from 'angular';
 import React from 'react';
 import { MenuItem } from 'react-bootstrap';
-import { react2angular } from 'react2angular';
 
 import type { Application } from '@spinnaker/core';
-import { ConfirmationModalService, ManifestWriter, robotToHuman, withErrorBoundary } from '@spinnaker/core';
+import { ConfirmationModalService, ManifestWriter, robotToHuman } from '@spinnaker/core';
 
 import type { IAnyKubernetesResource } from '../../interfaces';
 
@@ -27,7 +25,7 @@ export function ResumeRollout({ application, resource }: IResumeRolloutProps) {
           account: resource.account,
           reason: params.reason,
         };
-        return ManifestWriter.pauseRolloutManifest(payload, application);
+        return ManifestWriter.resumeRolloutManifest(payload, application);
       },
       taskMonitorConfig: {
         application,
@@ -38,9 +36,3 @@ export function ResumeRollout({ application, resource }: IResumeRolloutProps) {
   };
   return <MenuItem onClick={handleClick}>Resume Rollout</MenuItem>;
 }
-
-export const KUBERNETES_RESUME_ROLLOUT = 'spinnaker.kubernetes.resume.rollout';
-module(KUBERNETES_RESUME_ROLLOUT, []).component(
-  'kubernetesResumeRollout',
-  react2angular(withErrorBoundary(ResumeRollout, 'kubernetesResumeRollout'), ['application', 'resource']),
-);

package/src/manifest/rollout/RollingRestart.tsx

@@ -1,16 +1,15 @@
-import { module } from 'angular';
 import React from 'react';
 import { MenuItem } from 'react-bootstrap';
-import { react2angular } from 'react2angular';
 
 import type { Application } from '@spinnaker/core';
-import { ConfirmationModalService, ManifestWriter, withErrorBoundary } from '@spinnaker/core';
+import { ConfirmationModalService, ManifestWriter } from '@spinnaker/core';
 
-import type { IKubernetesServerGroupManager } from '../../interfaces';
+import type { IKubernetesServerGroup, IKubernetesServerGroupManager } from '../../interfaces';
 
 interface IRollingRestartProps {
   application: Application;
-  serverGroupManager: IKubernetesServerGroupManager;
+  serverGroupManager?: IKubernetesServerGroupManager;
+  serverGroup?: IKubernetesServerGroup;
 }
 
 interface IRollingRestartParameters {
@@ -21,34 +20,29 @@ interface IRollingRestartParameters {
   reason?: string;
 }
 
-export function RollingRestart({ application, serverGroupManager }: IRollingRestartProps) {
+export function RollingRestart({ application, serverGroupManager, serverGroup }: IRollingRestartProps) {
   function rollingRestart() {
+    const rollingRestartParameters: IRollingRestartParameters = {
+      account: serverGroupManager?.account || serverGroup?.account,
+      cloudProvider: 'kubernetes',
+      location: serverGroupManager?.namespace || serverGroup?.namespace,
+      manifestName: serverGroupManager?.name || serverGroup?.name,
+    };
+
     ConfirmationModalService.confirm({
-      account: serverGroupManager.account,
+      account: rollingRestartParameters.account,
       askForReason: true,
-      header: `Initiate rolling restart of ${serverGroupManager.name}`,
+      header: `Initiate rolling restart of ${rollingRestartParameters.manifestName}`,
       submitMethod: (params: { reason?: string }) => {
-        const rollingRestartParameters: IRollingRestartParameters = {
-          account: serverGroupManager.account,
-          cloudProvider: 'kubernetes',
-          location: serverGroupManager.namespace,
-          manifestName: serverGroupManager.name,
-          reason: params.reason,
-        };
+        rollingRestartParameters.reason = params.reason;
         return ManifestWriter.rollingRestartManifest(rollingRestartParameters, application);
       },
       taskMonitorConfig: {
         application,
-        title: `Rolling restart of ${serverGroupManager.name}`,
+        title: `Rolling restart of ${rollingRestartParameters.manifestName} in ${rollingRestartParameters.account}`,
         onTaskComplete: () => application.serverGroups.refresh(true),
       },
     });
   }
   return <MenuItem onClick={rollingRestart}>Rolling Restart</MenuItem>;
 }
-
-export const KUBERNETES_ROLLING_RESTART = 'spinnaker.kubernetes.v2.rolling.restart';
-module(KUBERNETES_ROLLING_RESTART, []).component(
-  'kubernetesRollingRestart',
-  react2angular(withErrorBoundary(RollingRestart, 'kubernetesRollingRestart'), ['application', 'serverGroupManager']),
-);

package/src/manifest/rollout/UndoRollout.tsx

@@ -1,10 +1,7 @@
-import { module } from 'angular';
 import React from 'react';
 import { MenuItem } from 'react-bootstrap';
-import { react2angular } from 'react2angular';
 
 import type { Application } from '@spinnaker/core';
-import { withErrorBoundary } from '@spinnaker/core';
 import { useModal } from '@spinnaker/core';
 
 import { UndoRolloutModal } from './UndoRolloutModal';
@@ -20,14 +17,8 @@ export function UndoRollout(props: IUndoRolloutProps) {
   const handleClick = () => show();
   return (
     <>
-      <MenuItem onClick={handleClick}>Undo Rolloutaaaa</MenuItem>
+      <MenuItem onClick={handleClick}>Undo Rollout</MenuItem>
       <UndoRolloutModal isOpen={open} dismissModal={close} {...props} />
     </>
   );
 }
-
-export const KUBERNETES_UNDO_ROLLOUT = 'spinnaker.kubernetes.undo.rollout';
-module(KUBERNETES_UNDO_ROLLOUT, []).component(
-  'kubernetesUndoRollout',
-  react2angular(withErrorBoundary(UndoRollout, 'kubernetesUndoRollout'), ['application', 'resource']),
-);

package/src/manifest/rollout/UndoRolloutModal.tsx

@@ -20,7 +20,11 @@ import {
 } from '@spinnaker/core';
 
 import type { IAnyKubernetesResource } from '../../interfaces';
-import type { IRolloutRevision } from './undo.controller';
+
+interface IRolloutRevision {
+  label: string;
+  revision: number;
+}
 
 export interface IKubernetesUndoRolloutModalProps
   extends Pick<IModalProps, 'isOpen'>,

package/src/manifest/scale/Scale.tsx

@@ -1,10 +1,7 @@
-import { module } from 'angular';
 import React from 'react';
 import { MenuItem } from 'react-bootstrap';
-import { react2angular } from 'react2angular';
 
 import type { Application } from '@spinnaker/core';
-import { withErrorBoundary } from '@spinnaker/core';
 import { useModal } from '@spinnaker/core';
 
 import { ScaleModal } from './ScaleModal';
@@ -16,19 +13,23 @@ export interface IScaleProps {
   currentReplicas: number;
 }
 
-export function Scale(props: IScaleProps) {
+export function Scale({ application, resource, currentReplicas }: IScaleProps) {
   const { open, show, close } = useModal();
   const handleClick = () => show();
   return (
     <>
       <MenuItem onClick={handleClick}>Scale</MenuItem>
-      <ScaleModal isOpen={open} dismissModal={close} {...props} />
+      <ScaleModal
+        isOpen={open}
+        dismissModal={close}
+        application={application}
+        coordinates={{
+          name: resource.name,
+          namespace: resource.namespace,
+          account: resource.account,
+        }}
+        currentReplicas={currentReplicas}
+      />
     </>
   );
 }
-
-export const KUBERNETES_SCALE = 'spinnaker.kubernetes.scale';
-module(KUBERNETES_SCALE, []).component(
-  'kubernetesScale',
-  react2angular(withErrorBoundary(Scale, 'kubernetesScale'), ['application', 'resource', 'currentReplicas']),
-);

package/src/manifest/scale/ScaleModal.tsx

@@ -1,30 +1,28 @@
 import type { FormikProps } from 'formik';
 import { Form } from 'formik';
-import React, { useState } from 'react';
+import React from 'react';
 import { Button, Modal } from 'react-bootstrap';
 
 import type { Application, IModalComponentProps, IModalProps } from '@spinnaker/core';
 import {
+  ConfirmationModalService,
   ManifestWriter,
   ModalClose,
   robotToHuman,
   SpinFormik,
   SubmitButton,
-  TaskMonitorWrapper,
   TaskReason,
-  UserVerification,
-  useTaskMonitor,
 } from '@spinnaker/core';
 
+import type { IManifestCoordinates } from '../IManifestCoordinates';
+import type { IScaleCommand } from './ScaleSettingsForm';
 import { ScaleSettingsForm } from './ScaleSettingsForm';
-import type { IAnyKubernetesResource } from '../../interfaces';
-import type { IScaleCommand } from './scale.controller';
 
 export interface IKubernetesScaleModalProps
   extends Pick<IModalProps, 'isOpen'>,
     Pick<IModalComponentProps, 'dismissModal'> {
   application: Application;
-  resource: IAnyKubernetesResource;
+  coordinates: IManifestCoordinates;
   currentReplicas: number;
 }
 
@@ -33,9 +31,11 @@ export interface IKubernetesScaleValues {
   replicas: number;
 }
 
+const REPLICA_SCALE_FACTOR_WARNING = 5;
+
 export function ScaleModal({
   application,
-  resource,
+  coordinates,
   currentReplicas,
   isOpen,
   dismissModal,
@@ -43,26 +43,40 @@ export function ScaleModal({
   const initialValues: IKubernetesScaleValues = {
     replicas: currentReplicas,
   };
-  const [verified, setVerified] = useState<boolean>(false);
-  const taskMonitor = useTaskMonitor(
-    {
-      application,
-      title: `Scaling ${resource.name} in ${resource.namespace}`,
-      onTaskComplete: () => application.serverGroups.refresh(true),
-    },
-    dismissModal,
-  );
 
   const submit = (values: IKubernetesScaleValues): void => {
-    const payload = {
-      cloudProvider: 'kubernetes',
-      manifestName: resource.name,
-      location: resource.namespace,
-      account: resource.account,
-      reason: values.reason,
-      replicas: values.replicas,
-    };
-    return taskMonitor.submit(() => ManifestWriter.scaleManifest(payload, application));
+    dismissModal();
+
+    let body = `Are you <i>really</i> sure you want to scale ${coordinates.name} in ${coordinates.account} to ${values.replicas} replicas?`;
+    if (values.replicas === 0) {
+      body +=
+        ' <br><br><span style="color:red"><b>If this service does not have replicas in another cluster, this WILL cause an outage.</b></span>';
+    } else if (currentReplicas > 0 && values.replicas >= currentReplicas * REPLICA_SCALE_FACTOR_WARNING) {
+      body += ` <br><br><span style="color:red"><b>This will create more than ${REPLICA_SCALE_FACTOR_WARNING} times the current number of replicas.</b></span>`;
+    }
+
+    ConfirmationModalService.confirm({
+      header: `Really scale ${coordinates.name} in ${coordinates.account}?`,
+      body,
+      taskMonitorConfig: {
+        application,
+        title: `Scaling ${coordinates.name} in ${coordinates.account}`,
+        onTaskComplete: () => application.serverGroups.refresh(true),
+      },
+      verificationLabel: 'Enter the name of the service to confirm',
+      textToVerify: application.name,
+      submitMethod: () => {
+        const payload = {
+          cloudProvider: 'kubernetes',
+          manifestName: coordinates.name,
+          location: coordinates.namespace,
+          account: coordinates.account,
+          reason: values.reason,
+          replicas: values.replicas,
+        };
+        return ManifestWriter.scaleManifest(payload, application);
+      },
+    });
   };
 
   const onOptionChange = (formik: FormikProps<IKubernetesScaleValues>, values: IScaleCommand): void => {
@@ -71,7 +85,6 @@ export function ScaleModal({
 
   return (
     <Modal show={isOpen} onHide={dismissModal}>
-      <TaskMonitorWrapper monitor={taskMonitor} />
       <SpinFormik<IKubernetesScaleValues>
         initialValues={initialValues}
         onSubmit={submit}
@@ -80,7 +93,7 @@ export function ScaleModal({
             <ModalClose dismiss={dismissModal} />
             <Modal.Header>
               <Modal.Title>
-                Scale {robotToHuman(resource.name)} in {resource.namespace}
+                Scale {robotToHuman(coordinates.name)} in {coordinates.namespace}
               </Modal.Title>
             </Modal.Header>
             <Modal.Body>
@@ -97,14 +110,13 @@ export function ScaleModal({
               </Form>
             </Modal.Body>
             <Modal.Footer>
-              <UserVerification account={resource.account} onValidChange={setVerified} />
               <Button onClick={dismissModal}>Cancel</Button>
               <SubmitButton
                 onClick={() => submit(formik.values)}
-                isDisabled={!formik.isValid || formik.isSubmitting || !verified}
+                isDisabled={formik.isSubmitting}
                 isFormSubmit={true}
                 submitting={formik.isSubmitting}
-                label={`Scale ${resource.name}`}
+                label="Submit"
               />
             </Modal.Footer>
           </>

package/src/manifest/scale/ScaleSettingsForm.tsx

@@ -1,6 +1,13 @@
 import React, { useState } from 'react';
 import { NumberInput, StageConfigField } from '@spinnaker/core';
-import type { IScaleCommand } from './scale.controller';
+
+export interface IScaleCommand {
+  manifestName: string;
+  location: string;
+  account: string;
+  reason: string;
+  replicas: number;
+}
 
 export interface IScaleSettingsFormProps {
   options: IScaleCommand;