fix webhook

bxy4543 · Sep 11, 2024 · 4c53781 · 4c53781
1 parent 7a19c64
commit 4c53781
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/controllers/account/api/v1/debt_webhook.go b/controllers/account/api/v1/debt_webhook.go
@@ -85,9 +85,12 @@ func (d *DebtValidate) Handle(ctx context.Context, req admission.Request) admiss
 			return admission.ValidationResponse(true, "")
 		}
 		// is user sa
-		if !strings.HasPrefix(g, saPrefix+":ns-") {
+		if !strings.HasPrefix(g, saPrefix+":user-system") {
 			continue
 		}
+		if strings.Contains(req.UserInfo.Username, "user-controller-manager") {
+			break
+		}
 		if isWhiteList(req) {
 			return admission.ValidationResponse(true, "")
 		}

diff --git a/controllers/account/controllers/billing_controller.go b/controllers/account/controllers/billing_controller.go
@@ -172,13 +172,13 @@ func (r *BillingReconciler) SetupWithManager(mgr ctrl.Manager, rateOpts controll
 				own, ok := createEvent.Object.GetLabels()[v1.UserLabelOwnerKey]
 				return ok && getUsername(createEvent.Object.GetName()) == own
 			},
-			UpdateFunc: func(updateEvent event.UpdateEvent) bool {
+			UpdateFunc: func(_ event.UpdateEvent) bool {
 				return false
 			},
-			DeleteFunc: func(deleteEvent event.DeleteEvent) bool {
+			DeleteFunc: func(_ event.DeleteEvent) bool {
 				return false
 			},
-			GenericFunc: func(genericEvent event.GenericEvent) bool {
+			GenericFunc: func(_ event.GenericEvent) bool {
 				return false
 			},
 		})).

diff --git a/controllers/account/main.go b/controllers/account/main.go
@@ -19,6 +19,7 @@ package main
 import (
 	"context"
 	"flag"
+	"fmt"
 	"os"
 	"time"
 
@@ -80,7 +81,7 @@ func main() {
 	)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
-	flag.BoolVar(&development, "development", false, "Enable development mode.")
+	flag.BoolVar(&development, "development", true, "Enable development mode.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", true,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
@@ -91,6 +92,7 @@ func main() {
 	opts := zap.Options{
 		Development: development,
 	}
+	fmt.Printf("opts: %v\n", opts)
 	rateLimiterOptions.BindFlags(flag.CommandLine)
 	opts.BindFlags(flag.CommandLine)
 	flag.Parse()