Commit Graph

406 Commits (revert-14780-docker-cni)

Author SHA1 Message Date
Yanshu Zhao 0f734e6339 Change function name 2020-12-31 00:03:34 +00:00
Yanshu Zhao f94b1674b1 Change tests into a loop 2020-12-30 23:27:37 +00:00
Yanshu Zhao f044b1fa91 Add unit test for docker network inspect 2020-12-30 02:28:44 +00:00
Yanshu Zhao 4a940d0079 Fix docker inspect network go template 2020-12-27 08:38:39 +00:00
Priya Wadhwa a3b80e1fff add log 2020-12-22 14:57:04 -08:00
Priya Wadhwa bd413794c2 Avoid creating network if it is the default 2020-12-22 14:56:27 -08:00
Thomas Strömberg b4bf2bde33
Merge pull request #9866 from afbjorklund/podman-network-fix
Fix podman network inspect format and error
2020-12-11 10:20:46 -08:00
Anders F Björklund a6941f21ca Fix podman network inspect format and error
Somehow this ended up with the docker network inspect format,
instead of the CNI based one used by podman network inspect ?
2020-12-10 07:32:34 +01:00
Ling Samuel 634f0ae0a9
Remove verbose options 2020-12-10 14:29:38 +08:00
Medya Ghazizadeh 6eadee30b8
Merge pull request #9802 from afbjorklund/podman-host-cleanup
Some more cleanup of missing code for podman-env
2020-12-09 15:00:37 -08:00
Medya Ghazizadeh 0898ca21e4
Merge pull request #9801 from afbjorklund/podman-env-existing
Add support for restoring existing podman env
2020-12-08 10:25:50 -08:00
Anders F Björklund da778ea870 Some more cleanup of missing code for podman-env
There is a lot of code duplication from docker-env

Most of it also applies for podman (CONTAINER_HOST)
2020-11-29 23:35:37 +01:00
Anders F Björklund dae980a355 Add support for restoring existing podman env
If user had a podman environment configured before podman-env,
restore it on unset (similar to existing code for docker-env)
2020-11-29 22:56:47 +01:00
Anders F Björklund fee0f5310a Add private network implementation for podman
Most of it the same as docker, except for the options.

