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

Instance controller refactoring #850

Merged
merged 34 commits into from
Sep 30, 2019
Merged

Instance controller refactoring #850

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7e4605c
Cleanup controller registration to the runtime 0.2.0
alenkacz Sep 17, 2019
7a9e240
Formatting
alenkacz Sep 17, 2019
639e55e
More cleanup
alenkacz Sep 17, 2019
eb920c9
Skeleton of the new instance controller
alenkacz Sep 17, 2019
f894bfd
Progress
alenkacz Sep 17, 2019
46d754d
Merge
alenkacz Sep 19, 2019
ea1c146
Implement plan execution in instance controller
alenkacz Sep 20, 2019
a31c100
Merge
alenkacz Sep 20, 2019
673bc9b
Typo
alenkacz Sep 20, 2019
4dcfc66
Remove dead code, better registration
alenkacz Sep 20, 2019
a927c61
Fix CLI commands and make linter happy
alenkacz Sep 22, 2019
57b37b5
Fix integration test, implement deploy plan trigger
alenkacz Sep 23, 2019
123f496
Upgrade
alenkacz Sep 24, 2019
d6d0a40
Update
alenkacz Sep 24, 2019
b2e23c0
OV reconciliation and update fix
alenkacz Sep 25, 2019
0213ef6
Go back to maps from slice of statuses
alenkacz Sep 25, 2019
c3fc262
Fix when the plan snapshot has to be stored
alenkacz Sep 25, 2019
7f4712e
Make the last test pass
alenkacz Sep 25, 2019
fb739b0
Format
alenkacz Sep 25, 2019
0e81033
Add docs and missing events
alenkacz Sep 26, 2019
a315770
Extra comment
alenkacz Sep 26, 2019
7c48dca
Fix format
alenkacz Sep 26, 2019
04b50ab
Update pkg/apis/kudo/v1alpha1/instance_types.go
alenkacz Sep 27, 2019
5a089bd
Some PR feedback
alenkacz Sep 27, 2019
3d0aa1b
Remaining PR comments
alenkacz Sep 27, 2019
f24a5cc
Fix plan history CLI commands
alenkacz Sep 27, 2019
b38a248
Update pkg/apis/kudo/v1alpha1/instance_types.go
alenkacz Sep 27, 2019
d02a3f6
Update pkg/apis/kudo/v1alpha1/instance_types.go
alenkacz Sep 27, 2019
9c867fa
Merge branch 'av/instance-controller-v2' of github.com:kudobuilder/ku…
alenkacz Sep 27, 2019
2eee2ee
updating golden file and fixing segfault in instance controller
kensipe Sep 27, 2019
f90e0d1
Merge branch 'master' into av/instance-controller-v2
kensipe Sep 27, 2019
33c5666
PR review comments
alenkacz Sep 30, 2019
b2f841f
adding required godocs
kensipe Sep 30, 2019
9da4810
Merge branch 'master' into av/instance-controller-v2
kensipe Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"fmt"
"os"

"github.com/kudobuilder/kudo/pkg/controller/instance"

"github.com/kudobuilder/kudo/pkg/controller/operatorversion"

"github.com/kudobuilder/kudo/pkg/controller/operator"
Expand All @@ -28,7 +30,6 @@ import (
"github.com/kudobuilder/kudo/pkg/version"

kudov1alpha1 "github.com/kudobuilder/kudo/pkg/apis/kudo/v1alpha1"
"github.com/kudobuilder/kudo/pkg/controller"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -87,10 +88,14 @@ func main() {
os.Exit(1)
}

log.Info("Setting up controllers")
// TODO this still registers instance and PE controller, this will be refactored in the next phase
if err := controller.AddControllersToManager(mgr); err != nil {
log.Error(err, "unable to register controllers to the manager")
log.Info("Setting up instance controller")
err = (&instance.Reconciler{
Client: mgr.GetClient(),
Recorder: mgr.GetEventRecorderFor("instance-controller"),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr)
if err != nil {
log.Error(err, "unable to register instance controller to the manager")
os.Exit(1)
}

Expand Down
Loading