Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b2bd132

Browse filesBrowse files
Fix#106 (#71)
* fix namespaceconfig #106 Signed-off-by: raffaelespazzoli <raffaele.spazzoli@gmail.com> * removed comments Signed-off-by: raffaelespazzoli <raffaele.spazzoli@gmail.com>
1 parent 2eaf121 commit b2bd132
Copy full SHA for b2bd132

File tree

2 files changed

+9
-14
lines changed
Filter options

2 files changed

+9
-14
lines changed

‎README.md

Copy file name to clipboardExpand all lines: README.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ in main.go change like this
4848

4949
```go
5050
if err = (&controllers.MyReconciler{
51-
ReconcilerBase: util.NewReconcilerBase(mgr.GetClient(), mgr.GetScheme(), mgr.GetConfig(), mgr.GetEventRecorderFor("My_controller")),
51+
ReconcilerBase: util.NewReconcilerBase(mgr.GetClient(), mgr.GetScheme(), mgr.GetConfig(), mgr.GetEventRecorderFor("My_controller"), mgr.GetAPIReader()),
5252
Log: ctrl.Log.WithName("controllers").WithName("My"),
5353
}).SetupWithManager(mgr); err != nil {
5454
setupLog.Error(err, "unable to create controller", "controller", "My")

‎pkg/util/lockedresourcecontroller/resource-reconciler.go

Copy file name to clipboardExpand all lines: pkg/util/lockedresourcecontroller/resource-reconciler.go
+8-13Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type LockedResourceReconciler struct {
4040
statusChange chan<- event.GenericEvent
4141
statusLock sync.Mutex
4242
parentObject client.Object
43-
creationFailed chan event.GenericEvent
43+
firstReconcile chan event.GenericEvent
4444
log logr.Logger
4545
}
4646

@@ -57,7 +57,7 @@ func NewLockedObjectReconciler(mgr manager.Manager, object unstructured.Unstruct
5757
statusChange: statusChange,
5858
parentObject: parentObject,
5959
statusLock: sync.Mutex{},
60-
creationFailed: make(chan event.GenericEvent),
60+
firstReconcile: make(chan event.GenericEvent),
6161
status: []metav1.Condition([]metav1.Condition{{
6262
Type: "Initializing",
6363
LastTransitionTime: metav1.Now(),
@@ -67,16 +67,11 @@ func NewLockedObjectReconciler(mgr manager.Manager, object unstructured.Unstruct
6767
}}),
6868
}
6969

70-
err := reconciler.CreateOrUpdateResource(context.TODO(), nil, "", object.DeepCopy())
71-
if err != nil {
72-
reconciler.log.Error(err, "unable to create or update", "resource", object)
73-
reconciler.manageErrorNoInstance(err)
74-
go func() {
75-
reconciler.creationFailed <- event.GenericEvent{
76-
Object: &object,
77-
}
78-
}()
79-
}
70+
go func() {
71+
reconciler.firstReconcile <- event.GenericEvent{
72+
Object: &object,
73+
}
74+
}()
8075

8176
controller, err := controller.New("controller_locked_object_"+apis.GetKeyLong(&object), mgr, controller.Options{Reconciler: reconciler})
8277
if err != nil {
@@ -100,7 +95,7 @@ func NewLockedObjectReconciler(mgr manager.Manager, object unstructured.Unstruct
10095
}
10196

10297
err = controller.Watch(
103-
&source.Channel{Source: reconciler.creationFailed},
98+
&source.Channel{Source: reconciler.firstReconcile},
10499
&handler.EnqueueRequestForObject{},
105100
)
106101
if err != nil {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.