diff --git a/app/scripts/modules/amazon/src/aws.settings.ts b/app/scripts/modules/amazon/src/aws.settings.ts index 73bb09be668..baefac3a362 100644 --- a/app/scripts/modules/amazon/src/aws.settings.ts +++ b/app/scripts/modules/amazon/src/aws.settings.ts @@ -26,6 +26,11 @@ export interface IAWSProviderSettings extends IProviderSettings { }; minRootVolumeSize?: number; disableSpotPricing?: boolean; + createLoadBalancerWarnings?: { + network?: string; + application?: string; + classic?: string; + }; } export const AWSProviderSettings: IAWSProviderSettings = (SETTINGS.providers.aws as IAWSProviderSettings) || { diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/AmazonLoadBalancerChoiceModal.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/AmazonLoadBalancerChoiceModal.tsx index 17240f11699..f36b03a03d9 100644 --- a/app/scripts/modules/amazon/src/loadBalancer/configure/AmazonLoadBalancerChoiceModal.tsx +++ b/app/scripts/modules/amazon/src/loadBalancer/configure/AmazonLoadBalancerChoiceModal.tsx @@ -8,7 +8,9 @@ import { ReactModal, noop, CloudProviderRegistry, + Markdown, } from '@spinnaker/core'; +import { AWSProviderSettings } from 'amazon/aws.settings'; import { IAmazonLoadBalancerConfig, LoadBalancerTypes } from './LoadBalancerTypes'; @@ -102,6 +104,10 @@ export class AmazonLoadBalancerChoiceModal extends React.Component< .map(cloudProvider => this.getIncompatibility(selectedChoice, cloudProvider)) .filter((x: ILoadBalancerIncompatibility) => x); + const loadBalancerWarning = + AWSProviderSettings.createLoadBalancerWarnings && + AWSProviderSettings.createLoadBalancerWarnings[selectedChoice.type]; + return ( <> @@ -133,6 +139,14 @@ export class AmazonLoadBalancerChoiceModal extends React.Component< ))} + {!!loadBalancerWarning && ( +
+

+ + +

+
+ )}
diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/LoadBalancerTypes.ts b/app/scripts/modules/amazon/src/loadBalancer/configure/LoadBalancerTypes.ts index 775fa2e9766..71e228a3716 100644 --- a/app/scripts/modules/amazon/src/loadBalancer/configure/LoadBalancerTypes.ts +++ b/app/scripts/modules/amazon/src/loadBalancer/configure/LoadBalancerTypes.ts @@ -11,7 +11,7 @@ export interface ICloseableLoadBalancerModal extends React.ComponentClass