Skip to content
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.

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

Allow setting custom nodeagent container images #1094

Merged
merged 6 commits into from
Mar 27, 2024

Conversation

rquitales
Copy link
Member

@rquitales rquitales commented Mar 26, 2024

Proposed changes

This PR exposes an additional option for VpcCni resources. The nodeImage option will allow users to specify a custom aws-eks-nodeagent container image.

Changes made:

  • Added logic to enable customizing nodeagent container images
  • Added jest unit test to validate images can be set
  • Exposed the nodeImage option as a customizable argument in schema
  • Rebuilt SDKs

Related issues (optional)

Fixes: #1078

@rquitales rquitales changed the title Rquitales/additional image Allow setting customer nodeagent container images Mar 26, 2024
@rquitales rquitales self-assigned this Mar 26, 2024
Copy link

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

@rquitales rquitales force-pushed the rquitales/additional-image branch from fb92924 to 7689fd2 Compare March 26, 2024 05:52
@rquitales rquitales requested review from thomas11 and a team March 26, 2024 05:53
Copy link

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

@@ -137,7 +149,10 @@ function computeVpcCniYaml(cniYamlText: string, args: VpcCniInputs): string {
env.push({ name: "AWS_VPC_ENI_MTU", value: "9001" });
}
if (args.image) {
daemonSet.spec.template.spec.containers[0].image = args.image.toString();
Copy link
Member Author

Choose a reason for hiding this comment

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

note: previously the logic depended on the ordering of containers which is error-prone. I've updated the code to do a scan instead.

@rquitales rquitales force-pushed the rquitales/additional-image branch from 7689fd2 to 17a4044 Compare March 26, 2024 06:19
Copy link

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

@rquitales rquitales changed the title Allow setting customer nodeagent container images Allow setting custom nodeagent container images Mar 26, 2024
@rquitales rquitales force-pushed the rquitales/additional-image branch from 17a4044 to 3f5f083 Compare March 26, 2024 22:45
Copy link

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

Copy link
Contributor

@thomas11 thomas11 left a comment

Choose a reason for hiding this comment

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

LGTM modulo naming question

provider/cmd/pulumi-gen-eks/main.go Outdated Show resolved Hide resolved
@rquitales rquitales force-pushed the rquitales/additional-image branch from 3f5f083 to 457310b Compare March 27, 2024 21:02
@rquitales rquitales force-pushed the rquitales/additional-image branch from 457310b to 901c517 Compare March 27, 2024 21:03
@rquitales rquitales enabled auto-merge (squash) March 27, 2024 21:03
@rquitales rquitales disabled auto-merge March 27, 2024 21:03
Copy link

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

@pulumi pulumi deleted a comment from github-actions bot Mar 27, 2024
@rquitales rquitales merged commit 449635c into master Mar 27, 2024
40 checks passed
@rquitales rquitales deleted the rquitales/additional-image branch March 27, 2024 23:09
flostadler pushed a commit that referenced this pull request Sep 4, 2024
### Proposed changes

This PR exposes an additional option for `VpcCni` resources. The
`nodeImage` option will allow users to specify a custom
`aws-eks-nodeagent` container image.

#### Changes made:

- Added logic to enable customizing nodeagent container images
- Added jest unit test to validate images can be set
- Exposed the `nodeImage` option as a customizable argument in schema
- Rebuilt SDKs

### Related issues (optional)

Fixes: #1078
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws-eks-nodeagent image is only pulled from us-east-2 region
2 participants