Skip to content

Fill in the plugin version in -about- string #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2018
Merged

Fill in the plugin version in -about- string #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cni/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
// Plugin is the parent class for CNI plugins.
type Plugin struct {
*common.Plugin
version string
}

// NewPlugin creates a new CNI plugin.
Expand All @@ -34,7 +35,8 @@ func NewPlugin(name, version string) (*Plugin, error) {
}

return &Plugin{
Plugin: plugin,
Plugin: plugin,
version: version,
}, nil
}

Expand Down Expand Up @@ -83,7 +85,7 @@ func (plugin *Plugin) Execute(api PluginApi) (err error) {
pluginInfo := cniVers.PluginSupports(supportedVersions...)

// Parse args and call the appropriate cmd handler.
cniErr := cniSkel.PluginMainWithError(api.Add, api.Get, api.Delete, pluginInfo)
cniErr := cniSkel.PluginMainWithError(api.Add, api.Get, api.Delete, pluginInfo, plugin.version)
if cniErr != nil {
cniErr.Print()
return cniErr
Expand Down