crio annotation

openshift · Sep 24, 2017 · c52a663 · c52a663
1 parent 99dcb16
commit c52a663
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/pkg/build/builder/util.go b/pkg/build/builder/util.go
@@ -148,7 +148,7 @@ func getContainerNetworkMode() (string, string, error) {
 		}
 		glog.V(0).Infof("crio spec:\n%#v", info)
 		pid := string(info.Pid)
-		resolvConfHostPath := info.Annotations["io.kubernetes.cri-o.ResolvPath"]
+		resolvConfHostPath := info.CrioAnnotations["io.kubernetes.cri-o.ResolvPath"]
 		if len(resolvConfHostPath) == 0 {
 			return "", "", errors.New("/etc/resolv.conf hostpath is empty")
 		}

diff --git a/vendor/github.com/google/cadvisor/container/crio/client.go b/vendor/github.com/google/cadvisor/container/crio/client.go