feat:add fault injection effective time

Author: spring-young

config/crd/bases/ctrlmesh.kusionstack.io_faultinjections.yaml

@@ -73,6 +73,38 @@ spec:
                             be injected. If left unspecified, no request will be delayed
                           type: string
                       type: object
+                    effectiveTime:
+                      description: Effective time of fault injection
+                      properties:
+                        daysOfMonth:
+                          description: DaysOfMonth specifies on which days of the
+                            month the fault injection configuration is effective.
+                            For example, 1 represents the first day of the month,
+                            and so on.
+                          items:
+                            type: integer
+                          type: array
+                        daysOfWeek:
+                          description: DaysOfWeek specifies on which days of the week
+                            the fault injection configuration is effective. 0 represents
+                            Sunday, 1 represents Monday, and so on.
+                          items:
+                            type: integer
+                          type: array
+                        endTime:
+                          description: EndTime is the ending time of fault injection.
+                          type: string
+                        months:
+                          description: Months specifies in which months of the year
+                            the fault injection configuration is effective. 1 represents
+                            January, 2 represents February, and so on.
+                          items:
+                            type: integer
+                          type: array
+                        startTime:
+                          description: StartTime is the starting time of fault injection.
+                          type: string
+                      type: object
                     match:
                       description: Match specifies a set of criterion to be met in
                         order for the rule to be applied to the HTTP request.
@@ -124,6 +156,7 @@ spec:
                           type: array
                       type: object
                     name:
+                      description: Name is the name of the policy
                       type: string
                   type: object
                 type: array

pkg/apis/ctrlmesh/constants/constants.go

@@ -66,6 +66,7 @@ const (
 	EnvDisableFaultInjection         = "DISABLE_FAULT_INJECTION"
 	EnvEnableApiServerCircuitBreaker = "ENABLE_API_SERVER_BREAKER"
 	EnvEnableRestCircuitBreaker      = "ENABLE_REST_BREAKER"
+	EnvEnableRestFaultInjection     = "ENABLE_REST_Fault_Injection"
 
 	EnvProxyGRPCServerPort = "PROXY_GRPC_SERVER_PORT"
 )

pkg/apis/ctrlmesh/proto/faultinjection.pb.go

