modify static gw changed problem

kubeovn · Jan 11, 2021 · d287063 · d287063
1 parent 925f90f
commit d287063
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -342,7 +342,15 @@ func checkAndUpdateCIDR(subnet *kubeovnv1.Subnet) (bool, error) {
 
 func checkAndUpdateGateway(subnet *kubeovnv1.Subnet) (bool, error) {
 	changed := false
-	gw, err := util.GetGwByCidr(subnet.Spec.CIDRBlock)
+	var gw string
+	var err error
+	if subnet.Spec.Gateway == "" {
+		gw, err = util.GetGwByCidr(subnet.Spec.CIDRBlock)
+	} else if util.CheckProtocol(subnet.Spec.Gateway) != util.CheckProtocol(subnet.Spec.CIDRBlock) {
+		gw, err = util.AppendGwByCidr(subnet.Spec.Gateway, subnet.Spec.CIDRBlock)
+	} else {
+		gw = subnet.Spec.Gateway
+	}
 	if err != nil {
 		klog.Error(err)
 		return false, err

diff --git a/pkg/util/net.go b/pkg/util/net.go
@@ -219,6 +219,32 @@ func GetGwByCidr(cidrStr string) (string, error) {
 	return strings.Join(gws, ","), nil
 }
 
+func AppendGwByCidr(gateway, cidrStr string) (string, error) {
+	var gws []string
+	for _, cidr := range strings.Split(cidrStr, ",") {
+		if CheckProtocol(gateway) == CheckProtocol(cidr) {
+			gws = append(gws, gateway)
+			continue
+		} else {
+			gw, err := FirstSubnetIP(cidr)
+			if err != nil {
+				return "", err
+			}
+			var gwArray [2]string
+			if CheckProtocol(gateway) == kubeovnv1.ProtocolIPv4 {
+				gwArray[0] = gateway
+				gwArray[1] = gw
+			} else {
+				gwArray[0] = gw
+				gwArray[1] = gateway
+			}
+			gws = gwArray[:]
+		}
+	}
+
+	return strings.Join(gws, ","), nil
+}
+
 func SplitIpsByProtocol(excludeIps []string) ([]string, []string) {
 	var v4ExcludeIps, v6ExcludeIps []string
 	for _, ex := range excludeIps {

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -176,7 +176,7 @@ metadata:
     kubernetes.io/description: |
       OVN components: northd, nb and sb.
 spec:
-  replicas: $count
+  replicas: 1
   strategy:
     rollingUpdate:
       maxSurge: 0%
@@ -207,8 +207,8 @@ spec:
       shareProcessNamespace: true
       containers:
         - name: ovn-central
-          image: "$REGISTRY/kube-ovn:$VERSION"
-          imagePullPolicy: $IMAGE_PULL_POLICY
+          image: "kubeovn/kube-ovn:v1.6.0"
+          imagePullPolicy: IfNotPresent
           command: ["/kube-ovn/start-db.sh"]
           securityContext:
             capabilities:
@@ -269,8 +269,8 @@ spec:
             failureThreshold: 5
             timeoutSeconds: 45
         - name: ovn-monitor
-          image: "$REGISTRY/kube-ovn:$VERSION"
-          imagePullPolicy: $IMAGE_PULL_POLICY
+          image: "kubeovn/kube-ovn:v1.6.0"
+          imagePullPolicy: IfNotPresent
           command: ["/kube-ovn/start-ovn-monitor.sh"]
           env:
             - name: ENABLE_SSL
@@ -387,7 +387,7 @@ spec:
       containers:
         - name: openvswitch
           image: "kubeovn/kube-ovn-dpdk:$DPDK_VERSION"
-          imagePullPolicy: $IMAGE_PULL_POLICY
+          imagePullPolicy: IfNotPresent
           command: ["/kube-ovn/start-ovs-dpdk.sh"]
           securityContext:
             runAsUser: 0

diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml
@@ -152,7 +152,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: kube-ovn-monitor
-  namespace:  ${NAMESPACE}
+  namespace:  kube-system
   labels:
     app: kube-ovn-monitor
 spec:
@@ -269,8 +269,8 @@ spec:
             failureThreshold: 5
             timeoutSeconds: 45
         - name: ovn-monitor
-          image: "$REGISTRY/kube-ovn:$VERSION"
-          imagePullPolicy: $IMAGE_PULL_POLICY
+          image: "kubeovn/kube-ovn:v1.6.0"
+          imagePullPolicy: IfNotPresent
           command: ["/kube-ovn/start-ovn-monitor.sh"]
           env:
             - name: ENABLE_SSL