Skip to content

[28.x backport] Move swarm runtime plugin spec to swarm types#50802

Merged
thaJeztah merged 2 commits intomoby:28.xfrom
thaJeztah:28.x_backport_move_logdriver_interfaces
Aug 27, 2025
Merged

[28.x backport] Move swarm runtime plugin spec to swarm types#50802
thaJeztah merged 2 commits intomoby:28.xfrom
thaJeztah:28.x_backport_move_logdriver_interfaces

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Aug 25, 2025

- Move swarm runtime plugin spec to swarm types
- Move swarm runtime plugin storage type to internal

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 86190e7)
(cherry picked from commit ee24dce)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 28.4.0 milestone Aug 25, 2025
@thaJeztah thaJeztah added area/api API status/2-code-review kind/refactor PR's that refactor, or clean-up code labels Aug 25, 2025
@thaJeztah thaJeztah force-pushed the 28.x_backport_move_logdriver_interfaces branch from e90da0b to 7f7b8a0 Compare August 25, 2025 16:37
@thaJeztah
Copy link
Member Author

Hm... actually, I should probably drop the "logdriver" part from this PR; we don't really need it, because it's not part of the API (it was just in the wrong place), but it has external consumers;

https://github.com/grafana/loki/blob/f078dc84369150e21f3e9e36cfc20f4879de3560/clients/cmd/docker-driver/driver.go#L16-L17
https://github.com/elastic/beats/blob/5c4aea7449979116b32ee4b7b08a43c70bcce284/x-pack/dockerlogbeat/pipelinemock/reader.go#L13-L15

@thaJeztah thaJeztah changed the title [28.x backport] Move logdriver interface [28.x backport] Move swarm runtime plugin spec to swarm types Aug 25, 2025
@thaJeztah thaJeztah force-pushed the 28.x_backport_move_logdriver_interfaces branch from 9c89c3b to b6c4875 Compare August 27, 2025 06:38
Disabled bool `json:"disabled,omitempty"`
Env []string `json:"env,omitempty"`
}
type RuntimeSpec = runtime.PluginSpec
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an extra commit in the 28.x branch where I move the types back to their old location, but alias them in the new location. The daemon-code is linked to the new location and names, which can be aliased to the types in the API module if we do a transitional "28.5" release;

@thaJeztah
Copy link
Member Author

Hm... actually, I should probably drop the "logdriver" part from this PR; we don't really need it, because it's not part of the API (it was just in the wrong place), but it has external consumers;

I dropped that commit; this PR now only moves the swarm types, which are part of the API, but removing the protobuf parts from those types.

Move these types back to their old location, but alias in the
new location so that any user of the old types would not require
to update.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 28.x_backport_move_logdriver_interfaces branch from b6c4875 to ebbaaf1 Compare August 27, 2025 07:09
@thaJeztah thaJeztah marked this pull request as ready for review August 27, 2025 08:22
@thaJeztah thaJeztah merged commit 4c8a437 into moby:28.x Aug 27, 2025
226 of 227 checks passed
@thaJeztah thaJeztah deleted the 28.x_backport_move_logdriver_interfaces branch August 27, 2025 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/api API kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants