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

Ensure that externalSnat and cniExternalSnat don't cause a conflict #752

Merged
merged 1 commit into from
Jul 29, 2022

Conversation

stack72
Copy link
Contributor

@stack72 stack72 commented Jul 29, 2022

Fixes: #624

Proposed changes

Related issues (optional)

@github-actions
Copy link

Does the PR have any schema changes?

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

@stack72 stack72 added the impact/no-changelog-required This issue doesn't require a CHANGELOG update label Jul 29, 2022
Comment on lines +149 to +154
if (args.externalSnat) {
env.push({ name: "AWS_VPC_K8S_CNI_EXTERNALSNAT", value: args.externalSnat ? "true" : "false" });
} else if (args.cniExternalSnat) {
Copy link
Member

Choose a reason for hiding this comment

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

Should externalSnat always take precedence, or would it be better to return an error if they're both set?

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree - we should probably check and error if both are specified instead of encoding an implicit preference.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated :)

@github-actions
Copy link

Does the PR have any schema changes?

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

@github-actions
Copy link

Does the PR have any schema changes?

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

@stack72 stack72 merged commit 0a84ad5 into master Jul 29, 2022
@stack72 stack72 deleted the stack72/gh-624 branch July 29, 2022 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact/no-changelog-required This issue doesn't require a CHANGELOG update
Projects
None yet
3 participants