Nat gw support toleration (#1907)

* vpc-nat-gw支持toleration Co-authored-by: yl4811 <yl4811@yealink.com>
kubeovn · Sep 16, 2022 · 8d2991e · 8d2991e
1 parent b3bbe1d
commit 8d2991e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 4 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -469,6 +469,21 @@ spec:
                   type: array
                   items:
                     type: string
+                tolerations:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      key:
+                        type: string
+                      operator:
+                        type: string
+                      value:
+                        type: string
+                      effect:
+                        type: string
+                      tolerationSeconds:
+                        type: integer
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -447,10 +447,19 @@ type VpcNatGateway struct {
 }
 
 type VpcNatSpec struct {
-	Vpc      string   `json:"vpc"`
-	Subnet   string   `json:"subnet"`
-	LanIp    string   `json:"lanIp"`
-	Selector []string `json:"selector"`
+	Vpc         string             `json:"vpc"`
+	Subnet      string             `json:"subnet"`
+	LanIp       string             `json:"lanIp"`
+	Selector    []string           `json:"selector"`
+	Tolerations []VpcNatToleration `json:"tolerations"`
+}
+
+type VpcNatToleration struct {
+	Key               string `json:"key"`
+	Operator          string `json:"operator"`
+	Value             string `json:"value"`
+	Effect            string `json:"effect"`
+	TolerationSeconds int64  `json:"tolerationSeconds"`
 }
 
 // +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
@@ -673,6 +673,21 @@ 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,
@@ -703,6 +718,7 @@ func (c *Controller) genNatGwStatefulSet(gw *kubeovnv1.VpcNatGateway, oldSts *v1
 						},
 					},
 					NodeSelector: selectors,
+					Tolerations:  tolerations,
 				},
 			},
 			UpdateStrategy: v1.StatefulSetUpdateStrategy{