S3 user data support for AWSMachinePool
#592
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AndiDog
commented
Jun 5, 2024
| @@ -57,20 +59,21 @@ const ( | |||
| // ReconcileLaunchTemplate reconciles a launch template and triggers instance refresh conditionally, depending on | |||
| // changes. | |||
| // | |||
| //nolint:gocyclo | |||
| //nolint:gocyclo,maintidx | |||
| func (s *Service) ReconcileLaunchTemplate( | |||
There was a problem hiding this comment.
The PR contains quite some interface changes, parameter additions, etc. So I'm marking a few of the most important spots where the actual feature is implemented.
Main change number 1
| @@ -78,6 +79,10 @@ func (s *Service) ReconcileBucket() error { | |||
| return errors.Wrap(err, "ensuring bucket policy") | |||
| } | |||
|
|
|||
| if err := s.ensureBucketLifecycleConfiguration(bucketName); err != nil { | |||
There was a problem hiding this comment.
Main change number 2 (including the IAM permission; note how it was already present in our CAPA IAM role)
| @@ -161,6 +166,51 @@ func (s *Service) Create(m *scope.MachineScope, data []byte) (string, error) { | |||
| return objectURL.String(), nil | |||
| } | |||
|
|
|||
| func (s *Service) CreateForMachinePool(scope scope.LaunchTemplateScope, data []byte) (string, error) { | |||
1 task
calvix
approved these changes
Jun 6, 2024
This was referenced Jun 6, 2024
fiunchinho
pushed a commit
that referenced
this pull request
Jul 1, 2024
fiunchinho
added a commit
that referenced
this pull request
Jul 4, 2024
* Add Giant Swarm fork modifications * Push to Azure registry * aws-cni-deleted-helm-managed-resources * import-order * Filter CNI subnets when creating EKS NodeGroup * add godoc * 🐛 Create a `aws.Config` with region to be able to work different AWS partition (like gov cloud or china AWS partition) (#588) * create-aws-client-with-region * 🐛 Add ID to secondary subnets (#589) * give name to secondary subnets * make linter happy * Add non root volumes to AWSMachineTemplate * Support adding custom secondary VPC CIDR blocks in `AWSCluster` (backport) (#590) * S3 user data support for `AWSMachinePool` (#592) * Delete machine pool user data files that did not get deleted yet by the lifecycle policy (#593) * Delete machine pool user data files that did not get deleted yet by the lifecycle policy * Use paging for S3 results * Log S3 list operation * Handle NotFound * Remove duplicated argument * Add `make test` to Circle CI build, S3 test fixes (#596) * Cancel instance refresh on any relevant change to ASG instead of blocking until previous one is finished (which may have led to failing nodes due to outdated join token) (#598) * Use feature gate for S3 storage (#599) * Fixes after cherry-pick our customizations --------- Co-authored-by: Andreas Sommer <andreas@giantswarm.io> Co-authored-by: calvix <vaclav@giantswarm.io> Co-authored-by: Mario Nitchev <marionitchev@gmail.com> Co-authored-by: calvix <rozsypalek.vaclav@gmail.com>
fiunchinho
pushed a commit
that referenced
this pull request
Aug 21, 2024
fiunchinho
pushed a commit
that referenced
this pull request
Aug 27, 2024
fiunchinho
added a commit
that referenced
this pull request
Sep 9, 2024
* Add Giant Swarm fork modifications * aws-cni-deleted-helm-managed-resources * Filter CNI subnets when creating EKS NodeGroup * Add non root volumes to AWSMachineTemplate * Support adding custom secondary VPC CIDR blocks in `AWSCluster` (backport) (#590) * S3 user data support for `AWSMachinePool` (#592) * Add GS workflow action --------- Co-authored-by: Andreas Sommer <andreas@giantswarm.io> Co-authored-by: calvix <vaclav@giantswarm.io> Co-authored-by: Mario Nitchev <marionitchev@gmail.com>
AndiDog
added a commit
that referenced
this pull request
Nov 11, 2024
AndiDog
added a commit
that referenced
this pull request
Nov 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Towards giantswarm/roadmap#3442
Upstream CAPA supports putting EC2 user data into S3 buckets, but only for single
AWSMachines, as we use for the control plane. For machine pools, it's more complicated. Since we're exceeding the user data size limit of AWS, I implemented this feature.Tested: