Merge pull request containerd#10731 from henry118/proxy

[release/1.7] Allow proxy plugins to have capabilities
aepifanov · Oct 7, 2024 · ac00c7b · ac00c7b
2 parents cbd4e04 + 9507403
commit ac00c7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/services/server/config/config.go b/services/server/config/config.go
@@ -170,10 +170,11 @@ type CgroupConfig struct {
 
 // ProxyPlugin provides a proxy plugin configuration
 type ProxyPlugin struct {
-	Type     string            `toml:"type"`
-	Address  string            `toml:"address"`
-	Platform string            `toml:"platform"`
-	Exports  map[string]string `toml:"exports"`
+	Type         string            `toml:"type"`
+	Address      string            `toml:"address"`
+	Platform     string            `toml:"platform"`
+	Exports      map[string]string `toml:"exports"`
+	Capabilities []string          `toml:"capabilities"`
 }
 
 // Decode unmarshals a plugin specific configuration by plugin id

diff --git a/services/server/server.go b/services/server/server.go
@@ -510,6 +510,7 @@ func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Regis
 			InitFn: func(ic *plugin.InitContext) (interface{}, error) {
 				ic.Meta.Exports = exports
 				ic.Meta.Platforms = append(ic.Meta.Platforms, p)
+				ic.Meta.Capabilities = pp.Capabilities
 				conn, err := clients.getClient(address)
 				if err != nil {
 					return nil, err