Merge branch 'master' into dependabot/npm_and_yarn/packages/app/webpa…

…ck-5.94.0

README.md

@@ -76,8 +76,3 @@ For now, you can look at the [all modules](https://github.com/spinnaker/deck/tre
 get an idea how we are customizing Deck internally. Expect a lot of this to change, though, as we figure out better, cleaner
 hooks and integration points. And we're happy to provide new integration points (or accept pull requests) following
 those existing conventions if you need an integration point that doesn't already exist.
-
-## Join Us
-
-Interested in sharing feedback on Spinnaker's UI or contributing to Deck?
-Please join us at the [Spinnaker UI SIG](https://github.com/spinnaker/governance/tree/master/sig-ui-ux)!

packages/amazon/src/serverGroup/configure/serverGroupCommandBuilder.service.ts

@@ -405,6 +405,9 @@ angular
                 spotMaxPrice = launchTemplateData.instanceMarketOptions?.spotOptions?.maxPrice;
                 command.instanceType = launchTemplateData.instanceType;
                 command.viewState.useSimpleInstanceTypeSelector = true;
+                if (launchTemplateData.userData) {
+                  command.base64UserData = launchTemplateData.userData;
+                }
               }
 
               if (serverGroup.mixedInstancesPolicy) {
@@ -434,7 +437,8 @@ angular
                 command.viewState.useSimpleInstanceTypeSelector = isSimpleModeEnabled(command);
               }
 
-              const ipv6AddressCount = _.get(launchTemplateData, 'networkInterfaces[0]');
+              const networkInterfaces = _.get(launchTemplateData, 'networkInterfaces[0]');
+              const ipv6AddressCount = (networkInterfaces as INetworkInterface)?.ipv6AddressCount ?? 0;
 
               const asgSettings = AWSProviderSettings.serverGroups;
               const isTestEnv = serverGroup.accountDetails && serverGroup.accountDetails.environment === 'test';

packages/app/src/settings.js

@@ -148,6 +148,7 @@ window.spinnakerSettings = {
     defaultManifest: 'spinnaker.yml',
     manifestBasePath: '.spinnaker',
   },
+  maxFetchHistoryOnEvaluateVariables: 100,
   maxPipelineAgeDays: 14,
   newApplicationDefaults: {
     chaosMonkey: false,

packages/core/src/config/settings.ts

@@ -127,6 +127,7 @@ export interface ISpinnakerSettings {
     manifestBasePath: string;
     urls?: Partial<IManagedDeliveryURLs>;
   };
+  maxFetchHistoryOnEvaluateVariables?: number;
   maxPipelineAgeDays: number;
   newApplicationDefaults: INewApplicationDefaults;
   notifications: INotificationSettings;
@@ -175,6 +176,7 @@ SETTINGS.managedDelivery = SETTINGS.managedDelivery || {
   defaultManifest: 'spinnaker.yml',
   manifestBasePath: '.spinnaker',
 };
+SETTINGS.maxFetchHistoryOnEvaluateVariables = SETTINGS.maxFetchHistoryOnEvaluateVariables ?? 100;
 
 // A helper to make resetting settings to steady state after running tests easier
 const originalSettings: ISpinnakerSettings = cloneDeep(SETTINGS);

packages/core/src/pipeline/config/stages/evaluateVariables/ExecutionAndStagePicker.tsx

@@ -2,6 +2,7 @@ import { isEqual, keyBy } from 'lodash';
 import React from 'react';
 import type { Option } from 'react-select';
 
+import { SETTINGS } from '../../../../config';
 import type { IExecution, IPipeline, IStage } from '../../../../domain';
 import type { IStageForSpelPreview } from '../../../../presentation';
 import { FormField, ReactSelectInput, useData } from '../../../../presentation';
@@ -23,7 +24,10 @@ export function ExecutionAndStagePicker(props: IExecutionAndStagePickerProps) {
   const [showStageSelector, setShowStageSelector] = React.useState(false);
 
   const fetchExecutions = useData(
-    () => executionService.getExecutionsForConfigIds([pipeline.id], { limit: 100 }),
+    () =>
+      executionService.getExecutionsForConfigIds([pipeline.id], {
+        limit: SETTINGS.maxFetchHistoryOnEvaluateVariables,
+      }),
     [],
     [],
   );