fix: add maxUnavailable in OpsRule (#509)

KusionStack · Sep 6, 2023 · 8a13100 · 8a13100
1 parent f9158e6
commit 8a13100
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 29 deletions.
diff --git a/pkg/generator/appconfiguration/generator/trait/ops_rule_generator.go b/pkg/generator/appconfiguration/generator/trait/ops_rule_generator.go
@@ -2,7 +2,9 @@ package trait
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"kusionstack.io/kube-api/apps/v1alpha1"
+
 	"kusionstack.io/kusion/pkg/generator/appconfiguration"
 	"kusionstack.io/kusion/pkg/models"
 	appmodule "kusionstack.io/kusion/pkg/models/appconfiguration"
@@ -47,27 +49,35 @@ func (g *opsRuleGenerator) Generate(spec *models.Spec) error {
 		return nil
 	}
 
-	switch g.app.Workload.Service.Type {
-	case workload.TypeCollaset:
-		resource := &v1alpha1.RuleSet{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: v1alpha1.GroupVersion.String(),
-				Kind:       "RuleSet",
-			},
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      appconfiguration.UniqueAppName(g.project.Name, g.stack.Name, g.appName),
-				Namespace: g.project.Name,
+	if g.app.Workload.Service.Type != workload.TypeCollaset {
+		return nil
+	}
+
+	maxUnavailable := intstr.Parse(g.app.OpsRule.MaxUnavailable)
+	resource := &v1alpha1.RuleSet{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: v1alpha1.GroupVersion.String(),
+			Kind:       "RuleSet",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      appconfiguration.UniqueAppName(g.project.Name, g.stack.Name, g.appName),
+			Namespace: g.project.Name,
+		},
+		Spec: v1alpha1.RuleSetSpec{
+			Selector: metav1.LabelSelector{
+				MatchLabels: appconfiguration.UniqueAppLabels(g.project.Name, g.appName),
 			},
-			Spec: v1alpha1.RuleSetSpec{
-				Selector: metav1.LabelSelector{
-					MatchLabels: appconfiguration.UniqueAppLabels(g.project.Name, g.appName),
+			Rules: []v1alpha1.RuleSetRule{
+				{
+					Name: "maxUnavailable",
+					RuleSetRuleDefinition: v1alpha1.RuleSetRuleDefinition{
+						AvailablePolicy: &v1alpha1.AvailableRule{
+							MaxUnavailableValue: &maxUnavailable,
+						},
+					},
 				},
 			},
-		}
-		return appconfiguration.AppendToSpec(models.Kubernetes, appconfiguration.KubernetesResourceID(resource.TypeMeta, resource.ObjectMeta), spec, resource)
-	case workload.TypeDeploy:
-		// TODO: add maxUnavailable to deployment
-		return nil
+		},
 	}
-	return nil
+	return appconfiguration.AppendToSpec(models.Kubernetes, appconfiguration.KubernetesResourceID(resource.TypeMeta, resource.ObjectMeta), spec, resource)
 }
diff --git a/pkg/generator/appconfiguration/generator/trait/ops_rule_generator_test.go b/pkg/generator/appconfiguration/generator/trait/ops_rule_generator_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"kusionstack.io/kusion/pkg/models"
 	appmodule "kusionstack.io/kusion/pkg/models/appconfiguration"
 	"kusionstack.io/kusion/pkg/models/appconfiguration/trait"
@@ -85,30 +86,32 @@ func Test_opsRuleGenerator_Generate(t *testing.T) {
 			},
 			wantErr: false,
 			exp: &models.Spec{
-				Resources: []models.Resource{
-					{
+				Resources: models.Resources{
+					models.Resource{
 						ID:   "apps.kusionstack.io/v1alpha1:RuleSet:default:default-dev-foo",
 						Type: "Kubernetes",
 						Attributes: map[string]interface{}{
 							"apiVersion": "apps.kusionstack.io/v1alpha1",
 							"kind":       "RuleSet",
 							"metadata": map[string]interface{}{
-								"creationTimestamp": nil,
+								"creationTimestamp": interface{}(nil),
 								"name":              "default-dev-foo",
 								"namespace":         "default",
 							},
 							"spec": map[string]interface{}{
+								"rules": []interface{}{map[string]interface{}{
+									"availablePolicy": map[string]interface{}{
+										"maxUnavailableValue": "30%",
+									},
+									"name": "maxUnavailable",
+								}},
 								"selector": map[string]interface{}{
 									"matchLabels": map[string]interface{}{
-										"app.kubernetes.io/name":    "foo",
-										"app.kubernetes.io/part-of": "default",
+										"app.kubernetes.io/name": "foo", "app.kubernetes.io/part-of": "default",
 									},
 								},
-							},
-							"status": map[string]interface{}{},
-						},
-						DependsOn:  nil,
-						Extensions: nil,
+							}, "status": map[string]interface{}{},
+						}, DependsOn: []string(nil), Extensions: map[string]interface{}(nil),
 					},
 				},
 			},