Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2018-07-02 23:33:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Mon Jul 2 23:33:22 2018 rev:14 rq:620166 version:1.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2018-06-29 22:35:42.398037949 +0200 +++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-07-02 23:33:47.829223525 +0200 @@ -1,0 +2,7 @@ +Mon Jul 2 06:03:24 UTC 2018 - vrothb...@suse.com + +- Update cri-o to v1.10.5: + * Reduce amount of logs being printed by default + * Update to latest ocicni + +------------------------------------------------------------------- Old: ---- cri-o-1.10.4.tar.xz New: ---- cri-o-1.10.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.MwbZpu/_old 2018-07-02 23:33:48.509222683 +0200 +++ /var/tmp/diff_new_pack.MwbZpu/_new 2018-07-02 23:33:48.513222678 +0200 @@ -31,7 +31,7 @@ %define name_source2 sysconfig.crio %define name_source3 crio.conf Name: cri-o -Version: 1.10.4 +Version: 1.10.5 Release: 0 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.MwbZpu/_old 2018-07-02 23:33:48.545222638 +0200 +++ /var/tmp/diff_new_pack.MwbZpu/_new 2018-07-02 23:33:48.545222638 +0200 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/kubernetes-incubator/cri-o</param> <param name="scm">git</param> -<param name="versionformat">1.10.4</param> -<param name="revision">v1.10.4</param> +<param name="versionformat">1.10.5</param> +<param name="revision">v1.10.5</param> </service> <service name="recompress" mode="disabled"> <param name="file">cri-o-*.tar</param> ++++++ cri-o-1.10.4.tar.xz -> cri-o-1.10.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/cmd/crio/selinux_unsupported.go new/cri-o-1.10.5/cmd/crio/selinux_unsupported.go --- old/cri-o-1.10.4/cmd/crio/selinux_unsupported.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/cmd/crio/selinux_unsupported.go 2018-06-30 01:36:59.000000000 +0200 @@ -5,5 +5,5 @@ import "github.com/sirupsen/logrus" func disableSELinux() { - logrus.Infof("there is no selinux to disable") + logrus.Debugf("there is no selinux to disable") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/conmon/conmon.c new/cri-o-1.10.5/conmon/conmon.c --- old/cri-o-1.10.4/conmon/conmon.c 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/conmon/conmon.c 2018-06-30 01:36:59.000000000 +0200 @@ -997,7 +997,9 @@ static void container_exit_cb (G_GNUC_UNUSED GPid pid, int status, G_GNUC_UNUSED gpointer user_data) { - ninfof("container %d exited with status %d", pid, status); + if (status != 0) { + ninfof("container %d exited with status %d", pid, status); + } container_status = status; container_pid = -1; g_main_loop_quit (main_loop); @@ -1535,7 +1537,6 @@ if (signal(SIGCHLD, on_sigchld) == SIG_ERR) pexit("Failed to set handler for SIGCHLD"); - ninfof("about to waitpid: %d", create_pid); if (csname != NULL) { guint terminal_watch = g_unix_fd_add (console_socket_fd, G_IO_IN, terminal_accept_cb, csname); /* Process any SIGCHLD we may have missed before the signal handler was in place. */ @@ -1620,13 +1621,13 @@ g_main_loop_run (main_loop); - /* Drain stdout and stderr */ - if (masterfd_stdout != -1) { + /* Drain stdout and stderr only if a timeout doesn't occur */ + if (masterfd_stdout != -1 && !timed_out) { g_unix_set_fd_nonblocking(masterfd_stdout, TRUE, NULL); while (read_stdio(masterfd_stdout, STDOUT_PIPE, NULL)) ; } - if (masterfd_stderr != -1) { + if (masterfd_stderr != -1 && !timed_out) { g_unix_set_fd_nonblocking(masterfd_stderr, TRUE, NULL); while (read_stdio(masterfd_stderr, STDERR_PIPE, NULL)) ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/oci/oci.go new/cri-o-1.10.5/oci/oci.go --- old/cri-o-1.10.4/oci/oci.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/oci/oci.go 2018-06-30 01:36:59.000000000 +0200 @@ -229,7 +229,7 @@ // Move conmon to specified cgroup if r.cgroupManager == SystemdCgroupsManager { - logrus.Infof("Running conmon under slice %s and unitName %s", cgroupParent, createUnitName("crio-conmon", c.id)) + logrus.Debugf("Running conmon under slice %s and unitName %s", cgroupParent, createUnitName("crio-conmon", c.id)) if err = utils.RunUnderSystemdScope(cmd.Process.Pid, cgroupParent, createUnitName("crio-conmon", c.id)); err != nil { logrus.Warnf("Failed to add conmon to systemd sandbox cgroup: %v", err) } @@ -509,7 +509,7 @@ } } - logrus.Infof("Received container exit code: %v, message: %s", ec.ExitCode, ec.Message) + logrus.Debugf("Received container exit code: %v, message: %s", ec.ExitCode, ec.Message) if ec.ExitCode == -1 { return nil, ExecSyncError{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/pkg/storage/runtime.go new/cri-o-1.10.5/pkg/storage/runtime.go --- old/cri-o-1.10.4/pkg/storage/runtime.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/pkg/storage/runtime.go 2018-06-30 01:36:59.000000000 +0200 @@ -268,13 +268,13 @@ if err != nil { if err2 := r.storageImageServer.GetStore().DeleteContainer(container.ID); err2 != nil { if metadata.Pod { - logrus.Infof("%v deleting partially-created pod sandbox %q", err2, container.ID) + logrus.Debugf("%v deleting partially-created pod sandbox %q", err2, container.ID) } else { - logrus.Infof("%v deleting partially-created container %q", err2, container.ID) + logrus.Debugf("%v deleting partially-created container %q", err2, container.ID) } return } - logrus.Infof("deleted partially-created container %q", container.ID) + logrus.Debugf("deleted partially-created container %q", container.ID) } }() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/server/container_attach.go new/cri-o-1.10.5/server/container_attach.go --- old/cri-o-1.10.4/server/container_attach.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/server/container_attach.go 2018-06-30 01:36:59.000000000 +0200 @@ -66,10 +66,10 @@ defer controlFile.Close() kubecontainer.HandleResizing(resize, func(size remotecommand.TerminalSize) { - logrus.Infof("Got a resize event: %+v", size) + logrus.Debugf("Got a resize event: %+v", size) _, err := fmt.Fprintf(controlFile, "%d %d %d\n", 1, size.Height, size.Width) if err != nil { - logrus.Infof("Failed to write to control file to resize terminal: %v", err) + logrus.Debugf("Failed to write to control file to resize terminal: %v", err) } }) @@ -125,7 +125,7 @@ } else if buf[0] == AttachPipeStderr { dst = errorStream } else { - logrus.Infof("Got unexpected attach type %+d", buf[0]) + logrus.Debugf("Got unexpected attach type %+d", buf[0]) } if dst != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/server/container_reopen_log.go new/cri-o-1.10.5/server/container_reopen_log.go --- old/cri-o-1.10.4/server/container_reopen_log.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/server/container_reopen_log.go 2018-06-30 01:36:59.000000000 +0200 @@ -83,7 +83,7 @@ } if _, err = fmt.Fprintf(controlFile, "%d %d %d\n", 2, 0, 0); err != nil { - logrus.Infof("Failed to write to control file to reopen log file: %v", err) + logrus.Debugf("Failed to write to control file to reopen log file: %v", err) } select { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/server/sandbox_network.go new/cri-o-1.10.5/server/sandbox_network.go --- old/cri-o-1.10.4/server/sandbox_network.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/server/sandbox_network.go 2018-06-30 01:36:59.000000000 +0200 @@ -25,11 +25,12 @@ }() podNetwork := newPodNetwork(sb) - err = s.netPlugin.SetUpPod(podNetwork) + result, err := s.netPlugin.SetUpPod(podNetwork) if err != nil { err = fmt.Errorf("failed to create pod network sandbox %s(%s): %v", sb.Name(), sb.ID(), err) return } + logrus.Debugf("CNI setup result: %v", result) podIP, err = s.netPlugin.GetPodNetworkStatus(podNetwork) if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/test/ctr.bats new/cri-o-1.10.5/test/ctr.bats --- old/cri-o-1.10.4/test/ctr.bats 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/test/ctr.bats 2018-06-30 01:36:59.000000000 +0200 @@ -180,10 +180,7 @@ run crictl start "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run crictl stop "$ctr_id" - echo "$output" - # Ignore errors on stop. - run crictl inspect "$ctr_id" + run wait_until_exit "$ctr_id" [ "$status" -eq 0 ] run crictl rm "$ctr_id" echo "$output" @@ -227,10 +224,7 @@ run crictl start "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run crictl stop "$ctr_id" - echo "$output" - # Ignore errors on stop. - run crictl inspect "$ctr_id" + run wait_until_exit "$ctr_id" [ "$status" -eq 0 ] run crictl rm "$ctr_id" echo "$output" @@ -272,8 +266,7 @@ run crictl start "$ctr_id" echo "$output" [ "$status" -eq 0 ] - sleep 6 - run crictl inspect "$ctr_id" + run wait_until_exit "$ctr_id" [ "$status" -eq 0 ] run crictl rm "$ctr_id" echo "$output" @@ -316,10 +309,7 @@ run crictl start "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run crictl stop "$ctr_id" - echo "$output" - # Ignore errors on stop. - run crictl inspect "$ctr_id" + run wait_until_exit "$ctr_id" [ "$status" -eq 0 ] run crictl rm "$ctr_id" echo "$output" @@ -882,20 +872,8 @@ run crictl start "$ctr_id" echo "$output" [ "$status" -eq 0 ] - # Wait for container to exit - attempt=0 - while [ $attempt -le 100 ]; do - attempt=$((attempt+1)) - run crictl inspect "$ctr_id" --output table - echo "$output" - [ "$status" -eq 0 ] - if [[ "$output" =~ "State: CONTAINER_EXITED" ]]; then - [[ "$output" =~ "Exit Code: 0" ]] - break - fi - sleep 1 - done - + run wait_until_exit "$ctr_id" + [ "$status" -eq 0 ] run crictl create "$pod_id" "$TESTDATA"/container_config_resolvconf_ro.json "$TESTDATA"/sandbox_config.json echo "$output" [ "$status" -eq 0 ] @@ -903,19 +881,8 @@ run crictl start "$ctr_id" echo "$output" [ "$status" -eq 0 ] - # Wait for container to exit - attempt=0 - while [ $attempt -le 100 ]; do - attempt=$((attempt+1)) - run crictl inspect "$ctr_id" --output table - echo "$output" - [ "$status" -eq 0 ] - if [[ "$output" =~ "State: CONTAINER_EXITED" ]]; then - break - fi - sleep 1 - done - + run wait_until_exit "$ctr_id" + [ "$status" -eq 0 ] cleanup_ctrs cleanup_pods stop_crio diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/test/helpers.bash new/cri-o-1.10.5/test/helpers.bash --- old/cri-o-1.10.4/test/helpers.bash 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/test/helpers.bash 2018-06-30 01:36:59.000000000 +0200 @@ -477,3 +477,21 @@ function temp_sandbox_conf() { sed -e s/\"namespace\":.*/\"namespace\":\ \"$1\",/g "$TESTDATA"/sandbox_config.json > $TESTDIR/sandbox_config_$1.json } + +function wait_until_exit() { + ctr_id=$1 + # Wait for container to exit + attempt=0 + while [ $attempt -le 100 ]; do + attempt=$((attempt+1)) + run crictl inspect "$ctr_id" --output table + echo "$output" + [ "$status" -eq 0 ] + if [[ "$output" =~ "State: CONTAINER_EXITED" ]]; then + [[ "$output" =~ "Exit Code: 0" ]] + return 0 + fi + sleep 1 + done + return 1 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/noop.go new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/noop.go --- old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/noop.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/noop.go 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -package ocicni - -type cniNoOp struct { -} - -func (noop *cniNoOp) Name() string { - return "CNINoOp" -} - -func (noop *cniNoOp) SetUpPod(network PodNetwork) error { - return nil -} - -func (noop *cniNoOp) TearDownPod(network PodNetwork) error { - return nil -} - -func (noop *cniNoOp) GetPodNetworkStatus(network PodNetwork) (string, error) { - return "", nil -} - -func (noop *cniNoOp) Status() error { - return nil -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go --- old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go 2018-06-30 01:36:59.000000000 +0200 @@ -3,6 +3,7 @@ import ( "errors" "fmt" + "os" "os/exec" "sort" "strings" @@ -106,6 +107,23 @@ } defer watcher.Close() + if err = watcher.Add(plugin.pluginDir); err != nil { + logrus.Errorf("Failed to add watch on %q: %v", plugin.pluginDir, err) + return + } + + // Now that `watcher` is running and watching the `pluginDir` + // gather the initial configuration, before starting the + // goroutine which will actually process events. It has to be + // done in this order to avoid missing any updates which might + // otherwise occur between gathering the initial configuration + // and starting the watcher. + if err := plugin.syncNetworkConfig(); err != nil { + logrus.Infof("Initial CNI setting failed, continue monitoring: %v", err) + } else { + logrus.Infof("Initial CNI setting succeeded") + } + go func() { for { select { @@ -124,6 +142,9 @@ logrus.Errorf("CNI setting failed, continue monitoring: %v", err) case err := <-watcher.Errors: + if err == nil { + continue + } logrus.Errorf("CNI monitoring error %v", err) close(plugin.monitorNetDirChan) return @@ -131,41 +152,14 @@ } }() - if err = watcher.Add(plugin.pluginDir); err != nil { - logrus.Error(err) - return - } - <-plugin.monitorNetDirChan } -// InitCNI takes the plugin directory and cni directories where the cni files should be searched for -// Returns a valid plugin object and any error +// InitCNI takes the plugin directory and CNI directories where the CNI config +// files should be searched for. If no valid CNI configs exist, network requests +// will fail until valid CNI config files are present in the config directory. func InitCNI(pluginDir string, cniDirs ...string) (CNIPlugin, error) { - plugin := probeNetworkPluginsWithVendorCNIDirPrefix(pluginDir, cniDirs, "") - var err error - plugin.nsenterPath, err = exec.LookPath("nsenter") - if err != nil { - return nil, err - } - - // check if a default network exists, otherwise dump the CNI search and return a noop plugin - _, err = getDefaultCNINetwork(plugin.pluginDir, plugin.cniDirs, plugin.vendorCNIDirPrefix) - if err != nil { - if err != errMissingDefaultNetwork { - logrus.Warningf("Error in finding usable CNI plugin - %v", err) - // create a noop plugin instead - return &cniNoOp{}, nil - } - - // We do not have a default network, we start the monitoring thread. - go plugin.monitorNetDir() - } - - return plugin, nil -} - -func probeNetworkPluginsWithVendorCNIDirPrefix(pluginDir string, cniDirs []string, vendorCNIDirPrefix string) *cniNetworkPlugin { + vendorCNIDirPrefix := "" plugin := &cniNetworkPlugin{ defaultNetwork: nil, loNetwork: getLoNetwork(cniDirs, vendorCNIDirPrefix), @@ -176,11 +170,21 @@ pods: make(map[string]*podLock), } - // sync NetworkConfig in best effort during probing. - if err := plugin.syncNetworkConfig(); err != nil { - logrus.Error(err) + var err error + plugin.nsenterPath, err = exec.LookPath("nsenter") + if err != nil { + return nil, err + } + + // Ensure plugin directory exists, because the following monitoring logic + // relies on that. + if err := os.MkdirAll(pluginDir, 0755); err != nil { + return nil, err } - return plugin + + go plugin.monitorNetDir() + + return plugin, nil } func getDefaultCNINetwork(pluginDir string, cniDirs []string, vendorCNIDirPrefix string) (*cniNetwork, error) { @@ -308,9 +312,9 @@ return CNIPluginName } -func (plugin *cniNetworkPlugin) SetUpPod(podNetwork PodNetwork) error { +func (plugin *cniNetworkPlugin) SetUpPod(podNetwork PodNetwork) (cnitypes.Result, error) { if err := plugin.checkInitialized(); err != nil { - return err + return nil, err } plugin.podLock(podNetwork).Lock() @@ -319,16 +323,16 @@ _, err := plugin.loNetwork.addToNetwork(podNetwork) if err != nil { logrus.Errorf("Error while adding to cni lo network: %s", err) - return err + return nil, err } - _, err = plugin.getDefaultNetwork().addToNetwork(podNetwork) + result, err := plugin.getDefaultNetwork().addToNetwork(podNetwork) if err != nil { logrus.Errorf("Error while adding to cni network: %s", err) - return err + return nil, err } - return err + return result, err } func (plugin *cniNetworkPlugin) TearDownPod(podNetwork PodNetwork) error { @@ -350,6 +354,9 @@ ip, err := getContainerIP(plugin.nsenterPath, podNetwork.NetNS, DefaultInterfaceName, "-4") if err != nil { + ip, err = getContainerIP(plugin.nsenterPath, podNetwork.NetNS, DefaultInterfaceName, "-6") + } + if err != nil { return "", err } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/types.go new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/types.go --- old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/types.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/types.go 2018-06-30 01:36:59.000000000 +0200 @@ -1,16 +1,14 @@ package ocicni +import ( + "github.com/containernetworking/cni/pkg/types" +) + const ( // DefaultInterfaceName is the string to be used for the interface name inside the net namespace DefaultInterfaceName = "eth0" // CNIPluginName is the default name of the plugin CNIPluginName = "cni" - // DefaultNetDir is the place to look for CNI Network - DefaultNetDir = "/etc/cni/net.d" - // DefaultCNIDir is the place to look for cni config files - DefaultCNIDir = "/opt/cni/bin" - // VendorCNIDirTemplate is the template for looking up vendor specific cni config/executable files - VendorCNIDirTemplate = "%s/opt/%s/bin" ) // PortMapping maps to the standard CNI portmapping Capability @@ -49,7 +47,7 @@ // SetUpPod is the method called after the sandbox container of // the pod has been created but before the other containers of the // pod are launched. - SetUpPod(network PodNetwork) error + SetUpPod(network PodNetwork) (types.Result, error) // TearDownPod is the method called before a pod's sandbox container will be deleted TearDownPod(network PodNetwork) error diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_unix.go new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_unix.go --- old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_unix.go 1970-01-01 01:00:00.000000000 +0100 +++ new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_unix.go 2018-06-30 01:36:59.000000000 +0200 @@ -0,0 +1,12 @@ +// +build !windows + +package ocicni + +const ( + // DefaultNetDir is the place to look for CNI Network + DefaultNetDir = "/etc/cni/net.d" + // DefaultCNIDir is the place to look for cni config files + DefaultCNIDir = "/opt/cni/bin" + // VendorCNIDirTemplate is the template for looking up vendor specific cni config/executable files + VendorCNIDirTemplate = "%s/opt/%s/bin" +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_windows.go new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_windows.go --- old/cri-o-1.10.4/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_windows.go 1970-01-01 01:00:00.000000000 +0100 +++ new/cri-o-1.10.5/vendor/github.com/cri-o/ocicni/pkg/ocicni/types_windows.go 2018-06-30 01:36:59.000000000 +0200 @@ -0,0 +1,12 @@ +// +build windows + +package ocicni + +const ( + // DefaultNetDir is the place to look for CNI Network + DefaultNetDir = "C:\\cni\\etc\\net.d" + // DefaultCNIDir is the place to look for cni config files + DefaultCNIDir = "C:\\cni\\bin" + // VendorCNIDirTemplate is the template for looking up vendor specific cni config/executable files + VendorCNIDirTemplate = "C:\\cni\\%s\\opt\\%s\\bin" // XXX(vbatts) Not sure what to do here ... +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/vendor.conf new/cri-o-1.10.5/vendor.conf --- old/cri-o-1.10.4/vendor.conf 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/vendor.conf 2018-06-30 01:36:59.000000000 +0200 @@ -120,3 +120,4 @@ github.com/cyphar/filepath-securejoin v0.2.1 gopkg.in/square/go-jose.v2 v2.1.3 golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 +github.com/cri-o/ocicni 7374120527ddb7edb1c946579413a6f8a3585407 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.10.4/version/version.go new/cri-o-1.10.5/version/version.go --- old/cri-o-1.10.4/version/version.go 2018-06-26 15:06:11.000000000 +0200 +++ new/cri-o-1.10.5/version/version.go 2018-06-30 01:36:59.000000000 +0200 @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "1.10.4" +const Version = "1.10.5"