@@ -5,6 +5,8 @@ package proto;
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "google/protobuf/duration.proto";
 import "google/api/field_behavior.proto";
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/wrappers.proto";
 
 service FaultInject {
   rpc SendConfig(FaultInjection) returns (FaultInjectConfigResp);
@@ -57,6 +59,8 @@ message HTTPFaultInjection {
 
   string Name = 4;
 
+  EffectiveTimeRange effective_time = 5;
+
   message Delay {
     // Percentage of requests on which the delay will be injected (0-100).
     // Use of integer `percent` value is deprecated. Use the double `percentage`
@@ -93,6 +97,29 @@ message HTTPFaultInjection {
   }
 }
 
+// EffectiveTimeRange specifies the effective time range for fault injection configuration.
+message EffectiveTimeRange {
+  // StartTime is the time when the fault injection configuration starts to take effect.
+  string start_time = 1;
+
+  // EndTime is the time when the fault injection configuration ceases to be effective.
+  string end_time = 2;
+
+  // DaysOfWeek specifies which days of the week the fault injection configuration is effective.
+  // 0 represents Sunday, 1 represents Monday, and so on.
+  repeated int32 days_of_week = 3;
+
+  // DaysOfMonth specifies on which days of the month the fault injection configuration is effective.
+  // For example, 1 represents the first day of the month, and so on.
+  repeated int32 days_of_month = 4;
+
+  // Months specifies which months of the year the fault injection configuration is effective.
+  // 1 represents January, 2 represents February, and so on.
+  repeated int32 months = 5;
+}
+
+
+
 message MultiRestRule {
   repeated string url = 1;
   repeated string method = 2;

pkg/apis/ctrlmesh/proto/faultinjection.proto

@@ -78,6 +78,9 @@ func ConvertHTTPFaultInjection(faultInjection *ctrlmeshv1alpha1.HTTPFaultInjecti
 		protoFaultInjection.Match = ConvertHTTPMatch(faultInjection.Match)
 
 	}
+	if faultInjection.EffectiveTime != nil {
+		protoFaultInjection.EffectiveTime = ConvertEffectiveTime(faultInjection.EffectiveTime)
+	}
 	return protoFaultInjection
 }
 
@@ -110,6 +113,34 @@ func ConvertHTTPMatch(match *ctrlmeshv1alpha1.HTTPMatchRequest) *ctrlmeshproto.H
 	return httpMatchRequest
 }
 
+func ConvertEffectiveTime(timeRange *ctrlmeshv1alpha1.EffectiveTimeRange) *ctrlmeshproto.EffectiveTimeRange {
+	if timeRange == nil {
+		return nil
+	}
+
+	timeRangeRes := &ctrlmeshproto.EffectiveTimeRange{
+		StartTime: timeRange.StartTime,
+		EndTime:   timeRange.EndTime,
+	}
+
+	// Convert DaysOfWeek slice to protobuf repeated field
+	for _, day := range timeRange.DaysOfWeek {
+		timeRangeRes.DaysOfWeek = append(timeRangeRes.DaysOfWeek, int32(day))
+	}
+
+	// Convert DaysOfMonth slice to protobuf repeated field
+	for _, day := range timeRange.DaysOfMonth {
+		timeRangeRes.DaysOfMonth = append(timeRangeRes.DaysOfMonth, int32(day))
+	}
+
+	// Convert Months slice to protobuf repeated field
+	for _, month := range timeRange.Months {
+		timeRangeRes.Months = append(timeRangeRes.Months, int32(month))
+	}
+
+	return timeRangeRes
+}
+
 func ConvertRelatedResources(resourceRule *ctrlmeshv1alpha1.ResourceMatch) *ctrlmeshproto.ResourceMatch {
 	protoResourceRule := &ctrlmeshproto.ResourceMatch{}
 	if resourceRule.Resources != nil {

pkg/apis/ctrlmesh/proto/faultinjection_deepcopy.gen.go

@@ -88,6 +88,7 @@ type HTTPMatchRequest struct {
 // HTTPFaultInjection can be used to specify one or more faults to inject
 // while forwarding HTTP requests to the destination specified in a route.
 type HTTPFaultInjection struct {
+	// Name is the name of the policy
 	Name string `json:"name,omitempty"`
 	// Delay requests before forwarding, emulating various failures such as
 	// network issues, overloaded upstream service, etc.
@@ -99,6 +100,8 @@ type HTTPFaultInjection struct {
 	// Match specifies a set of criterion to be met in order for the
 	// rule to be applied to the HTTP request.
 	Match *HTTPMatchRequest `json:"match,omitempty"`
+	// Effective time of fault injection
+	EffectiveTime *EffectiveTimeRange `json:"effectiveTime,omitempty"`
 }
 
 type FaultInjectionSpec struct {
@@ -110,6 +113,27 @@ type FaultInjectionSpec struct {
 	HTTPFaultInjections []*HTTPFaultInjection `json:"httpFault,omitempty"`
 }
 
+type EffectiveTimeRange struct {
+    // StartTime is the starting time of fault injection.
+    StartTime string `json:"startTime,omitempty"`
+
+    // EndTime is the ending time of fault injection.
+    EndTime string `json:"endTime,omitempty"`
+
+    // DaysOfWeek specifies on which days of the week the fault injection configuration is effective.
+    // 0 represents Sunday, 1 represents Monday, and so on.
+    DaysOfWeek []int `json:"daysOfWeek,omitempty"`
+
+    // DaysOfMonth specifies on which days of the month the fault injection configuration is effective.
+    // For example, 1 represents the first day of the month, and so on.
+    DaysOfMonth []int `json:"daysOfMonth,omitempty"`
+
+    // Months specifies in which months of the year the fault injection configuration is effective.
+    // 1 represents January, 2 represents February, and so on.
+    Months []int `json:"months,omitempty"`
+}
+
+
 // FaultInjectionState is the status of the fault injection, which may be 'Opened' or 'Closed'.
 type FaultInjectionState string
 

pkg/apis/ctrlmesh/utils/conv/faultconv.go

@@ -56,7 +56,7 @@ var (
 	concurrentReconciles = flag.Int("ctrlmesh-inject-workers", 3, "Max concurrent workers for CtrlMesh Server controller.")
 )
 
-// FaultInjectionReconciler reconciles a CircuitBreaker object
+// FaultInjectionReconciler reconciles a faultinjection object
 type FaultInjectionReconciler struct {
 	client.Client
 	recorder record.EventRecorder
@@ -111,7 +111,7 @@ func (r *FaultInjectionReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 			klog.Errorf(msg)
 			reconcileErr = errors.Join(reconcileErr, stateErr)
 		} else {
-			klog.Infof("sync circuitbreaker %s to pod %s success, configHash=%s", fi.Name, utils.KeyFunc(&po), protoFi.ConfigHash)
+			klog.Infof("sync faultinjection %s to pod %s success, configHash=%s", fi.Name, utils.KeyFunc(&po), protoFi.ConfigHash)
 			currentHash = protoFi.ConfigHash
 			defaultPodConfigCache.Add(po.Namespace, po.Name, fi.Name)
 		}
@@ -276,7 +276,7 @@ func disableConfig(ctx context.Context, podIp string, name string) error {
 	if resp != nil && resp.Msg != nil && !resp.Msg.Success {
 		return fmt.Errorf("fail to disable pod [%s, %s] circuit breaker config, %s", podIp, name, resp.Msg.Message)
 	}
-	klog.Infof("pod[ip=%s] circuitbreaker %s was disabled", podIp, name)
+	klog.Infof("pod[ip=%s] faultinjection %s was disabled", podIp, name)
 	return nil
 }
 
@@ -321,7 +321,6 @@ func (r *FaultInjectionReconciler) InjectClient(c client.Client) error {
 // SetupWithManager sets up the controller with the Manager.
 func (r *FaultInjectionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.recorder = mgr.GetEventRecorderFor("sharding-config-controller")
-	klog.Infof("===>", "starting fault manager")
 	return ctrl.NewControllerManagedBy(mgr).
 		WithOptions(controller.Options{MaxConcurrentReconciles: *concurrentReconciles}).
 		For(&ctrlmeshv1alpha1.FaultInjection{}, builder.WithPredicates(&FaultInjectionPredicate{})).

pkg/apis/ctrlmesh/v1alpha1/faultinjection_types.go

@@ -44,12 +44,21 @@ func (b *FaultInjectionPredicate) Update(e event.UpdateEvent) bool {
 	if newFault.DeletionTimestamp != nil || len(oldFault.Finalizers) != len(newFault.Finalizers) {
 		return true
 	}
+
+	oldValue, oldExists := "", false
+	newValue, newExists := "", false
+
+	if oldFault.Labels != nil {
+		oldValue, oldExists = oldFault.Labels[ctrlmesh.CtrlmeshFaultInjectionDisableKey]
+	}
 	if newFault.Labels != nil {
-		_, ok := newFault.Labels[ctrlmesh.CtrlmeshFaultInjectionDisableKey]
-		if ok {
-			return true
-		}
+		newValue, newExists = newFault.Labels[ctrlmesh.CtrlmeshFaultInjectionDisableKey]
 	}
+
+	if (oldExists != newExists) || (oldExists && newExists && oldValue != newValue) {
+		return true
+	}
+
 	oldProtoFault := conv.ConvertFaultInjection(oldFault)
 	newProtoFault := conv.ConvertFaultInjection(newFault)
 	return oldProtoFault.ConfigHash != newProtoFault.ConfigHash

pkg/apis/ctrlmesh/v1alpha1/zz_generated.deepcopy.go

@@ -57,6 +57,8 @@ var (
 	disableFaultInjection = os.Getenv(constants.EnvDisableCircuitBreaker) == "true"
 )
 
+
+
 type Proxy struct {
 	opts           *Options
 	inSecureServer *http.Server