Optimized tolerations code in vpc-nat-gw (#2613)

Co-authored-by: yl4811 <yl4811@yealink.com>
kubeovn · Apr 7, 2023 · 42a8686 · 42a8686
1 parent 1e8e382
commit 42a8686
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 48 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -410,10 +410,17 @@ spec:
                         type: string
                       operator:
                         type: string
+                        enum:
+                          - Equal
+                          - Exists
                       value:
                         type: string
                       effect:
                         type: string
+                        enum:
+                          - NoExecute
+                          - NoSchedule
+                          - PreferNoSchedule
                       tolerationSeconds:
                         type: integer
                 affinity:

diff --git a/kubeovn-helm/templates/kube-ovn-crd.yaml b/kubeovn-helm/templates/kube-ovn-crd.yaml
@@ -191,10 +191,17 @@ spec:
                         type: string
                       operator:
                         type: string
+                        enum:
+                          - Equal
+                          - Exists
                       value:
                         type: string
                       effect:
                         type: string
+                        enum:
+                          - NoExecute
+                          - NoSchedule
+                          - PreferNoSchedule
                       tolerationSeconds:
                         type: integer
                 affinity:

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -462,20 +462,12 @@ type VpcNatGateway struct {
 }
 
 type VpcNatSpec struct {
-	Vpc         string             `json:"vpc"`
-	Subnet      string             `json:"subnet"`
-	LanIp       string             `json:"lanIp"`
-	Selector    []string           `json:"selector"`
-	Tolerations []VpcNatToleration `json:"tolerations"`
-	Affinity    corev1.Affinity    `json:"affinity"`
-}
-
-type VpcNatToleration struct {
-	Key               string `json:"key"`
-	Operator          string `json:"operator"`
-	Value             string `json:"value"`
-	Effect            string `json:"effect"`
-	TolerationSeconds int64  `json:"tolerationSeconds"`
+	Vpc         string              `json:"vpc"`
+	Subnet      string              `json:"subnet"`
+	LanIp       string              `json:"lanIp"`
+	Selector    []string            `json:"selector"`
+	Tolerations []corev1.Toleration `json:"tolerations"`
+	Affinity    corev1.Affinity     `json:"affinity"`
 }
 
 // +genclient

diff --git a/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go b/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/vpc_nat_gateway.go b/pkg/controller/vpc_nat_gateway.go
@@ -685,21 +685,6 @@ func (c *Controller) genNatGwStatefulSet(gw *kubeovnv1.VpcNatGateway, oldSts *v1
 	}
 	klog.V(3).Infof("prepare for vpc nat gateway pod, node selector: %v", selectors)
 
-	var tolerations []corev1.Toleration
-	for _, t := range gw.Spec.Tolerations {
-		toleration := corev1.Toleration{
-			Key:      t.Key,
-			Value:    t.Value,
-			Effect:   corev1.TaintEffect(t.Effect),
-			Operator: corev1.TolerationOperator(t.Operator),
-		}
-
-		if t.TolerationSeconds != 0 {
-			toleration.TolerationSeconds = &t.TolerationSeconds
-		}
-		tolerations = append(tolerations, toleration)
-	}
-
 	newSts = &v1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   name,
@@ -730,7 +715,7 @@ func (c *Controller) genNatGwStatefulSet(gw *kubeovnv1.VpcNatGateway, oldSts *v1
 						},
 					},
 					NodeSelector: selectors,
-					Tolerations:  tolerations,
+					Tolerations:  gw.Spec.Tolerations,
 					Affinity:     &gw.Spec.Affinity,
 				},
 			},

diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -191,10 +191,17 @@ spec:
                         type: string
                       operator:
                         type: string
+                        enum:
+                          - Equal
+                          - Exists
                       value:
                         type: string
                       effect:
                         type: string
+                        enum:
+                          - NoExecute
+                          - NoSchedule
+                          - PreferNoSchedule
                       tolerationSeconds:
                         type: integer
                 affinity: