Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid using container/podman in manager.go #3425

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Avoid using container/podman in manager.go #3425

merged 1 commit into from
Oct 31, 2023

Conversation

dims
Copy link
Collaborator

@dims dims commented Oct 31, 2023

Doing this drags in all sorts of dependencies into kubernetes which we do not need or want.

$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	new file:   LICENSES/vendor/github.com/docker/distribution/LICENSE
	new file:   LICENSES/vendor/github.com/docker/docker/LICENSE
	new file:   LICENSES/vendor/github.com/docker/go-connections/LICENSE
	new file:   LICENSES/vendor/github.com/opencontainers/image-spec/LICENSE
	modified:   go.mod
	modified:   go.sum
	new file:   vendor/github.com/docker/distribution/LICENSE
	new file:   vendor/github.com/docker/distribution/digestset/set.go
	new file:   vendor/github.com/docker/distribution/reference/helpers.go
	new file:   vendor/github.com/docker/distribution/reference/normalize.go
	new file:   vendor/github.com/docker/distribution/reference/reference.go
	new file:   vendor/github.com/docker/distribution/reference/regexp.go
	new file:   vendor/github.com/docker/docker/AUTHORS
	new file:   vendor/github.com/docker/docker/LICENSE
	new file:   vendor/github.com/docker/docker/NOTICE
	new file:   vendor/github.com/docker/docker/api/README.md
	new file:   vendor/github.com/docker/docker/api/common.go
	new file:   vendor/github.com/docker/docker/api/common_unix.go
	new file:   vendor/github.com/docker/docker/api/common_windows.go
	new file:   vendor/github.com/docker/docker/api/swagger-gen.yaml
	new file:   vendor/github.com/docker/docker/api/swagger.yaml
	new file:   vendor/github.com/docker/docker/api/types/auth.go
	new file:   vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
	new file:   vendor/github.com/docker/docker/api/types/client.go
	new file:   vendor/github.com/docker/docker/api/types/configs.go
	new file:   vendor/github.com/docker/docker/api/types/container/config.go
	new file:   vendor/github.com/docker/docker/api/types/container/container_changes.go
	new file:   vendor/github.com/docker/docker/api/types/container/container_create.go
	new file:   vendor/github.com/docker/docker/api/types/container/container_top.go
	new file:   vendor/github.com/docker/docker/api/types/container/container_update.go
	new file:   vendor/github.com/docker/docker/api/types/container/container_wait.go
	new file:   vendor/github.com/docker/docker/api/types/container/host_config.go
	new file:   vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
	new file:   vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
	new file:   vendor/github.com/docker/docker/api/types/container/waitcondition.go
	new file:   vendor/github.com/docker/docker/api/types/error_response.go
	new file:   vendor/github.com/docker/docker/api/types/error_response_ext.go
	new file:   vendor/github.com/docker/docker/api/types/events/events.go
	new file:   vendor/github.com/docker/docker/api/types/filters/parse.go
	new file:   vendor/github.com/docker/docker/api/types/graph_driver_data.go
	new file:   vendor/github.com/docker/docker/api/types/id_response.go
	new file:   vendor/github.com/docker/docker/api/types/image/image_history.go
	new file:   vendor/github.com/docker/docker/api/types/image_delete_response_item.go
	new file:   vendor/github.com/docker/docker/api/types/image_summary.go
	new file:   vendor/github.com/docker/docker/api/types/mount/mount.go
	new file:   vendor/github.com/docker/docker/api/types/network/network.go
	new file:   vendor/github.com/docker/docker/api/types/plugin.go
	new file:   vendor/github.com/docker/docker/api/types/plugin_device.go
	new file:   vendor/github.com/docker/docker/api/types/plugin_env.go
	new file:   vendor/github.com/docker/docker/api/types/plugin_interface_type.go
	new file:   vendor/github.com/docker/docker/api/types/plugin_mount.go
	new file:   vendor/github.com/docker/docker/api/types/plugin_responses.go
	new file:   vendor/github.com/docker/docker/api/types/port.go
	new file:   vendor/github.com/docker/docker/api/types/registry/authenticate.go
	new file:   vendor/github.com/docker/docker/api/types/registry/registry.go
	new file:   vendor/github.com/docker/docker/api/types/service_update_response.go
	new file:   vendor/github.com/docker/docker/api/types/stats.go
	new file:   vendor/github.com/docker/docker/api/types/strslice/strslice.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/common.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/config.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/container.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/network.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/node.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/runtime.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/runtime/gen.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/runtime/plugin.pb.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/runtime/plugin.proto
	new file:   vendor/github.com/docker/docker/api/types/swarm/secret.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/service.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/swarm.go
	new file:   vendor/github.com/docker/docker/api/types/swarm/task.go
	new file:   vendor/github.com/docker/docker/api/types/time/duration_convert.go
	new file:   vendor/github.com/docker/docker/api/types/time/timestamp.go
	new file:   vendor/github.com/docker/docker/api/types/types.go
	new file:   vendor/github.com/docker/docker/api/types/versions/README.md
	new file:   vendor/github.com/docker/docker/api/types/versions/compare.go
	new file:   vendor/github.com/docker/docker/api/types/volume.go
	new file:   vendor/github.com/docker/docker/api/types/volume/volume_create.go
	new file:   vendor/github.com/docker/docker/api/types/volume/volume_list.go
	new file:   vendor/github.com/docker/docker/client/README.md
	new file:   vendor/github.com/docker/docker/client/build_cancel.go
	new file:   vendor/github.com/docker/docker/client/build_prune.go
	new file:   vendor/github.com/docker/docker/client/checkpoint_create.go
	new file:   vendor/github.com/docker/docker/client/checkpoint_delete.go
	new file:   vendor/github.com/docker/docker/client/checkpoint_list.go
	new file:   vendor/github.com/docker/docker/client/client.go
	new file:   vendor/github.com/docker/docker/client/client_deprecated.go
	new file:   vendor/github.com/docker/docker/client/client_unix.go
	new file:   vendor/github.com/docker/docker/client/client_windows.go
	new file:   vendor/github.com/docker/docker/client/config_create.go
	new file:   vendor/github.com/docker/docker/client/config_inspect.go
	new file:   vendor/github.com/docker/docker/client/config_list.go
	new file:   vendor/github.com/docker/docker/client/config_remove.go
	new file:   vendor/github.com/docker/docker/client/config_update.go
	new file:   vendor/github.com/docker/docker/client/container_attach.go
	new file:   vendor/github.com/docker/docker/client/container_commit.go
	new file:   vendor/github.com/docker/docker/client/container_copy.go
	new file:   vendor/github.com/docker/docker/client/container_create.go
	new file:   vendor/github.com/docker/docker/client/container_diff.go
	new file:   vendor/github.com/docker/docker/client/container_exec.go
	new file:   vendor/github.com/docker/docker/client/container_export.go
	new file:   vendor/github.com/docker/docker/client/container_inspect.go
	new file:   vendor/github.com/docker/docker/client/container_kill.go
	new file:   vendor/github.com/docker/docker/client/container_list.go
	new file:   vendor/github.com/docker/docker/client/container_logs.go
	new file:   vendor/github.com/docker/docker/client/container_pause.go
	new file:   vendor/github.com/docker/docker/client/container_prune.go
	new file:   vendor/github.com/docker/docker/client/container_remove.go
	new file:   vendor/github.com/docker/docker/client/container_rename.go
	new file:   vendor/github.com/docker/docker/client/container_resize.go
	new file:   vendor/github.com/docker/docker/client/container_restart.go
	new file:   vendor/github.com/docker/docker/client/container_start.go
	new file:   vendor/github.com/docker/docker/client/container_stats.go
	new file:   vendor/github.com/docker/docker/client/container_stop.go
	new file:   vendor/github.com/docker/docker/client/container_top.go
	new file:   vendor/github.com/docker/docker/client/container_unpause.go
	new file:   vendor/github.com/docker/docker/client/container_update.go
	new file:   vendor/github.com/docker/docker/client/container_wait.go
	new file:   vendor/github.com/docker/docker/client/disk_usage.go
	new file:   vendor/github.com/docker/docker/client/distribution_inspect.go
	new file:   vendor/github.com/docker/docker/client/errors.go
	new file:   vendor/github.com/docker/docker/client/events.go
	new file:   vendor/github.com/docker/docker/client/hijack.go
	new file:   vendor/github.com/docker/docker/client/image_build.go
	new file:   vendor/github.com/docker/docker/client/image_create.go
	new file:   vendor/github.com/docker/docker/client/image_history.go
	new file:   vendor/github.com/docker/docker/client/image_import.go
	new file:   vendor/github.com/docker/docker/client/image_inspect.go
	new file:   vendor/github.com/docker/docker/client/image_list.go
	new file:   vendor/github.com/docker/docker/client/image_load.go
	new file:   vendor/github.com/docker/docker/client/image_prune.go
	new file:   vendor/github.com/docker/docker/client/image_pull.go
	new file:   vendor/github.com/docker/docker/client/image_push.go
	new file:   vendor/github.com/docker/docker/client/image_remove.go
	new file:   vendor/github.com/docker/docker/client/image_save.go
	new file:   vendor/github.com/docker/docker/client/image_search.go
	new file:   vendor/github.com/docker/docker/client/image_tag.go
	new file:   vendor/github.com/docker/docker/client/info.go
	new file:   vendor/github.com/docker/docker/client/interface.go
	new file:   vendor/github.com/docker/docker/client/interface_experimental.go
	new file:   vendor/github.com/docker/docker/client/interface_stable.go
	new file:   vendor/github.com/docker/docker/client/login.go
	new file:   vendor/github.com/docker/docker/client/network_connect.go
	new file:   vendor/github.com/docker/docker/client/network_create.go
	new file:   vendor/github.com/docker/docker/client/network_disconnect.go
	new file:   vendor/github.com/docker/docker/client/network_inspect.go
	new file:   vendor/github.com/docker/docker/client/network_list.go
	new file:   vendor/github.com/docker/docker/client/network_prune.go
	new file:   vendor/github.com/docker/docker/client/network_remove.go
	new file:   vendor/github.com/docker/docker/client/node_inspect.go
	new file:   vendor/github.com/docker/docker/client/node_list.go
	new file:   vendor/github.com/docker/docker/client/node_remove.go
	new file:   vendor/github.com/docker/docker/client/node_update.go
	new file:   vendor/github.com/docker/docker/client/options.go
	new file:   vendor/github.com/docker/docker/client/ping.go
	new file:   vendor/github.com/docker/docker/client/plugin_create.go
	new file:   vendor/github.com/docker/docker/client/plugin_disable.go
	new file:   vendor/github.com/docker/docker/client/plugin_enable.go
	new file:   vendor/github.com/docker/docker/client/plugin_inspect.go
	new file:   vendor/github.com/docker/docker/client/plugin_install.go
	new file:   vendor/github.com/docker/docker/client/plugin_list.go
	new file:   vendor/github.com/docker/docker/client/plugin_push.go
	new file:   vendor/github.com/docker/docker/client/plugin_remove.go
	new file:   vendor/github.com/docker/docker/client/plugin_set.go
	new file:   vendor/github.com/docker/docker/client/plugin_upgrade.go
	new file:   vendor/github.com/docker/docker/client/request.go
	new file:   vendor/github.com/docker/docker/client/secret_create.go
	new file:   vendor/github.com/docker/docker/client/secret_inspect.go
	new file:   vendor/github.com/docker/docker/client/secret_list.go
	new file:   vendor/github.com/docker/docker/client/secret_remove.go
	new file:   vendor/github.com/docker/docker/client/secret_update.go
	new file:   vendor/github.com/docker/docker/client/service_create.go
	new file:   vendor/github.com/docker/docker/client/service_inspect.go
	new file:   vendor/github.com/docker/docker/client/service_list.go
	new file:   vendor/github.com/docker/docker/client/service_logs.go
	new file:   vendor/github.com/docker/docker/client/service_remove.go
	new file:   vendor/github.com/docker/docker/client/service_update.go
	new file:   vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
	new file:   vendor/github.com/docker/docker/client/swarm_init.go
	new file:   vendor/github.com/docker/docker/client/swarm_inspect.go
	new file:   vendor/github.com/docker/docker/client/swarm_join.go
	new file:   vendor/github.com/docker/docker/client/swarm_leave.go
	new file:   vendor/github.com/docker/docker/client/swarm_unlock.go
	new file:   vendor/github.com/docker/docker/client/swarm_update.go
	new file:   vendor/github.com/docker/docker/client/task_inspect.go
	new file:   vendor/github.com/docker/docker/client/task_list.go
	new file:   vendor/github.com/docker/docker/client/task_logs.go
	new file:   vendor/github.com/docker/docker/client/transport.go
	new file:   vendor/github.com/docker/docker/client/utils.go
	new file:   vendor/github.com/docker/docker/client/version.go
	new file:   vendor/github.com/docker/docker/client/volume_create.go
	new file:   vendor/github.com/docker/docker/client/volume_inspect.go
	new file:   vendor/github.com/docker/docker/client/volume_list.go
	new file:   vendor/github.com/docker/docker/client/volume_prune.go
	new file:   vendor/github.com/docker/docker/client/volume_remove.go
	new file:   vendor/github.com/docker/docker/errdefs/defs.go
	new file:   vendor/github.com/docker/docker/errdefs/doc.go
	new file:   vendor/github.com/docker/docker/errdefs/helpers.go
	new file:   vendor/github.com/docker/docker/errdefs/http_helpers.go
	new file:   vendor/github.com/docker/docker/errdefs/is.go
	new file:   vendor/github.com/docker/go-connections/LICENSE
	new file:   vendor/github.com/docker/go-connections/nat/nat.go
	new file:   vendor/github.com/docker/go-connections/nat/parse.go
	new file:   vendor/github.com/docker/go-connections/nat/sort.go
	new file:   vendor/github.com/docker/go-connections/sockets/README.md
	new file:   vendor/github.com/docker/go-connections/sockets/inmem_socket.go
	new file:   vendor/github.com/docker/go-connections/sockets/proxy.go
	new file:   vendor/github.com/docker/go-connections/sockets/sockets.go
	new file:   vendor/github.com/docker/go-connections/sockets/sockets_unix.go
	new file:   vendor/github.com/docker/go-connections/sockets/sockets_windows.go
	new file:   vendor/github.com/docker/go-connections/sockets/tcp_socket.go
	new file:   vendor/github.com/docker/go-connections/sockets/unix_socket.go
	new file:   vendor/github.com/docker/go-connections/tlsconfig/certpool_go17.go
	new file:   vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go
	new file:   vendor/github.com/docker/go-connections/tlsconfig/config.go
	new file:   vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go
	new file:   vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go
	modified:   vendor/github.com/google/cadvisor/client/v2/client.go
	modified:   vendor/github.com/google/cadvisor/collector/generic_collector.go
	modified:   vendor/github.com/google/cadvisor/container/common/container_hints.go
	modified:   vendor/github.com/google/cadvisor/container/common/helpers.go
	modified:   vendor/github.com/google/cadvisor/container/container.go
	modified:   vendor/github.com/google/cadvisor/container/containerd/client.go
	modified:   vendor/github.com/google/cadvisor/container/containerd/handler.go
	modified:   vendor/github.com/google/cadvisor/container/crio/client.go
	modified:   vendor/github.com/google/cadvisor/container/crio/handler.go
	new file:   vendor/github.com/google/cadvisor/container/docker/client.go
	new file:   vendor/github.com/google/cadvisor/container/docker/docker.go
	new file:   vendor/github.com/google/cadvisor/container/docker/factory.go
	new file:   vendor/github.com/google/cadvisor/container/docker/fs.go
	new file:   vendor/github.com/google/cadvisor/container/docker/handler.go
	new file:   vendor/github.com/google/cadvisor/container/docker/plugin.go
	new file:   vendor/github.com/google/cadvisor/container/docker/utils/docker.go
	modified:   vendor/github.com/google/cadvisor/container/factory.go
	modified:   vendor/github.com/google/cadvisor/container/libcontainer/handler.go
	new file:   vendor/github.com/google/cadvisor/container/podman/client.go
	new file:   vendor/github.com/google/cadvisor/container/podman/factory.go
	new file:   vendor/github.com/google/cadvisor/container/podman/fs.go
	new file:   vendor/github.com/google/cadvisor/container/podman/handler.go
	new file:   vendor/github.com/google/cadvisor/container/podman/plugin.go
	new file:   vendor/github.com/google/cadvisor/container/podman/podman.go
	modified:   vendor/github.com/google/cadvisor/container/raw/watcher.go
	modified:   vendor/github.com/google/cadvisor/fs/fs.go
	modified:   vendor/github.com/google/cadvisor/fs/types.go
	modified:   vendor/github.com/google/cadvisor/info/v1/container.go
	modified:   vendor/github.com/google/cadvisor/info/v2/container.go
	modified:   vendor/github.com/google/cadvisor/machine/info.go
	modified:   vendor/github.com/google/cadvisor/machine/machine.go
	modified:   vendor/github.com/google/cadvisor/machine/operatingsystem_unix.go
	modified:   vendor/github.com/google/cadvisor/manager/container.go
	modified:   vendor/github.com/google/cadvisor/manager/manager.go
	modified:   vendor/github.com/google/cadvisor/metrics/prometheus.go
	modified:   vendor/github.com/google/cadvisor/metrics/prometheus_fake.go
	modified:   vendor/github.com/google/cadvisor/metrics/prometheus_machine.go
	modified:   vendor/github.com/google/cadvisor/nvm/machine_libipmctl.go
	modified:   vendor/github.com/google/cadvisor/perf/collector_libpfm.go
	modified:   vendor/github.com/google/cadvisor/perf/uncore_libpfm.go
	modified:   vendor/github.com/google/cadvisor/resctrl/utils.go
	modified:   vendor/github.com/google/cadvisor/summary/summary.go
	modified:   vendor/github.com/google/cadvisor/utils/cloudinfo/azure/azure.go
	modified:   vendor/github.com/google/cadvisor/utils/cloudinfo/gce/gce.go
	modified:   vendor/github.com/google/cadvisor/utils/sysfs/sysfs.go
	modified:   vendor/github.com/google/cadvisor/utils/sysinfo/sysinfo.go
	new file:   vendor/github.com/google/cadvisor/zfs/watcher.go
	new file:   vendor/github.com/opencontainers/image-spec/LICENSE
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/annotations.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/layout.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/version.go
	new file:   vendor/github.com/opencontainers/image-spec/specs-go/versioned.go
	modified:   vendor/modules.txt

@dims
Avoid using container/podman in manager.go
e6ca82b 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
Creatone
Creatone approved these changes Oct 31, 2023
View reviewed changes
Copy link
Collaborator

@Creatone Creatone left a comment

Choose a reason for hiding this comment

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

LGTM

@dims
Copy link
Collaborator Author

dims commented Oct 31, 2023

/override pull-cadvisor-e2e

@Creatone Creatone merged commit 2129e1c into google:master Oct 31, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Creatone Creatone Creatone approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dims @Creatone