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.

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

Jump to bottom

fix: multiple addons not being reconciled #2914

Merged
merged 1 commit into from Nov 9, 2021
Merged

fix: multiple addons not being reconciled #2914

merged 1 commit into from Nov 9, 2021

Conversation

richardcase
Copy link
Member

@richardcase richardcase commented Nov 4, 2021 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

When the EKS addons functionality was added to CAPA there was only 1
addon available (vpc) and so it was never tested with multiple addons.
Now there are multiple addons there are issues.

The unit and e2e tests only tested 1 addons. On investigation the issue
was caused by implicit memory aliasing in a loop. This change fixes the
loop and also expands the unit and e2e tests to include multiple eks
addons

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2911

Special notes for your reviewer:

Checklist:

  • squashed commits
  • adds unit tests
  • adds or updates e2e tests

Release note:

Fixes an issue with using multiple EKS addons.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/bug Categorizes issue or PR as related to a bug. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 4, 2021
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 4, 2021
@richardcase richardcase changed the title WIP fix: multiple addons not being reconciled fix: multiple addons not being reconciled Nov 6, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 6, 2021
@richardcase
Copy link
Member Author

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 6, 2021
@richardcase
Copy link
Member Author

/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed needs-priority labels Nov 6, 2021
@richardcase
fix: support more than 1 eks addon
10cb56b 
When the EKS addons functionality was added to CAPA there was only 1
addon available (vpc) and so it was never tested with multiple addons.
Now there are multiple addons there are issues.

The unit and e2e tests only tested 1 addons. On investigation the issue
was caused by implicit memory aliasing in a loop. This change fixes the
loop and also expands the unit and e2e tests to include multiple eks
addons

Signed-off-by: Richard Case <richard@weave.works>
@richardcase
Copy link
Member Author

/cherrypick release-0.7
/cherrypick release-0.6

@k8s-infra-cherrypick-robot
Copy link

@richardcase: once the present PR merges, I will cherry-pick it on top of release-0.7 in a new PR and assign it to you.

In response to this:

/cherrypick release-0.7
/cherrypick release-0.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

sedefsavas
sedefsavas reviewed Nov 9, 2021
View reviewed changes
test/e2e/suites/managed/eks_test.go
@@ -1,3 +1,4 @@
//go:build e2e
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you need this change? Asking to understand if we will need it in unmanaged side.

@sedefsavas
Copy link
Contributor

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 9, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sedefsavas

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2021
@sedefsavas
Copy link
Contributor

sedefsavas commented Nov 9, 2021 •
edited

/cherrypick release-0.6

Multiple cherry picks per comment doesn't work, or maybe needs space.

@k8s-infra-cherrypick-robot
Copy link

@sedefsavas: once the present PR merges, I will cherry-pick it on top of release-0.6 in a new PR and assign it to you.

In response to this:

/cherrypick release-0.6

Multiple cherry pick per comment doesn't work

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot merged commit aae8297 into kubernetes-sigs:main Nov 9, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.x milestone Nov 9, 2021
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 9, 2021
Closed
@k8s-infra-cherrypick-robot
Copy link

@richardcase: new pull request created: #2929

In response to this:

/cherrypick release-0.7
/cherrypick release-0.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@richardcase: #2914 failed to apply on top of branch "release-0.6":

Applying: fix: support more than 1 eks addon
Using index info to reconstruct a base tree...
M	.gitignore
M	pkg/cloud/services/eks/addons.go
M	pkg/eks/addons/plan.go
M	pkg/eks/addons/plan_test.go
M	pkg/eks/addons/procedures.go
M	test/e2e/data/e2e_eks_conf.yaml
M	test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml
M	test/e2e/suites/managed/addon.go
M	test/e2e/suites/managed/addon_helpers.go
M	test/e2e/suites/managed/eks_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/suites/managed/eks_test.go
CONFLICT (content): Merge conflict in test/e2e/suites/managed/eks_test.go
Auto-merging test/e2e/suites/managed/addon_helpers.go
CONFLICT (content): Merge conflict in test/e2e/suites/managed/addon_helpers.go
Auto-merging test/e2e/suites/managed/addon.go
Auto-merging test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml
CONFLICT (content): Merge conflict in test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml
Auto-merging test/e2e/data/e2e_eks_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/data/e2e_eks_conf.yaml
Auto-merging pkg/eks/addons/procedures.go
CONFLICT (content): Merge conflict in pkg/eks/addons/procedures.go
Auto-merging pkg/eks/addons/plan_test.go
Auto-merging pkg/eks/addons/plan.go
Auto-merging pkg/cloud/services/eks/addons.go
Auto-merging .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: support more than 1 eks addon
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.7
/cherrypick release-0.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sedefsavas sedefsavas mentioned this pull request Nov 15, 2021
Closed
This was referenced Nov 16, 2021
Merged
Closed
Closed
richardchen-db pushed a commit to databricks/cluster-api-provider-aws-1 that referenced this pull request Jan 14, 2023
@k8s-ci-robot
Merge pull request kubernetes-sigs#2914 from richardcase/eks_addons_bug
02fa51b 
fix: multiple addons not being reconciled
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sedefsavas sedefsavas sedefsavas left review comments

@dlipovetsky dlipovetsky Awaiting requested review from dlipovetsky

@dthorsen dthorsen Awaiting requested review from dthorsen

Assignees

@sedefsavas sedefsavas

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AWSManagedControlPlane can only install one EKS Addon at a time
4 participants
@richardcase @k8s-infra-cherrypick-robot @sedefsavas @k8s-ci-robot