i.e. libnetwork "bridge" plugin vs. cni "bridge" plugin
2020-11-22 13:58:12 +01:00
Medya Ghazizadeh 131d7248c4
Merge pull request #9710 from valaparthvi/issue9690
convert dockerNetworkInspect to a struct
2020-11-20 14:16:01 -08:00
Parthvi Vala 63c186bb05 convert dockerNetworkInspect to a struct 2020-11-20 12:29:37 +05:30
Ilya Zuyev 0f2c63881a Merge branch 'master' into gh_9463_non_dev_dockerhost 2020-11-09 14:11:20 -08:00
Ilya Zuyev e58d538903 Fix linter warning 2020-11-09 12:52:27 -08:00
Ilya Zuyev d5a092c3c7 Add unit tests for oci.DaemonHost() 2020-10-30 14:00:52 -07:00
Ilya Zuyev c97cd912f1 Rename oci.RuntimeHost() -> oci.DaemonHost() 2020-10-30 13:44:34 -07:00
Ilya Zuyev 43a4b62b68 Remove excessive logging 2020-10-30 13:27:29 -07:00
Ilya Zuyev acbdafa4e1 Fix func naming 2020-10-27 16:07:50 -07:00
Medya Gh 9f729ac041 readability 2020-10-23 15:04:13 -07:00
Medya Gh 43c2a5cd0c dont pass mtu if 0 2020-10-23 14:54:49 -07:00
Medya Gh 4993dc6ed7 log 2020-10-23 14:25:00 -07:00
Medya Gh 1dd5583ce3 template 2020-10-23 14:07:20 -07:00
Medya Gh aa97aca2ff make struct for netinfo 2020-10-23 13:45:25 -07:00
Medya Gh 94485d5a19 lint 2020-10-23 12:47:51 -07:00
Medya Gh cde546ed80 detect MTU from docker brdige 2020-10-23 12:41:29 -07:00
Ilya Zuyev 6e02753204 Forward ports for docker machine on Linux 2020-10-22 22:41:58 -07:00
Ilya Zuyev 89bf9ac01c Update certs and API endpoints 2020-10-22 22:10:07 -07:00
Medya Gh 50a04a49d4 try 2020-10-22 17:33:33 -07:00
Medya Gh bfa83ff602 fix option 2020-10-22 16:56:13 -07:00
Medya Gh a6e5fb89d5 lower mtu for cloud shell 2020-10-22 16:05:06 -07:00
Ilya Zuyev eaa9ecfd31 Experiments 2020-10-22 13:41:01 -07:00
Ilya Zuyev 34a2dc7686 Delete test file 2020-10-22 13:37:05 -07:00
Ilya Zuyev 85d45be207 Fix docker-env command 2020-10-20 23:10:08 -07:00
Ilya Zuyev d384343c39 When configuring docker environment, use MINIKUBE_EXISTING_* variables if set 2020-10-19 22:02:42 -07:00
Nick Kubala fd15e50dbe
Fix typo (cointainer -> container) 2020-10-13 14:20:35 -07:00
Priya Modali 59548194bd Merge branch 'master' of https://github.com/kubernetes/minikube into klog 2020-10-09 17:45:35 -07:00
Priya Wadhwa acd5a7a4c8 address review comments 2020-10-09 14:16:35 -04:00
Priya Wadhwa 0985957032 Add further debugging for DRV_CP_ENDPOINT failure 2020-10-08 18:00:11 -04:00
Priya Modali ef2090ac31 Merge branch 'master' of https://github.com/kubernetes/minikube into klog 2020-10-08 10:27:04 -07:00
Priya Modali 3703f69c25 Applying klogFlags set via cobra. 2020-10-06 11:20:51 -07:00
Priya Wadhwa 4cff79008c fixed merge conflict 2020-10-05 11:47:53 -04:00
Priya Modali 43cc1a2581 Resolved merg conflicts. 2020-10-02 14:10:55 -07:00
Medya Gh 73d77e2463 address review comments 2020-09-30 16:42:42 -07:00
Medya Gh f807bcf8c9 remove kic test 2020-09-30 14:58:20 -07:00
Priya Wadhwa db23825bfc Move exit.Message function so that we aren't exiting from a library 2020-09-30 15:19:06 -04:00
Priya Modali 43ea47f4e0 Fixed merge conflicts. 2020-09-29 16:17:31 -07:00
Priya Modali 97d96bf925 Switching from glob library to klog library. 2020-09-29 15:49:41 -07:00
Medya Gh b84dedc652 address review comments 2020-09-29 15:07:06 -07:00
Medya Gh 82f39d1387 clarify comment 2020-09-29 14:29:34 -07:00
Medya Gh 058adb775c address review comments 2020-09-29 14:14:25 -07:00
Medya Gh b7780ec815 address review comments 2020-09-29 14:14:25 -07:00
Medya Gh f163cf9e15 update with new logic 2020-09-29 14:14:25 -07:00
Medya Gh 2766235a5c try alternate if no network 2020-09-29 14:14:25 -07:00
Medya Gh fa0afb220d lint 2020-09-29 14:14:25 -07:00
Medya Gh f0f10d6135 first version 2020-09-29 14:14:24 -07:00
Medya Gh 9cd42163b1 add network create funcs 2020-09-29 14:14:24 -07:00
Thomas Stromberg 91a32541e8 Use %d for exit code 2020-09-29 09:49:30 -07:00
Thomas Stromberg 8eaa3ee4f3 Use oci.CachedDaemonInfo for status check 2020-09-29 09:19:14 -07:00
Sharif Elgamal f097a0de12 dates, take two 2020-09-17 13:20:35 -07:00
Sharif Elgamal 775e047517 dates 2020-09-17 13:18:53 -07:00
Sharif Elgamal 3cb6ba0f75 actually add unit tests 2020-09-17 13:16:07 -07:00
Sharif Elgamal 84ee6d351b unit tests 2020-09-17 13:11:01 -07:00
Sharif Elgamal 39ae4fbdd2 check for windows style pathing with a regex 2020-09-17 12:15:54 -07:00
Sharif Elgamal 23e7989c07 Merge branch 'master' of github.com:kubernetes/minikube into windows-mount 2020-09-17 11:12:35 -07:00
Sharif Elgamal b98580c820 fix up if statement 2020-09-17 10:31:10 -07:00
Sharif Elgamal eab92dc455 Reduce cyclotomic complexity of CreateContainerNode to fix lint 2020-09-17 10:22:28 -07:00
Sharif Elgamal 4a004dd58e simplify more 2020-09-16 16:39:03 -07:00
Sharif Elgamal 14a5b0b264 simplify append 2020-09-16 16:04:10 -07:00
Sharif Elgamal 6e9b1b7bc0 fix mounting for docker driver in windows 2020-09-16 14:55:40 -07:00
Medya Ghazizadeh 44c6f36362
Merge pull request #9255 from afbjorklund/cpus-cfs
Make sure CFS_BANDWIDTH is available for --cpus
2020-09-15 16:07:12 -07:00
Anders F Björklund f718e39ab9 Make sure CFS_BANDWIDTH is available for --cpus 2020-09-15 12:54:39 +02:00
Anders F Björklund af5d6d060b Fix ForwardedPort for podman version 2.0.1 and up
Increasing Docker compatibility broke Podman v1
2020-09-13 22:17:36 +02:00
Sharif Elgamal ee5b8f130f
Merge pull request #8831 from priyawadhwa/overlay
Set preload=false if not using overlay2 as docker storage driver
2020-09-09 11:45:52 -07:00
Sharif Elgamal 3c86db01f4
Merge pull request #9166 from priyawadhwa/revert-static-ip
Revert static IP for docker
2020-09-02 15:49:40 -07:00
Thomas Strömberg 914f10b458
Merge pull request #9149 from tstromberg/docker-no-swap
Disable swap in Docker & podman containers
2020-09-02 14:55:44 -07:00
Priya Wadhwa 22b40e215a revert static IP 2020-09-02 16:33:38 -04:00
Priya Wadhwa ea5af644ec fix merge conflict 2020-09-02 09:31:42 -04:00
Thomas Strömberg 2dac55abf4
Merge pull request #9062 from kadern0/issue-8131
docker: Choose the appropriate bridge interface when multiple exist
2020-09-01 16:46:01 -07:00
Thomas Strömberg 8a26881552
Merge pull request #8159 from Asarew/docker-host-volumes
Support for mounting host volumes on start with docker driver
2020-09-01 16:30:45 -07:00
Pablo Caderno 0408d3ba1a Added code to inspect docker networks to get the bridgeID correctly
Signed-off-by: Pablo Caderno <kaderno@gmail.com>
2020-09-02 08:44:07 +10:00
Thomas Stromberg 7fc0299c6f Disable swap in Docker/podman by setting --memory-swap to --memory 2020-09-01 13:57:52 -07:00
Thomas Stromberg 2c5e8fdaee Add detailed JSON & status codes for all error paths 2020-08-30 17:25:11 -07:00
Priya Wadhwa d634a85ff9 use daemon info so this works for docker and podman 2020-08-24 17:50:09 -04:00
Priya Wadhwa 535294e523 fixed merge conflict 2020-08-24 17:35:03 -04:00
Medya Gh 56691f839c add swarm and storage driver to DaemonInfo 2020-08-19 15:38:56 -07:00
Priya Wadhwa 52953bac93 Merge branch 'master' of github.com:kubernetes/minikube into kic-add-static-ip 2020-08-12 14:03:43 -07:00
Priya Wadhwa a949f9ca7b improvement 2020-08-12 12:58:21 -07:00
Priya Wadhwa bdb59c2598 lint 2020-08-12 12:56:07 -07:00
Priya Wadhwa dfa05d714e include gateway when creating custom network 2020-08-12 12:54:06 -07:00
Priya Wadhwa af94e0a0c5 add logging 2020-08-12 10:57:48 -07:00
Priya Wadhwa 2400d1b850 remove network correctly 2020-08-12 10:08:46 -07:00
Priya Wadhwa 69d21df7c5 make sure we use custom network if it exists 2020-08-12 12:45:49 -04:00
Priya Wadhwa 3b5f973459 make sure we delete networks correctly 2020-08-12 12:36:57 -04:00
Medya Ghazizadeh 51bbba9bdc
Merge pull request #8973 from medyagh/daemon_info_unittest
add unit test for daemon info
2020-08-11 15:50:02 -07:00
Medya Gh f20d3bddf0 add boilerplate 2020-08-11 15:13:16 -07:00
Medya Gh 25dc0cd0f7 lint 2020-08-11 15:03:10 -07:00
Medya Gh f8d932e697 use mock funcs 2020-08-11 14:55:30 -07:00
Medya Gh 4c0334d91f add one more case 2020-08-11 13:10:17 -07:00
Medya Gh a9eec3ca7b add unit test for daemon info 2020-08-11 13:06:50 -07:00
Medya Gh 7463eda122 remvoe comment 2020-08-11 10:40:40 -07:00
Medya Gh 1d94fa911a ensure nil error is returned 2020-08-11 10:40:40 -07:00
Medya Gh bbc58fa194 refresh daemon info cache if there is error 2020-08-11 10:40:40 -07:00
Priya Wadhwa 21789d8c4e compile 2020-08-10 17:18:42 -04:00
Priya Wadhwa dfcfd6f2f0 cleanup 2020-08-10 17:15:26 -04:00
Priya Wadhwa 9dcb0c5478 fix merge conflict 2020-08-10 17:12:56 -04:00
Priya Wadhwa 5799b47ddb Implement some checks and reorganize code 2020-08-10 17:04:41 -04:00
Priya Wadhwa 9680237277 WIP 2020-07-27 14:24:40 -04:00
Thomas Stromberg 9c0618f102 Merge to master 2020-07-24 11:22:59 -07:00
Thomas Stromberg bd713ffd45 Increase maximum container startup wait from 13 seconds to 25 seconds 2020-07-24 09:02:32 -07:00
Thomas Stromberg dee9c0b427 Show 'docker logs' excerpt if container dies 2020-07-24 08:58:09 -07:00
Medya Ghazizadeh f04a6a061f
Merge pull request #8586 from afbjorklund/container-id
Support more error messages for container inspect
2020-07-21 12:22:31 -07:00
Medya Ghazizadeh 2086bcb2b1
Merge pull request #8718 from medyagh/check_docker_deskop
docker/podman: warn if allocated memory is below limit
2020-07-20 15:26:41 -07:00
Medya Gh 13357d91a4 avoid nil pointer 2020-07-20 12:56:03 -07:00
Anders F Björklund 22585c3a17 Use the preload container run for podman as well
Now that there is no more race between the containers for
preparing the volume, we can use it for podman as well...

