!43 delete partition when gatewayclass is removed.

Merge pull request !43 from zongzw/zong-delete-partition

Author: zongzw

controllers/gatewayclass_controller.go

@@ -128,14 +128,15 @@ func handleDeletingGatewayClass(ctx context.Context, req ctrl.Request) (ctrl.Res
 		return ctrl.Result{}, err
 	}
 
+	dctx := context.WithValue(ctx, pkg.CtxKey_DeletePartition, "yes")
 	pkg.PendingDeploys <- pkg.DeployRequest{
 		Meta: fmt.Sprintf("clearing gateways for gatewayclass '%s'", req.Name),
 		From: &ocfgs,
 		To:   nil,
 		StatusFunc: func() {
 		},
 		Partition: req.Name,
-		Context:   ctx,
+		Context:   dctx,
 	}
 
 	pkg.PendingDeploys <- pkg.DeployRequest{
@@ -197,13 +198,14 @@ func handleUpsertingGatewayClass(ctx context.Context, obj *gatewayv1beta1.Gatewa
 		Context:    ctx,
 	}
 
+	cctx := context.WithValue(ctx, pkg.CtxKey_CreatePartition, "yes")
 	pkg.PendingDeploys <- pkg.DeployRequest{
 		Meta:       fmt.Sprintf("refreshing gateways for gatewayclass '%s'", reqn),
 		From:       &ocfgs,
 		To:         &ncfgs,
 		StatusFunc: func() {},
 		Partition:  reqn,
-		Context:    ctx,
+		Context:    cctx,
 	}
 
 	return ctrl.Result{}, nil

pkg/deployer.go

@@ -8,10 +8,6 @@ import (
 func deploy(bc *f5_bigip.BIGIPContext, partition string, ocfgs, ncfgs *map[string]interface{}) error {
 	defer utils.TimeItToPrometheus()()
 
-	if err := bc.DeployPartition(partition); err != nil {
-		return err
-	}
-
 	cmds, err := bc.GenRestRequests(partition, ocfgs, ncfgs)
 	if err != nil {
 		return err
@@ -83,10 +79,23 @@ func Deployer(stopCh chan struct{}, bigips []*f5_bigip.BIGIP) {
 				go func(bc *f5_bigip.BIGIPContext, r DeployRequest) {
 					defer func() { done <- true }()
 
+					if r.Context.Value(CtxKey_CreatePartition) != nil {
+						if err := bc.DeployPartition(r.Partition); err != nil {
+							slog.Errorf("failed to deploy partition %s: %s", r.Partition, err.Error())
+							return
+						}
+					}
 					err := deploy(bc, r.Partition, r.From, r.To)
 					if err != nil {
 						// report the error to status or ...
 						slog.Errorf("failed to do deployment to %s: %s", bc.URL, err.Error())
+						return
+					}
+					if r.Context.Value(CtxKey_DeletePartition) != nil {
+						if err := bc.DeletePartition(r.Partition); err != nil {
+							slog.Errorf("failed to deploy partition %s: %s", r.Partition, err.Error())
+							return
+						}
 					}
 					r.StatusFunc()
 				}(bc, r)

pkg/types.go

@@ -18,6 +18,8 @@ type DeployRequest struct {
 	Context    context.Context
 }
 
+type CtxKeyType string
+
 type ParseRequest struct {
 	Gateway   *gatewayv1beta1.Gateway
 	HTTPRoute *gatewayv1beta1.HTTPRoute

pkg/vars.go

@@ -7,3 +7,8 @@ var (
 	AllBigipConfigs BigipConfigs
 	// slog            utils.SLOG
 )
+
+const (
+	CtxKey_DeletePartition CtxKeyType = "delete_partition"
+	CtxKey_CreatePartition CtxKeyType = "create_partition"
+)