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

[controller-manager] Introduce controller-runtime manager and switch CloudProfile controller #6333

Merged
merged 16 commits into from
Jul 15, 2022
Merged

[controller-manager] Introduce controller-runtime manager and switch CloudProfile controller #6333

merged 16 commits into from
Jul 15, 2022

Conversation

timebertt
Copy link
Member

How to categorize this PR?

/area dev-productivity scalability
/kind enhancement

What this PR does / why we need it:

Introduce controller-runtime manager in controller-manager and refactor the first controller (CloudProfile) as an example.

The reworked entrypoint (app package) and config API is supposed to serve as a template for reworking the others as well.

Which issue(s) this PR fixes:
Part of #4251
Closes #4605

Special notes for your reviewer:

Partly co-authored by @rfranzke.

Release note:

Gardener's component configuration APIs have been changed in the following breaking ways:
- `kubernetesLogLevel` has been removed from all component configs
- `ControllerManagerConfiguration.server.http` has been split into `server.{healthProbes,metrics}` (health endpoints and metrics are now served on different ports)
- `ControllerManagerConfiguration.server.https` has been removed

`gardener-controller-manager` serves health endpoints and metrics on different ports now. Adapt your scrape configs accordingly to port `metrics`.

@gardener-prow gardener-prow bot added area/dev-productivity Developer productivity related (how to improve development) area/scalability Scalability related kind/enhancement Enhancement, improvement, extension cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Jul 14, 2022
@gardener-prow gardener-prow bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 14, 2022
@timebertt timebertt mentioned this pull request Jul 14, 2022
Closed
76 tasks
@timebertt timebertt force-pushed the cr-cm branch 2 times, most recently from 1873923 to a5ee693 Compare July 15, 2022 04:28
acumino
acumino reviewed Jul 15, 2022
View reviewed changes
pkg/operation/garden/bootstrap.go Outdated Show resolved Hide resolved
pkg/operation/garden/bootstrap_test.go Outdated Show resolved Hide resolved
pkg/controllermanager/controller/cloudprofile/reconciler.go Outdated Show resolved Hide resolved
pkg/controllermanager/controller/cloudprofile/reconciler_test.go Outdated Show resolved Hide resolved
@rfranzke
Copy link
Member

/assign

rfranzke
rfranzke reviewed Jul 15, 2022
View reviewed changes
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

Awesome, I'm very excited about this one 🎉

cmd/gardener-controller-manager/app/app.go Outdated Show resolved Hide resolved
pkg/operation/garden/bootstrap.go Outdated Show resolved Hide resolved
pkg/controllermanager/controller/certificatesigningrequest/csr_autoapprove_control.go Outdated Show resolved Hide resolved
pkg/controllermanager/controller/project/project_activity_control.go Show resolved Hide resolved
pkg/controllermanager/controller/project/rolebinding_control.go Show resolved Hide resolved
pkg/controllermanager/controller/secretbinding/secretbinding.go Outdated Show resolved Hide resolved
pkg/client/kubernetes/clientmap/internal/plant_clientmap.go Show resolved Hide resolved
@vpnachev
Copy link
Member

/uncc

@gardener-prow gardener-prow bot removed the request for review from vpnachev July 15, 2022 06:55
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2022
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2022
@rfranzke rfranzke changed the title Introduce controller-runtime manager in controller-manager Introduce controller-runtime manager in controller-manager and switchCloudProfile controller Jul 15, 2022
@timebertt timebertt changed the title Introduce controller-runtime manager in controller-manager and switchCloudProfile controller Introduce controller-runtime manager in controller-manager and switch CloudProfile controller Jul 15, 2022
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2022
timebertt and others added 8 commits July 15, 2022 11:59
@timebertt @rfranzke
Drop broken kubernetesLogLevel setting
beed2d1 
The configuration option wasn't effective, drop it instead of fixing it.

Co-Authored-By: Rafael Franzke <rafael.franzke@sap.com>
@timebertt @rfranzke
Rework entrypoint package and introduce c-r manager
2c52498 
Co-Authored-By: Rafael Franzke <rafael.franzke@sap.com>
@timebertt @rfranzke
Rework ControllerManagerConfiguration server settings
a8fb634 
https was never working, ref gardener#4605
The config structure is similar to admission-controller now and fits to
the manager.Options structure as well.

Co-Authored-By: Rafael Franzke <rafael.franzke@sap.com>
@timebertt
Transform garden cluster bootstrapping into runnable
714a543
@timebertt
Add test.FakeManager
4d5b382
@timebertt @rfranzke
Transform factory for legacy controllers into runnable
a10f258 
Co-Authored-By: Rafael Franzke <rafael.franzke@sap.com>
@timebertt
Get clients from manager instead of clientmap
059269e
@timebertt
Allow creating PlantClientMap with plain c-r reader
067cca0 
This will be used to create a standalone PlantClientMap for the plant controller
with the client from the c-r manager.
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2022
@timebertt
Copy link
Member Author

I hope, I didn't miss anything during the rebase party.
@rfranzke PTAL :)

@gardener-prow
Copy link
Contributor

gardener-prow bot commented Jul 15, 2022

@timebertt: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-gardener-apidiff 3850ee5 link false /test pull-gardener-apidiff

Full PR test history. Your PR dashboard. Command help for this repository.

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. I understand the commands that are listed here.

rfranzke
rfranzke reviewed Jul 15, 2022
View reviewed changes
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

This is awesome, let's go!

/lgtm
/approve

@gardener-prow
Copy link
Contributor

gardener-prow bot commented Jul 15, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rfranzke

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

@gardener-prow gardener-prow bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 15, 2022
@gardener-prow gardener-prow bot merged commit d19de58 into gardener:master Jul 15, 2022
@timebertt timebertt deleted the cr-cm branch July 15, 2022 13:30
@rfranzke rfranzke changed the title Introduce controller-runtime manager in controller-manager and switch CloudProfile controller Introduce controller-runtime manager in gardener-controller-manager and switch CloudProfile controller Jul 19, 2022
@rfranzke rfranzke mentioned this pull request Jul 19, 2022
Merged
@acumino acumino mentioned this pull request Sep 5, 2022
Merged
@rfranzke rfranzke mentioned this pull request Sep 19, 2022
Merged
@rfranzke rfranzke changed the title Introduce controller-runtime manager in gardener-controller-manager and switch CloudProfile controller [controller-manager] Introduce controller-runtime manager and switch CloudProfile controller Sep 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rfranzke rfranzke rfranzke left review comments

@acumino acumino acumino left review comments

@Kristian-ZH Kristian-ZH Awaiting requested review from Kristian-ZH

Assignees

@rfranzke rfranzke

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dev-productivity Developer productivity related (how to improve development) area/scalability Scalability related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

controller-manager does not respect config.server.https
4 participants
@timebertt @rfranzke @vpnachev @acumino