Skip to content

Commit 5bb351d

Browse files
committed
f:
1 parent 4d605a9 commit 5bb351d

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

config/rbac/role.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ rules:
1010
- events
1111
verbs:
1212
- create
13-
- get
14-
- list
1513
- patch
16-
- update
17-
- watch
1814
- apiGroups:
1915
- ""
2016
resources:
@@ -30,7 +26,6 @@ rules:
3026
verbs:
3127
- get
3228
- list
33-
- update
3429
- watch
3530
- apiGroups:
3631
- ""

internal/controller/gateway_controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ import (
2828
"github.com/api7/api7-ingress-controller/internal/provider"
2929
)
3030

31-
// +kubebuilder:rbac:groups="",resources=events,verbs=get;list;watch;update
32-
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;update
33-
3431
// GatewayReconciler reconciles a Gateway object.
3532
type GatewayReconciler struct { //nolint:revive
3633
client.Client

internal/controller/secret_controller.go

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import (
1313
"sigs.k8s.io/controller-runtime/pkg/controller"
1414
"sigs.k8s.io/controller-runtime/pkg/event"
1515
"sigs.k8s.io/controller-runtime/pkg/manager"
16-
"sigs.k8s.io/controller-runtime/pkg/predicate"
1716
"sigs.k8s.io/controller-runtime/pkg/reconcile"
18-
19-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
2017
)
2118

19+
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
20+
2221
type SecretReconciler struct {
2322
client.Client
2423

@@ -38,8 +37,7 @@ func (r *SecretReconciler) SetupWithManager(mgr manager.Manager) error {
3837
return r.Log
3938
},
4039
}).
41-
For(&corev1.Secret{}). //builder.WithPredicates(r.predicateFuncs()),
42-
40+
For(&corev1.Secret{}).
4341
Complete(r)
4442
}
4543

@@ -55,22 +53,3 @@ func (r *SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
5553
}
5654
return ctrl.Result{}, nil
5755
}
58-
59-
func (r *SecretReconciler) predicateFuncs() predicate.Funcs {
60-
predicateFuncs := predicate.NewPredicateFuncs(func(object client.Object) bool {
61-
if _, ok := object.(*corev1.Secret); !ok {
62-
return false
63-
}
64-
key := indexer.GenIndexKey(object.GetNamespace(), object.GetName())
65-
refs, err := r.Indexer.ByIndex("referent", key)
66-
if err != nil {
67-
r.Log.Error(err, "failed to check whether secret referred", "namespace", object.GetNamespace(), "name", object.GetName())
68-
return false
69-
}
70-
return len(refs) > 0
71-
})
72-
predicateFuncs.DeleteFunc = func(_ event.DeleteEvent) bool {
73-
return true
74-
}
75-
return predicateFuncs
76-
}

0 commit comments

Comments
 (0)