Skip to content

Commit ab71737

Browse files
ronethingronething
committed
fix: r
Signed-off-by: ashing <[email protected]>
1 parent ae05c6f commit ab71737

13 files changed

+371
-102
lines changed

‎api/v2/apisixroute_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ type ApisixRoutePlugin struct {
130130
// The plugin name.
131131
Name string `json:"name" yaml:"name"`
132132
// Whether this plugin is in use, default is true.
133+
// +kubebuilder:default=true
133134
Enable bool `json:"enable" yaml:"enable"`
134135
// Plugin configuration.
135136
Config ApisixRoutePluginConfig `json:"config" yaml:"config"`

‎config/crd/bases/apisix.apache.org_apisixglobalrules.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
description: Plugin configuration.
5656
type: object
5757
enable:
58+
default: true
5859
description: Whether this plugin is in use, default is true.
5960
type: boolean
6061
name:

‎config/crd/bases/apisix.apache.org_apisixpluginconfigs.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ spec:
5656
description: Plugin configuration.
5757
type: object
5858
enable:
59+
default: true
5960
description: Whether this plugin is in use, default is true.
6061
type: boolean
6162
name:

‎config/crd/bases/apisix.apache.org_apisixroutes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ spec:
255255
description: Plugin configuration.
256256
type: object
257257
enable:
258+
default: true
258259
description: Whether this plugin is in use, default is
259260
true.
260261
type: boolean
@@ -374,6 +375,7 @@ spec:
374375
description: Plugin configuration.
375376
type: object
376377
enable:
378+
default: true
377379
description: Whether this plugin is in use, default is
378380
true.
379381
type: boolean

‎config/rbac/role.yaml‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,6 @@ rules:
2626
resources:
2727
- apisixconsumers
2828
- apisixglobalrules
29-
- apisixpluginconfigs
30-
- apisixroutes
31-
- apisixtls
32-
- apisixupstreams
33-
- backendtrafficpolicies
34-
- consumers
35-
- gatewayproxies
36-
- httproutepolicies
37-
- pluginconfigs
38-
verbs:
39-
- get
40-
- list
41-
- watch
42-
- apiGroups:
43-
- apisix.apache.org
44-
resources:
45-
- apisixconsumers/status
46-
- apisixglobalrules/status
47-
- apisixpluginconfigs/status
48-
- apisixroutes/status
49-
- apisixtls/status
50-
- apisixupstreams/status
51-
- backendtrafficpolicies/status
52-
- consumers/status
53-
- httproutepolicies/status
54-
verbs:
55-
- get
56-
- update
57-
- apiGroups:
58-
- apisix.apache.org.github.com
59-
resources:
60-
- apisixconsumers
61-
- apisixglobalrules
6229
- apisixroutes
6330
- apisixtls
6431
- apisixupstreams
@@ -71,17 +38,16 @@ rules:
7138
- update
7239
- watch
7340
- apiGroups:
74-
- apisix.apache.org.github.com
41+
- apisix.apache.org
7542
resources:
7643
- apisixconsumers/finalizers
77-
- apisixglobalrules/finalizers
7844
- apisixroutes/finalizers
7945
- apisixtls/finalizers
8046
- apisixupstreams/finalizers
8147
verbs:
8248
- update
8349
- apiGroups:
84-
- apisix.apache.org.github.com
50+
- apisix.apache.org
8551
resources:
8652
- apisixconsumers/status
8753
- apisixglobalrules/status
@@ -92,6 +58,29 @@ rules:
9258
- get
9359
- patch
9460
- update
61+
- apiGroups:
62+
- apisix.apache.org
63+
resources:
64+
- apisixpluginconfigs
65+
- backendtrafficpolicies
66+
- consumers
67+
- gatewayproxies
68+
- httproutepolicies
69+
- pluginconfigs
70+
verbs:
71+
- get
72+
- list
73+
- watch
74+
- apiGroups:
75+
- apisix.apache.org
76+
resources:
77+
- apisixpluginconfigs/status
78+
- backendtrafficpolicies/status
79+
- consumers/status
80+
- httproutepolicies/status
81+
verbs:
82+
- get
83+
- update
9584
- apiGroups:
9685
- coordination.k8s.io
9786
resources:

‎go.sum‎

Lines changed: 304 additions & 0 deletions
Large diffs are not rendered by default.

‎internal/controller/apisixconsumer_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ type ApisixConsumerReconciler struct {
3232
Log logr.Logger
3333
}
3434

35-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixconsumers,verbs=get;list;watch;create;update;patch;delete
36-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixconsumers/status,verbs=get;update;patch
37-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixconsumers/finalizers,verbs=update
35+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixconsumers,verbs=get;list;watch;create;update;patch;delete
36+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixconsumers/status,verbs=get;update;patch
37+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixconsumers/finalizers,verbs=update
3838

3939
// Reconcile FIXME: implement the reconcile logic (For now, it dose nothing other than directly accepting)
4040
func (r *ApisixConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

‎internal/controller/apisixglobalrule_controller.go‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
ctrl "sigs.k8s.io/controller-runtime"
2424
"sigs.k8s.io/controller-runtime/pkg/builder"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
26-
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2726
"sigs.k8s.io/controller-runtime/pkg/predicate"
2827
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2928

@@ -43,9 +42,8 @@ type ApisixGlobalRuleReconciler struct {
4342
Updater status.Updater
4443
}
4544

46-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixglobalrules,verbs=get;list;watch;create;update;patch;delete
47-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixglobalrules/status,verbs=get;update;patch
48-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixglobalrules/finalizers,verbs=update
45+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixglobalrules,verbs=get;list;watch;create;update;patch;delete
46+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixglobalrules/status,verbs=get;update;patch
4947

5048
// Reconcile implements the reconciliation logic for ApisixGlobalRule
5149
func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
@@ -76,29 +74,11 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req
7674

7775
// Check if the global rule is being deleted
7876
if !globalRule.DeletionTimestamp.IsZero() {
79-
// Remove finalizer and let Kubernetes delete it
80-
if controllerutil.ContainsFinalizer(&globalRule, "apisix.apache.org/finalizer") {
81-
if err := r.Provider.Delete(ctx, &globalRule); err != nil {
82-
log.Error(err, "failed to delete global rule from provider")
83-
return ctrl.Result{}, err
84-
}
85-
controllerutil.RemoveFinalizer(&globalRule, "apisix.apache.org/finalizer")
86-
if err := r.Update(ctx, &globalRule); err != nil {
87-
log.Error(err, "failed to remove finalizer")
88-
return ctrl.Result{}, err
89-
}
90-
}
91-
return ctrl.Result{}, nil
92-
}
93-
94-
// Add finalizer if not present
95-
if !controllerutil.ContainsFinalizer(&globalRule, "apisix.apache.org/finalizer") {
96-
controllerutil.AddFinalizer(&globalRule, "apisix.apache.org/finalizer")
97-
if err := r.Update(ctx, &globalRule); err != nil {
98-
log.Error(err, "failed to add finalizer")
77+
if err := r.Provider.Delete(ctx, &globalRule); err != nil {
78+
log.Error(err, "failed to delete global rule from provider")
9979
return ctrl.Result{}, err
10080
}
101-
return ctrl.Result{Requeue: true}, nil
81+
return ctrl.Result{}, nil
10282
}
10383

10484
// Sync the global rule to APISIX

‎internal/controller/apisixroute_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ type ApisixRouteReconciler struct {
3232
Log logr.Logger
3333
}
3434

35-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixroutes,verbs=get;list;watch;create;update;patch;delete
36-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixroutes/status,verbs=get;update;patch
37-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixroutes/finalizers,verbs=update
35+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixroutes,verbs=get;list;watch;create;update;patch;delete
36+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixroutes/status,verbs=get;update;patch
37+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixroutes/finalizers,verbs=update
3838

3939
func (r *ApisixRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
4040
r.Log.Info("reconcile", "request", req.NamespacedName)

‎internal/controller/apisixtls_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ type ApisixTlsReconciler struct {
3232
Log logr.Logger
3333
}
3434

35-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixtls,verbs=get;list;watch;create;update;patch;delete
36-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixtls/status,verbs=get;update;patch
37-
// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixtls/finalizers,verbs=update
35+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtls,verbs=get;list;watch;create;update;patch;delete
36+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtls/status,verbs=get;update;patch
37+
// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtls/finalizers,verbs=update
3838

3939
// Reconcile FIXME: implement the reconcile logic (For now, it dose nothing other than directly accepting)
4040
func (r *ApisixTlsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

0 commit comments

Comments
 (0)