Remove MiqWorker#supports_container? as every worker but one supports podified #20583
Conversation
Every worker save the Cockpit Worker supports running containerized, having an opt-in supports_contianer? that defaults to false is inefficient.
agrare
requested review from
Fryguy,
gtanzillo,
jrafanie and
kbrock
as code owners
|
Checked commit agrare@f0a7083 with ruby 2.6.3, rubocop 0.69.0, haml-lint 0.28.0, and yamllint |
| @@ -16,6 +16,7 @@ class WS | |||
|
|
|||
| def self.can_start_cockpit_ws? | |||
| MiqEnvironment::Command.is_linux? && | |||
| !MiqEnvironment::Command.is_podified? && | |||
| File.exist?(COCKPIT_WS_PATH) && | |||
| File.exist?(COCKPIT_SSH_PATH) | |||
There was a problem hiding this comment.
| def self.containerized_worker? | ||
| MiqEnvironment::Command.is_podified? && supports_container? | ||
| MiqEnvironment::Command.is_podified? |
There was a problem hiding this comment.
10 lines below there is also a supports_systemd? Should we remove that one as well for consistency?
There was a problem hiding this comment.
That one checks Settings so you can disable it if something isn't working right and also make sure the systemd gem is installed so its not just a static true/false like supports_container? is.
|
@agrare do you anticipate needing this for backport as a prerequisite for other PRs? |
|
No I don't think we need to backport this @jrafanie I just ran into this while looking at something else and wanted to clean it up |
Every worker except the Cockpit Worker supports running containerized, having an opt-in
supports_container?that defaults to false is inefficient and prone to bugs (e.g. #20497)The cockpit web services worker already has logic to control if it can start or not so we can utilize this and check for is_podified? as well