From 96217dd16ebc70b4cee33205ba7bca1a056973f5 Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Fri, 30 Nov 2018 11:07:59 +0800 Subject: [PATCH] Change pod annotation name to 'v1.multus-cni.io/default-network' --- k8sclient/k8sclient.go | 3 ++- testing/testing.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/k8sclient/k8sclient.go b/k8sclient/k8sclient.go index 4f1c627f5..9080f00b5 100644 --- a/k8sclient/k8sclient.go +++ b/k8sclient/k8sclient.go @@ -38,6 +38,7 @@ import ( const ( resourceNameAnnot = "k8s.v1.cni.cncf.io/resourceName" + defaultNetAnnot = "v1.multus-cni.io/default-network" ) // NoK8sNetworkError indicates error, no network in kubernetes @@ -643,7 +644,7 @@ func getPodDefaultNetworkAnnotation(client KubeClient, k8sArgs *types.K8sArgs) ( return "", logging.Errorf("getPodDefaultNetworkAnnotation: failed to query the pod %v in out of cluster comm: %v", string(k8sArgs.K8S_POD_NAME), err) } - if v, ok := pod.Annotations["multus-cni.io/default-network"]; ok { + if v, ok := pod.Annotations[defaultNetAnnot]; ok { return v, nil } return "", nil diff --git a/testing/testing.go b/testing/testing.go index 0e3d8453f..56bd7f792 100644 --- a/testing/testing.go +++ b/testing/testing.go @@ -124,7 +124,7 @@ func NewFakePod(name string, netAnnotation string, defaultNetAnnotation string) } if defaultNetAnnotation != "" { - annotations["multus-cni.io/default-network"] = defaultNetAnnotation + annotations["v1.multus-cni.io/default-network"] = defaultNetAnnotation } pod.ObjectMeta.Annotations = annotations