Skip to content

Commit 52a8101

Browse files
add a generated api file and fix typos in controller.go
Signed-off-by: Takeshi Yoshimura <[email protected]>
1 parent 55b6a27 commit 52a8101

File tree

2 files changed

+153
-12
lines changed

2 files changed

+153
-12
lines changed

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 141 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controllers/coredumphandler_controller.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
corev1apply "k8s.io/client-go/applyconfigurations/core/v1"
2828
metav1apply "k8s.io/client-go/applyconfigurations/meta/v1"
2929
"k8s.io/utils/pointer"
30-
ccharts "sigs.k8s.io/controller-runtime"
30+
ctrl "sigs.k8s.io/controller-runtime"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
3333
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -61,35 +61,35 @@ type CoreDumpHandlerReconciler struct {
6161
//
6262
// For more details, check Reconcile and its Result here:
6363
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
64-
func (r *CoreDumpHandlerReconciler) Reconcile(ctx context.Context, req ccharts.Request) (ccharts.Result, error) {
64+
func (r *CoreDumpHandlerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
6565
logger := log.FromContext(ctx)
6666
l := logger.WithValues("CoreDumpHandler", req.NamespacedName)
6767
cdu := &chartsv1alpha1.CoreDumpHandler{}
6868
err := r.Get(ctx, req.NamespacedName, cdu)
6969
var requeue = false
7070
if err != nil {
7171
if errors.IsNotFound(err) {
72-
return ccharts.Result{}, nil
72+
return ctrl.Result{}, nil
7373
}
7474
l.Error(err, "Failed: Reconcile, Get", "namespace", req.Namespace, "name", req.Name)
75-
return ccharts.Result{RequeueAfter: 100 * time.Millisecond}, err
75+
return ctrl.Result{RequeueAfter: 100 * time.Millisecond}, err
7676
}
7777

7878
// Add finalizer to instance
7979
if !controllerutil.ContainsFinalizer(cdu, coredumpHandlerFinalizer) {
8080
controllerutil.AddFinalizer(cdu, coredumpHandlerFinalizer)
8181
err = r.Update(ctx, cdu)
8282
if err != nil {
83-
return ccharts.Result{RequeueAfter: 100 * time.Millisecond}, err
83+
return ctrl.Result{RequeueAfter: 100 * time.Millisecond}, err
8484
}
8585
}
8686
if cdu.GetDeletionTimestamp() != nil {
8787
if controllerutil.ContainsFinalizer(cdu, coredumpHandlerFinalizer) {
8888
if requeue, err = r.DeleteCluster(ctx, cdu, l); requeue || err != nil {
89-
return ccharts.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
89+
return ctrl.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
9090
}
9191
if requeue, err = r.DeleteScc(ctx, cdu, l); requeue || err != nil {
92-
return ccharts.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
92+
return ctrl.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
9393
}
9494
controllerutil.RemoveFinalizer(cdu, coredumpHandlerFinalizer)
9595
err = r.Update(ctx, cdu)
@@ -99,18 +99,18 @@ func (r *CoreDumpHandlerReconciler) Reconcile(ctx context.Context, req ccharts.R
9999
}
100100
} else {
101101
if requeue, err = r.UpdateScc(ctx, cdu, l); requeue || err != nil {
102-
return ccharts.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
102+
return ctrl.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
103103
}
104104
if requeue, err = r.UpdateCluster(ctx, cdu, l); requeue || err != nil {
105-
return ccharts.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
105+
return ctrl.Result{Requeue: requeue, RequeueAfter: 100 * time.Millisecond}, err
106106
}
107107
}
108-
return ccharts.Result{Requeue: requeue}, err
108+
return ctrl.Result{Requeue: requeue}, err
109109
}
110110

111111
// SetupWithManager sets up the controller with the Manager.
112-
func (r *CoreDumpHandlerReconciler) SetupWithManager(mgr ccharts.Manager) error {
113-
return ccharts.NewControllerManagedBy(mgr).
112+
func (r *CoreDumpHandlerReconciler) SetupWithManager(mgr ctrl.Manager) error {
113+
return ctrl.NewControllerManagedBy(mgr).
114114
For(&chartsv1alpha1.CoreDumpHandler{}).
115115
Owns(&appsv1.DaemonSet{}).
116116
Complete(r)

0 commit comments

Comments
 (0)