diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go index e2d0097f5..522f99b8b 100644 --- a/cmd/containerd/command/config.go +++ b/cmd/containerd/command/config.go @@ -92,6 +92,10 @@ func outputConfig(cfg *srvconfig.Config) error { return err } +func defaultConfig() *srvconfig.Config { + return platformAgnosticDefaultConfig() +} + var configCommand = cli.Command{ Name: "config", Usage: "information on the containerd config", diff --git a/cmd/containerd/command/config_linux.go b/cmd/containerd/command/config_linux.go deleted file mode 100644 index df8e856cf..000000000 --- a/cmd/containerd/command/config_linux.go +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package command - -import ( - srvconfig "github.com/containerd/containerd/services/server/config" -) - -func defaultConfig() *srvconfig.Config { - return platformAgnosticDefaultConfig() -} diff --git a/cmd/containerd/command/config_unsupported.go b/cmd/containerd/command/config_unsupported.go deleted file mode 100644 index 3d935dede..000000000 --- a/cmd/containerd/command/config_unsupported.go +++ /dev/null @@ -1,34 +0,0 @@ -//go:build !linux && !windows && !solaris -// +build !linux,!windows,!solaris - -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package command - -import ( - "github.com/containerd/containerd/defaults" - srvconfig "github.com/containerd/containerd/services/server/config" -) - -func defaultConfig() *srvconfig.Config { - cfg := platformAgnosticDefaultConfig() - cfg.Debug = srvconfig.Debug{ - Level: "info", - Address: defaults.DefaultDebugAddress, - } - return cfg -} diff --git a/cmd/containerd/command/config_windows.go b/cmd/containerd/command/config_windows.go deleted file mode 100644 index df8e856cf..000000000 --- a/cmd/containerd/command/config_windows.go +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package command - -import ( - srvconfig "github.com/containerd/containerd/services/server/config" -) - -func defaultConfig() *srvconfig.Config { - return platformAgnosticDefaultConfig() -}