Skip to content

fix: LaunchTemplates to set InstanceMetadataTags as "disabled" #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 15, 2025
Merged

fix: LaunchTemplates to set InstanceMetadataTags as "disabled" #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
370b1a1
chore: ignore local files
kevdowney Jul 10, 2025
4948b43
fix: set InstanceMetadataTags "disabled"
kevdowney Jul 10, 2025
cd77301
chore: add tests for InstanceMetadataTags disabled
kevdowney Jul 10, 2025
6f155f0
chore: run make manifests
kevdowney Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ vendor/*
*.idea
.windsurfrules
.qodo
.tool-versions
2 changes: 0 additions & 2 deletions config/crd/bases/instancemgr.keikoproj.io_instancegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ spec:
properties:
configuration:
properties:
nodeConfig:
Copy link
Contributor

@vgunapati vgunapati Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we removing nodeConfig

Copy link
Contributor Author

@kevdowney kevdowney Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being removed by generate, make manifests. I asked @estela-ramirez and she confirmed we don't need this.

type: string
bootstrapArguments:
type: string
bootstrapOptions:
Expand Down
2 changes: 2 additions & 0 deletions controllers/provisioners/eks/scaling/launchtemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ func (lt *LaunchTemplate) metadataOptions(input *v1alpha1.MetadataOptions) *ec2.
HttpEndpoint: aws.String(input.HttpEndpoint),
HttpPutResponseHopLimit: aws.Int64(input.HttpPutHopLimit),
HttpTokens: aws.String(input.HttpTokens),
InstanceMetadataTags: aws.String("disabled"), // set disabled by default
Copy link
Contributor

@vgunapati vgunapati Jul 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need update CRD in instancemgr.keikoproj.io_instancegroups.yaml

                      metadataOptions:
                        properties:
                          httpEndpoint:
                            type: string
                          httpPutHopLimit:
                            format: int64
                            type: integer
                          httpTokens:
                            type: string
                        type: object

Copy link
Contributor Author

@kevdowney kevdowney Jul 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we do not expose this for configuration in IG spec (input), it's hard-coded as "disabled" only

}
}

Expand All @@ -375,6 +376,7 @@ func (lt *LaunchTemplate) metadataOptionsRequest(input *v1alpha1.MetadataOptions
HttpEndpoint: aws.String(input.HttpEndpoint),
HttpPutResponseHopLimit: aws.Int64(input.HttpPutHopLimit),
HttpTokens: aws.String(input.HttpTokens),
InstanceMetadataTags: aws.String("disabled"), // set disabled by default
}
}

Expand Down
Loading
Loading