Previously we risked ending up with not copying the contents
of /var from the container image, which made it not work.
2020-07-20 21:54:28 +02:00
Anders F Björklund 2a9e9b2425 Make sure to prepare the kic volume after creation
The volume is created as empty, so make sure that we run a
container to do the initial copy of /var from the image.

This is to avoid race conditions later on, where the preload
starts to use the created volume for packing up the tarball.
2020-07-20 21:50:13 +02:00
Jose Donizetti c2175abcba Add static ip to kic/docker 2020-07-18 18:19:53 -03:00
Medya Gh 3aac9a3fff remove duplicate return statement 2020-07-15 14:24:42 -07:00
Medya Gh 8ecb483cb7 use cached error 2020-07-15 14:23:25 -07:00
Medya Gh 7bbb0b6250 spell 2020-07-15 14:09:35 -07:00
Medya Gh de6c10526b move cacheDaemoninfo to oci package 2020-07-15 14:07:50 -07:00
Sharif Elgamal d0d3973a13 restrict apparmor security opt to docker 2020-07-09 12:58:01 -07:00
Asare Worae 7bcae732bf resolved merge conflicts 2020-06-30 10:00:52 +02:00
Anders F Björklund f23bbea995 Support more error messages for container inspect
The messages are different between "inspect" and "container inspect",
and also changed a bit in format between Podman v1 and Podman v2.

