Merge pull request #8901 from caseyhebebrand/external-vpc-warning

feat(amazon): Add configurable warnings for subnets
spinnaker · Feb 17, 2021 · 803892a · 803892a
2 parents cd0c3d5 + a92b042
commit 803892a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/scripts/modules/amazon/src/aws.settings.ts b/app/scripts/modules/amazon/src/aws.settings.ts
@@ -50,6 +50,8 @@ export interface IAWSProviderSettings extends IProviderSettings {
     enableIMDSv2?: boolean;
     defaultIMDSv2AppAgeLimit?: number;
     enableCpuCredits?: boolean;
+    recommendedSubnets?: string;
+    subnetWarning?: string;
   };
   useAmiBlockDeviceMappings?: boolean;
 }

diff --git a/app/scripts/modules/amazon/src/subnet/SubnetSelectField.tsx b/app/scripts/modules/amazon/src/subnet/SubnetSelectField.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { Application, ISubnet, HelpField } from '@spinnaker/core';
+import { Application, ISubnet, HelpField, Markdown } from '@spinnaker/core';
+import { AWSProviderSettings } from '../aws.settings';
 
 import { SubnetSelectInput } from './SubnetSelectInput';
 
@@ -27,13 +28,13 @@ export class SubnetSelectField extends React.Component<ISubnetSelectFieldProps>
   public render() {
     const { labelColumns, helpKey, component, region, field, ...otherProps } = this.props;
     const value = component[field];
-
+    const isRecommended = (AWSProviderSettings.serverGroups?.recommendedSubnets || []).includes(value);
+    const { subnetWarning } = AWSProviderSettings.serverGroups;
     return (
       <div className="form-group">
         <div className={`col-md-${labelColumns} sm-label-right`}>
           VPC Subnet <HelpField id={helpKey} />
         </div>
-
         <div className="col-md-7">
           {region ? (
             <SubnetSelectInput
@@ -47,6 +48,14 @@ export class SubnetSelectField extends React.Component<ISubnetSelectFieldProps>
           ) : (
             '(Select an account)'
           )}
+          {!isRecommended && Boolean(subnetWarning) && (
+            <div className="alert alert-warning sp-margin-s-top horizontal center">
+              <i className="fa fa-exclamation-triangle sp-margin-s-top" />
+              <div className="sp-margin-s-left">
+                <Markdown message={subnetWarning} style={{ display: 'inline-block', marginLeft: '2px' }} />
+              </div>
+            </div>
+          )}
         </div>
       </div>
     );