rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Update kubernetes.cni.cncf.io -> k8s.cni.cncf.io

Browse Source
This commit is contained in:
Dan Williams
2018-07-19 16:57:08 -05:00
committed by Kuralamudhan Ramakrishnan
parent 6e440b4fa8
commit a4567df76a
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
k8sclient/k8sclient.go
View File

@@ -77,7 +77,7 @@ func getPodNetworkAnnotation(client KubeClient, k8sArgs types.K8sArgs) (string,
return "", "", fmt.Errorf("getPodNetworkAnnotation: failed to query the pod %v in out of cluster comm: %v", string(k8sArgs.K8S_POD_NAME), err)
}
return pod.Annotations["kubernetes.v1.cni.cncf.io/networks"], pod.ObjectMeta.Namespace, nil
return pod.Annotations["k8s.v1.cni.cncf.io/networks"], pod.ObjectMeta.Namespace, nil
}
func parsePodNetworkObjectName(podnetwork string) (string, string, string, error) {
@@ -247,7 +247,7 @@ func cniConfigFromNetworkResource(customResource *types.NetworkAttachmentDefinit
}
func getKubernetesDelegate(client KubeClient, net *types.NetworkSelectionElement, confdir string) (*types.DelegateNetConf, error) {
rawPath := fmt.Sprintf("/apis/kubernetes.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", net.Namespace, net.Name)
rawPath := fmt.Sprintf("/apis/k8s.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", net.Namespace, net.Name)
netData, err := client.GetRawWithPath(rawPath)
if err != nil {
return nil, fmt.Errorf("getKubernetesDelegate: failed to get network resource, refer Multus README.md for the usage guide: %v", err)