Remove dead RuntimeOption functions #12772
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@mheon PTAL |
|
A lot of these are unused but I added them in case someone wanted to use Libpod directly, setting configuration options they required. I don't know if we want to remove those. There are definitely some that are just unused now, though. |
|
I think I'd leave them unless some of them we can ever forsee using. I've not used libpod directly much myself, but could see a case where some of these would be useful. |
|
Well the Infra ones should definely go since these are part of the Pod not part of the runtime. |
| @@ -115,19 +115,6 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption { | |||
| } | |||
| } | |||
|
|
|||
| // WithDefaultTransport sets the default transport for retrieving images. | |||
| func WithDefaultTransport(defaultTransport string) RuntimeOption { | |||
There was a problem hiding this comment.
I don't think this is actually honored anymore (@vrothberg can confirm). We might want to fix it, though, it does live in containers.conf and setting it there has no effect.
There was a problem hiding this comment.
This is not honored anymore, correct. I am not sure if we should continue supporting it.
There was a problem hiding this comment.
If we don't want it it should be pulled from c/common as well. Still got a few more weeks of 4.0 prep to make breaking changes.
| // they will not share containers, and unspecified behavior may occur. | ||
| func WithStateType(storeType config.RuntimeStateStore) RuntimeOption { | ||
| return func(rt *Runtime) error { | ||
| if rt.valid { |
libpod/options.go
Outdated
| @@ -199,20 +166,6 @@ func WithConmonPath(path string) RuntimeOption { | |||
| } | |||
| } | |||
|
|
|||
| // WithConmonEnv specifies the environment variable list for the conmon process. | |||
| func WithConmonEnv(environment []string) RuntimeOption { | |||
There was a problem hiding this comment.
This is potentially useful, keep it.
libpod/options.go
Outdated
| @@ -260,21 +213,6 @@ func WithCgroupManager(manager string) RuntimeOption { | |||
| } | |||
| } | |||
|
|
|||
| // WithStaticDir sets the directory that static runtime files which persist | |||
| // across reboots will be stored. | |||
| func WithStaticDir(dir string) RuntimeOption { | |||
libpod/options.go
Outdated
| // WithNoPivotRoot sets the runtime to use MS_MOVE instead of PIVOT_ROOT when | ||
| // starting containers. | ||
| func WithNoPivotRoot() RuntimeOption { | ||
| return func(rt *Runtime) error { |
libpod/options.go
Outdated
| // WithCNIPluginDir sets the CNI plugins directory. | ||
| func WithCNIPluginDir(dir string) RuntimeOption { | ||
| return func(rt *Runtime) error { | ||
| if rt.valid { |
libpod/options.go
Outdated
| if rt.valid { | ||
| return define.ErrRuntimeFinalized | ||
| } | ||
|
|
| // An infra image is used for inter-container kernel | ||
| // namespace sharing within a pod. Typically, an infra | ||
| // container is lightweight and is there to reap | ||
| // zombie processes within its pid namespace. |
|
|
||
| // WithDefaultInfraCommand sets the command to | ||
| // run on pause container start up. | ||
| func WithDefaultInfraCommand(cmd string) RuntimeOption { |
There was a problem hiding this comment.
This one still makes sense, I think.
| } | ||
|
|
||
| // WithDefaultInfraName sets the infra container name for a single pod. | ||
| func WithDefaultInfraName(name string) RuntimeOption { |
I don't see where these With Functions are used, so removing them to clean up code. WithDefaultInfra* functions screwed me up and confused me. [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <[email protected]>
|
LGTM |
|
/lgtm |
github-actions
bot
added
the
locked - please file new issue/PR
I don't see where these With Functions are used, so removing them to
clean up code.
WithDefaultInfra* functions screwed me up and confused me.
[NO NEW TESTS NEEDED]
Signed-off-by: Daniel J Walsh [email protected]