Merge pull request #45 from s1061123/dev/remove-old-status

Remove old network status annotation
k8snetworkplumbingwg · Feb 21, 2022 · 2fd7267 · 2fd7267
2 parents 9bd9a5d + 78b3280
commit 2fd7267
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/pkg/apis/k8s.cni.cncf.io/v1/types.go b/pkg/apis/k8s.cni.cncf.io/v1/types.go
@@ -166,8 +166,6 @@ const (
 	NetworkAttachmentAnnot = "k8s.v1.cni.cncf.io/networks"
 	// Pod annotation for network status
 	NetworkStatusAnnot = "k8s.v1.cni.cncf.io/network-status"
-	// Old Pod annotation for network status (which is used before but it will be obsolated)
-	OldNetworkStatusAnnot = "k8s.v1.cni.cncf.io/networks-status"
 )
 
 // NoK8sNetworkError indicates error, no network in kubernetes

diff --git a/pkg/utils/net-attach-def.go b/pkg/utils/net-attach-def.go
@@ -92,7 +92,6 @@ func setPodNetworkStatus(client kubernetes.Interface, pod *corev1.Pod, networkst
 			pod.Annotations = make(map[string]string)
 		}
 		pod.Annotations[v1.NetworkStatusAnnot] = networkstatus
-		pod.Annotations[v1.OldNetworkStatusAnnot] = networkstatus
 		_, err = coreClient.Pods(namespace).UpdateStatus(context.TODO(), pod, metav1.UpdateOptions{})
 		return err
 	})