Support all of them, for compatibility with different versions of
Docker and Podman. Was causing restarts and failures, with KIC.
2020-06-28 14:19:09 +02:00
Priya Wadhwa 7c2cac612d Fix bug in FailFastError and add unit test
Since FailFastError was just another `error`, all errors were technically `FailFastErrors`.

This code makes `FailFastError` a struct which implements the error interface, so that now errors can be distinctly identified as `FailFastError`'

Also added a unit test to prove that this works now.
2020-06-26 11:58:34 -07:00
Priya Wadhwa e32e2135ed review comments 2020-06-25 19:39:59 -07:00
Priya Wadhwa 903686172d Check for iptables file before determining container is running 2020-06-25 17:58:22 -07:00
Medya Gh e91e11eeba address review comments 2020-06-17 18:32:11 -07:00
Medya Gh 29e01d5dcb fix comment 2020-06-17 15:17:45 -07:00
Medya Gh ca2d0f97ec move advice to its own file 2020-06-17 15:07:17 -07:00
Medya Gh 543b0b5bfa add post mortem logs when container not running 2020-06-17 13:27:17 -07:00
Medya Gh 736f5219e0 add error type for check running 2020-06-17 12:13:12 -07:00
Medya Gh 56b5524c8e address review comments 2020-06-16 14:57:19 -07:00
Medya Gh 4caf260279 add cpu count limit error type for kic drivers 2020-06-16 13:21:56 -07:00
Priya Wadhwa 6ef48499b4 Code review comments 2020-06-12 11:00:46 -07:00
Priya Wadhwa b750ab4964 fix lint 2020-06-11 13:00:46 -07:00
Priya Wadhwa 330224f36a Warn user to restart daemon if context deadline is exceeded 2020-06-11 12:50:11 -07:00
Priya Wadhwa 0ec839186d Change glog.Errorf to glog.Infof so that we don't get an ugly log to stdout 2020-06-11 11:14:04 -07:00
Anders F Björklund 14937e4677 Never use docker inspect, always provide the type
Should avoid errors like: map has no entry for key "State"

