write back subnet name to ip label

kubeovn · Aug 12, 2019 · ea451a1 · ea451a1
1 parent 1c7121d
commit ea451a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -75,7 +75,11 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 	if err != nil && k8serrors.IsNotFound(err) {
 		_, err := csh.KubeOvnClient.KubeovnV1().IPs().Create(&kubeovnv1.IP{
 			ObjectMeta: v1.ObjectMeta{
-				Name: fmt.Sprintf("%s.%s", podRequest.PodName, podRequest.PodNamespace)},
+				Name: fmt.Sprintf("%s.%s", podRequest.PodName, podRequest.PodNamespace),
+				Labels: map[string]string{
+					util.SubnetNameLabel: subnet,
+				},
+			},
 			Spec: kubeovnv1.IPSpec{
 				PodName:     podRequest.PodName,
 				Namespace:   podRequest.PodNamespace,
@@ -94,6 +98,13 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 		}
 	} else {
 		if err != nil {
+			if ipCrd.Labels != nil {
+				ipCrd.Labels[util.SubnetNameLabel] = subnet
+			} else {
+				ipCrd.Labels = map[string]string{
+					util.SubnetNameLabel: subnet,
+				}
+			}
 			ipCrd.Spec.PodName = podRequest.PodName
 			ipCrd.Spec.Namespace = podRequest.PodNamespace
 			ipCrd.Spec.Subnet = subnet

diff --git a/pkg/util/const.go b/pkg/util/const.go
@@ -14,6 +14,8 @@ const (
 
 	LogicalSwitchAnnotation = "ovn.kubernetes.io/logical_switch"
 
+	SubnetNameLabel = "ovn.kubernetes.io/subnet"
+
 	ProtocolTCP = "tcp"
 	ProtocolUDP = "udp"