Skip to content

Commit

Permalink
Add commandline options so we can get the driver version via commandl…
Browse files Browse the repository at this point in the history
…ine via `containerd-driver -v`.

update roblox/cla-signature-bot to v2.0.1
  • Loading branch information
lisongmin committed Jan 5, 2021
1 parent 7c5bde2 commit 72880d0
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/clabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on:
types: [created]
pull_request:
types: [opened,closed,synchronize]

jobs:
clabot:
runs-on: ubuntu-latest
steps:
- name: "CLA Signature Bot"
uses: roblox/[email protected].0
uses: roblox/[email protected].1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
14 changes: 7 additions & 7 deletions containerd/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ import (
)

const (
// pluginName is the name of the plugin
// PluginName is the name of the plugin
// this is used for logging and (along with the version) for uniquely
// identifying plugin binaries fingerprinted by the client
pluginName = "containerd-driver"
PluginName = "containerd-driver"

// pluginVersion allows the client to identify and use newer versions of
// PluginVersion allows the client to identify and use newer versions of
// an installed plugin
pluginVersion = "v0.1.0"
PluginVersion = "v0.5.0"

// fingerprintPeriod is the interval at which the plugin will send
// fingerprint responses
Expand All @@ -63,8 +63,8 @@ var (
pluginInfo = &base.PluginInfoResponse{
Type: base.PluginTypeDriver,
PluginApiVersions: []string{drivers.ApiVersion010},
PluginVersion: pluginVersion,
Name: pluginName,
PluginVersion: PluginVersion,
Name: PluginName,
}

// configSpec is the specification of the plugin's configuration
Expand Down Expand Up @@ -202,7 +202,7 @@ type Driver struct {
// NewPlugin returns a new containerd driver plugin
func NewPlugin(logger log.Logger) drivers.DriverPlugin {
ctx, cancel := context.WithCancel(context.Background())
logger = logger.Named(pluginName)
logger = logger.Named(PluginName)

// This will create a new containerd client which will talk to
// default containerd socket path.
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/appc/spec v0.8.11 // indirect
github.com/checkpoint-restore/go-criu v0.0.0-20191125063657-fcdcd07065c5 // indirect
github.com/containerd/cgroups v0.0.0-20200609174450-80c669f4bad0
github.com/containerd/containerd v1.4.1
github.com/containerd/containerd v1.4.3
github.com/containerd/go-cni v0.0.0-20191121212822-60d125212faf // indirect
github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd
github.com/containernetworking/plugins v0.8.3 // indirect
Expand Down Expand Up @@ -46,6 +46,7 @@ require (
github.com/opencontainers/selinux v1.3.1 // indirect
github.com/seccomp/libseccomp-golang v0.9.1 // indirect
github.com/shirou/gopsutil v2.19.11+incompatible // indirect
github.com/spf13/cobra v1.1.1
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
github.com/ugorji/go v1.1.7 // indirect
github.com/vbatts/tar-split v0.11.1 // indirect
Expand Down
Loading

0 comments on commit 72880d0

Please sign in to comment.