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

[etcdbackup&restore] Implement RKE2Config webhook #542

Merged
merged 6 commits into from
Aug 2, 2024
Merged

[etcdbackup&restore] Implement RKE2Config webhook #542

merged 6 commits into from
Aug 2, 2024
+863 −12

Conversation

furkatgofurov7
Copy link
Contributor

@furkatgofurov7 furkatgofurov7 commented May 20, 2024 •
edited

What this PR does / why we need it:
Adds RKE2Config webhook implementation

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 #498
Part of: #388

Special notes for your reviewer:

Checklist:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@furkatgofurov7 furkatgofurov7 requested a review from a team as a code owner May 20, 2024 21:24
@furkatgofurov7 furkatgofurov7 force-pushed the add-webhook-logic branch 2 times, most recently from 056468c to a9c1745 Compare May 20, 2024 22:05
@furkatgofurov7 furkatgofurov7 changed the title Add RKE2Config webhook implementation [etcdbackup&restore] Implement RKE2Config webhook May 20, 2024
@furkatgofurov7
Copy link
Contributor Author

@alexander-demicev PTAL

alexander-demicev
alexander-demicev reviewed May 22, 2024
View reviewed changes
Copy link
Member

@alexander-demicev alexander-demicev left a comment

Choose a reason for hiding this comment

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

Thank for working on it, I have a couple of comments

Makefile Show resolved Hide resolved
exp/etcdrestore/webhooks/installsh.go Show resolved Hide resolved
exp/etcdrestore/webhooks/rke2config.go Show resolved Hide resolved
exp/etcdrestore/webhooks/rke2config.go Outdated Show resolved Hide resolved
Danil-Grigorev
Danil-Grigorev previously approved these changes Jun 11, 2024
View reviewed changes
@furkatgofurov7 furkatgofurov7 enabled auto-merge (rebase) June 11, 2024 10:51
@furkatgofurov7 furkatgofurov7 force-pushed the add-webhook-logic branch 2 times, most recently from 5b81374 to 8a468f1 Compare July 17, 2024 08:43
@furkatgofurov7
Copy link
Contributor Author

furkatgofurov7 commented Jul 17, 2024 •
edited

This is ready to review and take it in, again, PTAL @salasberryfin

alexander-demicev
alexander-demicev reviewed Jul 22, 2024
View reviewed changes
Copy link
Member

@alexander-demicev alexander-demicev left a comment

Choose a reason for hiding this comment

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

thanks, couple minor comments and let's have a follow-up PR for removing unstructured

exp/etcdrestore/webhooks/rke2config.go Outdated Show resolved Hide resolved
exp/etcdrestore/webhooks/rke2config.go Outdated Show resolved Hide resolved
exp/etcdrestore/webhooks/rke2config.go Outdated Show resolved Hide resolved
exp/etcdrestore/webhooks/rke2config.go Outdated Show resolved Hide resolved
exp/etcdrestore/webhooks/rke2config.go Outdated Show resolved Hide resolved
@furkatgofurov7 furkatgofurov7 force-pushed the add-webhook-logic branch 2 times, most recently from 8004fbd to 132a168 Compare July 30, 2024 10:41
@furkatgofurov7
Copy link
Contributor Author

furkatgofurov7 commented Jul 30, 2024 •
edited

if sa.Name matches planSecretName can we use planSecretName later instead?

@alexander-demicev addressed it in 132a168 3f78c02

@furkatgofurov7
Add RKE2Config webhook implementation
739e064 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Add etcdrestore webhook tests
b10e7aa 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Always run 'make test-exp-etcdrestore' as part of the 'make test' Mak…
c7c310d 
…efile target

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Rename CAPRKE2 imports after org rename
fdfffaf 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Bump CAPRKE2 to latest v0.5.0 release
e2c8770 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Address review comments
85faf79 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Copy link
Contributor Author

Had to rebase again after #625 :(
PTAL @alexander-demicev @salasberryfin @Danil-Grigorev

Danil-Grigorev
Danil-Grigorev approved these changes Aug 2, 2024
View reviewed changes
Copy link
Contributor

@Danil-Grigorev Danil-Grigorev left a comment

Choose a reason for hiding this comment

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

LGTM

auto-merge was automatically disabled August 2, 2024 11:27

Base branch requires signed commits

@furkatgofurov7 furkatgofurov7 merged commit 792e3b0 into rancher:main Aug 2, 2024
9 checks passed
@furkatgofurov7 furkatgofurov7 deleted the add-webhook-logic branch August 2, 2024 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@salasberryfin salasberryfin salasberryfin left review comments

@alexander-demicev alexander-demicev alexander-demicev approved these changes

@Danil-Grigorev Danil-Grigorev Danil-Grigorev approved these changes

Assignees
No one assigned
Labels
area/day2operations kind/feature
Projects
CAPI & Hosted Kubernetes providers (EKS/AKS/GKE)
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[etcdbackup&restore] Implement Rke2Config webhook for installing and configuring system-agent
4 participants
@furkatgofurov7 @salasberryfin @alexander-demicev @Danil-Grigorev