From 0fa875af6b966c117b9dc1c3ba7cb3b289f24244 Mon Sep 17 00:00:00 2001 From: phebe-vickers <72527655+phebe-vickers@users.noreply.github.com> Date: Tue, 1 Dec 2020 15:36:59 -0800 Subject: [PATCH 1/5] docs(aws): AWS Launch Template only applicale for 1.23 and above, updated instructions. --- setup/features/aws-launch-templates/index.md | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/setup/features/aws-launch-templates/index.md b/setup/features/aws-launch-templates/index.md index 7ece045d6d..85f7dc03de 100644 --- a/setup/features/aws-launch-templates/index.md +++ b/setup/features/aws-launch-templates/index.md @@ -7,12 +7,13 @@ sidebar: {% include toc %} -> Please note that you should only proceed with this if you have [AWS EC2](/setup/install/providers/aws/aws-ec2) configured as a cloud provider. +> Please note that you should only proceed with this if you have [AWS EC2](/setup/install/providers/aws/aws-ec2) configured as a cloud provider. This features requires version 1.23. AWS uses [launch templates](https://docs.aws.amazon.com/autoscaling/ec2/userguide/LaunchTemplates.html) to specify instance configuration information. Launch templates are the successor of launch configurations. This means that any new instance configuration feature from AWS will only be supported by launch templates. Spinnaker still supports launch configurations for backwards compatbility, but recommends enabling launch templates to access any new features that AWS adds. + +1. Update `clouddriver.yml`. This step can be repeated as needed throughout your rollout. This is an example config where launch templates is rolled out to two applications in production and all of the test account. ```yml aws.features.launch-templates.enabled: true aws.features.launch-templates.allowed-applications: "myapp:prod:us-east-1,anotherapp:prod:us-east-1" aws.features.launch-templates.allowed-accounts: "test" - aws.features.launch-templates.excluded-applications: "dangerousapp" - aws.features.launch-templates.all-applicaitons.enabled: false ``` 1. Read through the available [features](#feature-configuration) to determine which make sense for your use cases. -1. Update AWS settings in deck to include the features you identified. Ensure that `enableLaunchTemplates` is `true`. +1. Update AWS settings in `settings-local.js` to include the features you identified. Ensure that `enableLaunchTemplates` is `true`. ```js - providers: { - aws: { - serverGroups: { - enableLaunchTemplates: true, - enableIPv6: true, - enableIMDSv2: true, - } - } - } + window.spinnakerSettings.providers.aws.serverGroups = { + enableLaunchTemplates: true, + enableIPv6: true, + enableIMDSv2: true, + }; ``` + ## Rollout Configuration If you already use AWS, then your applications may have some dependencies on launch configurations that prevent simple feature enabling. The configuration options beflow were created to aid with testing or a rollout period. Feel free to use whatever combination is best for you. If you would prefer to **skip a rollout**, use the configuration in [New to AWS](#new-to-aws). From 01b7e5663e7f4f65f65928f4e4461ee9bce3b1ab Mon Sep 17 00:00:00 2001 From: phebe-vickers <72527655+phebe-vickers@users.noreply.github.com> Date: Tue, 1 Dec 2020 16:08:50 -0800 Subject: [PATCH 2/5] Fix broken link --- setup/features/aws-launch-templates/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/features/aws-launch-templates/index.md b/setup/features/aws-launch-templates/index.md index 85f7dc03de..c6b72231dd 100644 --- a/setup/features/aws-launch-templates/index.md +++ b/setup/features/aws-launch-templates/index.md @@ -72,7 +72,8 @@ If you already use AWS as a cloud provider in Spinnaker, we recommend migrating ``` --> ## Rollout Configuration -If you already use AWS, then your applications may have some dependencies on launch configurations that prevent simple feature enabling. The configuration options beflow were created to aid with testing or a rollout period. Feel free to use whatever combination is best for you. If you would prefer to **skip a rollout**, use the configuration in [New to AWS](#new-to-aws). +If you already use AWS, then your applications may have some dependencies on launch configurations that prevent simple feature enabling. The configuration options beflow were created to aid with testing or a rollout period. Feel free to use whatever combination is best for you. + From 0a44c55d5b5d3cd7610240870a0770118ba03692 Mon Sep 17 00:00:00 2001 From: phebe-vickers <72527655+phebe-vickers@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:43:22 -0800 Subject: [PATCH 3/5] Update setup/features/aws-launch-templates/index.md Co-authored-by: Kevin Woo --- setup/features/aws-launch-templates/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup/features/aws-launch-templates/index.md b/setup/features/aws-launch-templates/index.md index c6b72231dd..fac40c3cca 100644 --- a/setup/features/aws-launch-templates/index.md +++ b/setup/features/aws-launch-templates/index.md @@ -64,7 +64,7 @@ If you already use AWS as a cloud provider in Spinnaker, we recommend migrating enableIMDSv2: true, }; ``` - -1. Update `clouddriver.yml`. This step can be repeated as needed throughout your rollout. This is an example config where launch templates is rolled out to two applications in production and all of the test account. +1. Update `clouddriver.yml`. This step can be repeated as needed throughout your rollout. This is an example config where launch templates is rolled out to two applications in production and all of the test account. It also excludes one application completely: ```yml aws.features.launch-templates.enabled: true aws.features.launch-templates.allowed-applications: "myapp:prod:us-east-1,anotherapp:prod:us-east-1" aws.features.launch-templates.allowed-accounts: "test" + aws.features.launch-templates.excluded-applications: "dangerousapp" + aws.features.launch-templates.all-applications.enabled: false ``` 1. Read through the available [features](#feature-configuration) to determine which make sense for your use cases. -1. Update AWS settings in `settings-local.js` to include the features you identified. Ensure that `enableLaunchTemplates` is `true`. +1. Update AWS settings to enable launch templates to include the features you identified. Ensure that `enableLaunchTemplates` is `true`. ```js - window.spinnakerSettings.providers.aws.serverGroups = { - enableLaunchTemplates: true, - enableIPv6: true, - enableIMDSv2: true, - }; + // enable launch templates for AWS + window.spinnakerSettings.providers.aws.serverGroups.enableLaunchTemplates = true; + window.spinnakerSettings.providers.aws.serverGroups.enableIPv6 = true; + window.spinnakerSettings.providers.aws.serverGroups.enableIMDSv2 = true; ```