public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins: Pass image tag separately for plugin container mode (#112344)

Browse Source 
propagate tag
This commit is contained in:
Will Browne
2025-10-14 15:25:04 +01:00
committed by GitHub
parent 7395f803c1
commit ab4bacbead
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/backendplugin/grpcplugin/client.go
+5 -3
View File
@@ -63,7 +63,7 @@ func newClientConfig(descriptor PluginDescriptor, env []string, logger log.Logge
versionedPlugins := descriptor.versionedPlugins
if runtime.GOOS == "linux" && descriptor.containerMode.enabled {
return containerClientConfig(executablePath, descriptor.containerMode.image, logger, versionedPlugins, skipHostEnvVars, tracer)
return containerClientConfig(executablePath, descriptor.containerMode.image, descriptor.containerMode.tag, logger, versionedPlugins, skipHostEnvVars, tracer)
}
logger.Debug("Using process mode", "os", runtime.GOOS, "executablePath", executablePath)
@@ -92,13 +92,14 @@ func newClientConfig(descriptor PluginDescriptor, env []string, logger log.Logge
}
}
func containerClientConfig(executablePath, containerImage string, logger log.Logger, versionedPlugins map[int]goplugin.PluginSet, skipHostEnvVars bool, tracer trace.Tracer) *goplugin.ClientConfig {
logger.Info("Using container mode", "executable", executablePath, "image", containerImage)
func containerClientConfig(executablePath, containerImage, containerTag string, logger log.Logger, versionedPlugins map[int]goplugin.PluginSet, skipHostEnvVars bool, tracer trace.Tracer) *goplugin.ClientConfig {
logger.Info("Using container mode", "executable", executablePath, "image", containerImage, "tag", containerTag)
return &goplugin.ClientConfig{
RunnerFunc: func(l hclog.Logger, cmd *exec.Cmd, tmpDir string) (runner.Runner, error) {
logger.Info("Creating container runner", "executablePath", executablePath, "tmpDir", tmpDir)
config := &plugincontainer.Config{
Image: containerImage,
Tag: containerTag,
Env: cmd.Env,
}
@@ -133,6 +134,7 @@ type PluginDescriptor struct {
type containerModeOpts struct {
enabled bool
image string
tag string
}
// NewBackendPlugin creates a new backend plugin factory used for registering a backend plugin.
pkg/plugins/backendplugin/grpcplugin/client_proto.go
+2
View File
@@ -57,6 +57,7 @@ type ProtoClientOpts struct {
type ContainerModeOpts struct {
Enabled bool
Image string
Tag string
}
func NewProtoClient(opts ProtoClientOpts) (ProtoClient, error) {
@@ -70,6 +71,7 @@ func NewProtoClient(opts ProtoClientOpts) (ProtoClient, error) {
containerMode: containerModeOpts{
enabled: opts.ContainerMode.Enabled,
image: opts.ContainerMode.Image,
tag: opts.ContainerMode.Tag,
},
skipHostEnvVars: opts.SkipHostEnvVars,
},