When inspecting a volume, rather than a container or image
2020-05-21 17:20:53 +02:00
Asare Worae 59de926bf1 updated --docker-volume flag description and ran docs generator 2020-05-15 12:03:56 +02:00
Asare Worae 1909c4bb7c add support for `--docker-volume` command line flag to mount host volumes on start 2020-05-15 11:44:24 +02:00
Medya Ghazizadeh afab7c87c6
Merge pull request #7959 from afbjorklund/podman-prompt
Use noninteractive sudo when running podman
2020-05-11 21:02:22 +00:00
Medya Ghazizadeh 6b97ee8ee2
Merge pull request #8001 from afbjorklund/podman-start
podman: Wrap the start command with cgroup manager too
2020-05-11 17:59:39 +00:00
Anders F Björklund c578a7aa1e Add a PointToHost function for podman as well
And add an active variable, similiar to docker
2020-05-10 23:07:12 +02:00
Medya Ghazizadeh 7e3da0f8b0
Merge pull request #8017 from elegos/podman-volumes-extract-tarball-to-volume
Podman: disable selinux labels when extracting the tarball (permissions error)
2020-05-09 21:35:43 +00:00
Anders F Björklund 46025eccf5 Use the runCmd wrapper for start to not miss error 2020-05-09 14:07:18 +02:00
Anders F Björklund ac01e92012 Add comment about why podman looks at runtime.GOOS 2020-05-09 14:05:57 +02:00