modify init ipam by ip crd only for sts pod (#1448)

kubeovn · Apr 18, 2022 · aa75651 · aa75651
1 parent 3a5ead6
commit aa75651
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 4 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -468,6 +468,8 @@ spec:
                     type: string
                 containerID:
                   type: string
+                podType:
+                  type: string
   scope: Cluster
   names:
     plural: ips

diff --git a/dist/images/update/1.7-1.8.3.sh b/dist/images/update/1.7-1.8.3.sh
@@ -250,6 +250,8 @@ spec:
                     type: string
                 containerID:
                   type: string
+                podType:
+                  type: string
   scope: Cluster
   names:
     plural: ips

diff --git a/dist/images/update/1.8.3-1.9.1.sh b/dist/images/update/1.8.3-1.9.1.sh
@@ -267,6 +267,8 @@ spec:
                     type: string
                 containerID:
                   type: string
+                podType:
+                  type: string
   scope: Cluster
   names:
     plural: ips

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -74,6 +74,7 @@ type IPSpec struct {
 	MacAddress    string   `json:"macAddress"`
 	AttachMacs    []string `json:"attachMacs"`
 	ContainerID   string   `json:"containerID"`
+	PodType       string   `json:"podType"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -331,11 +331,12 @@ func (c *Controller) InitIPAM() error {
 				ip := pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)]
 				mac := pod.Annotations[fmt.Sprintf(util.MacAddressAnnotationTemplate, podNet.ProviderName)]
 				subnet := pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, podNet.ProviderName)]
+				podType := getPodType(pod)
 				_, _, _, err := c.ipam.GetStaticAddress(key, portName, ip, mac, subnet, false)
 				if err != nil {
 					klog.Errorf("failed to init pod %s.%s address %s: %v", podName, pod.Namespace, pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)], err)
 				} else {
-					err = c.createOrUpdateCrdIPs(podName, ip, mac, subnet, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName)
+					err = c.createOrUpdateCrdIPs(podName, ip, mac, subnet, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName, podType)
 					if err != nil {
 						klog.Errorf("failed to create/update ips CR %s.%s with ip address %s: %v", podName, pod.Namespace, ip, err)
 					}
@@ -354,6 +355,10 @@ func (c *Controller) InitIPAM() error {
 		return err
 	}
 	for _, ip := range ips {
+		if ip.Spec.PodType != "StatefulSet" {
+			continue
+		}
+
 		var ipamKey string
 		if ip.Spec.Namespace != "" {
 			ipamKey = fmt.Sprintf("%s/%s", ip.Spec.Namespace, ip.Spec.PodName)

diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -334,7 +334,7 @@ func (c *Controller) handleAddNode(key string) error {
 		return err
 	}
 
-	if err := c.createOrUpdateCrdIPs("", ipStr, mac, c.config.NodeSwitch, "", node.Name, ""); err != nil {
+	if err := c.createOrUpdateCrdIPs("", ipStr, mac, c.config.NodeSwitch, "", node.Name, "", ""); err != nil {
 		klog.Errorf("failed to create or update IPs node-%s: %v", key, err)
 		return err
 	}
@@ -600,7 +600,7 @@ func (c *Controller) handleUpdateNode(key string) error {
 	return nil
 }
 
-func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, nodeName, providerName string) error {
+func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, nodeName, providerName, podType string) error {
 	var key, ipName string
 	if subnetName == c.config.NodeSwitch {
 		key = nodeName
@@ -634,6 +634,7 @@ func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, node
 					AttachIPs:     []string{},
 					AttachMacs:    []string{},
 					AttachSubnets: []string{},
+					PodType:       podType,
 				},
 			}, metav1.CreateOptions{})
 			if err != nil {
@@ -667,6 +668,7 @@ func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, node
 		newIpCr.Spec.AttachIPs = []string{}
 		newIpCr.Spec.AttachMacs = []string{}
 		newIpCr.Spec.AttachSubnets = []string{}
+		newIpCr.Spec.PodType = podType
 		_, err := c.config.KubeOvnClient.KubeovnV1().IPs().Update(context.Background(), newIpCr, metav1.UpdateOptions{})
 		if err != nil {
 			errMsg := fmt.Errorf("failed to update ips cr %s: %v", newIpCr.Name, err)

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -520,8 +520,9 @@ func (c *Controller) handleAddPod(key string) error {
 			return err
 		}
 
+		podType := getPodType(pod)
 		podName := c.getNameByPod(pod)
-		if err := c.createOrUpdateCrdIPs(podName, ipStr, mac, subnet.Name, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName); err != nil {
+		if err := c.createOrUpdateCrdIPs(podName, ipStr, mac, subnet.Name, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName, podType); err != nil {
 			klog.Errorf("failed to create IP %s.%s: %v", podName, pod.Namespace, err)
 		}
 
@@ -1538,3 +1539,11 @@ func (c *Controller) getNsAvailableSubnets(pod *v1.Pod) ([]*kubeovnNet, error) {
 
 	return result, nil
 }
+
+func getPodType(pod *v1.Pod) string {
+	var podType string
+	if ok, _ := isStatefulSetPod(pod); ok {
+		podType = "StatefulSet"
+	}
+	return podType
+}
diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -61,6 +61,8 @@ spec:
                     type: string
                 containerID:
                   type: string
+                podType:
+                  type: string
   scope: Cluster
   names:
     plural: ips