238 Commits

Author SHA1 Message Date
iwilltry42
33b79b1567 Merge branch 'master' of https://github.com/rancher/k3d v1.3.1 2019-07-30 10:37:22 +02:00
iwilltry42
205a521c81 go mod tidy 2019-07-30 10:36:49 +02:00
iwilltry42
02edf64818 go mod tidy 2019-07-30 10:35:34 +02:00
Andy Zhou
e56be1344e
Merge pull request #94 from wxdao/fix-docker
Upgrade Docker SDK
2019-07-26 10:44:10 -07:00
iwilltry42
4ac84e147b Merge branch 'master' of https://github.com/rancher/k3d 2019-07-25 15:40:28 +02:00
iwilltry42
4747e8fdc3 add warning message for debugging tag issue 2019-07-25 15:40:17 +02:00
iwilltry42
238a07f8ff add warning message for debugging tag issue 2019-07-25 15:40:07 +02:00
Thorsten Klein
f0d05479f6
Merge pull request #95 from asksven/master
[Doc] Added doc for running a local unsecure registry (@asksven)
2019-07-25 14:36:43 +02:00
iwilltry42
4701a8b65f make make error out if no K3S_TAG was found or set 2019-07-25 13:11:34 +02:00
Sven Knispel
9e2152a540 Incorporated feedback from PR-review 2019-07-25 13:07:44 +02:00
Sven Knispel
8cf155fc91 [Doc] Added doc for running a local unsecure registry 2019-07-25 10:40:18 +02:00
wxdao
058bb1d9e4 Use client.WithAPIVersionNegotiation() 2019-07-25 06:42:31 +00:00
wxdao
c1263487a5 Upgrade docker sdk 2019-07-25 03:15:28 +00:00
Thorsten Klein
c5e5adb0e2
Merge pull request #91 from rancher/feature/import-images-helper
[Feature] import images from docker daemon into k3d using a helper container
v1.3.0
2019-07-23 19:26:01 +02:00
iwilltry42
96c883a10a cleanup tools container using defer 2019-07-17 09:32:46 +02:00
iwilltry42
081ec611bc --keep flag to not remove the tarball after import 2019-07-11 15:43:49 +02:00
iwilltry42
a4c75c6568 use a tools container 2019-07-10 18:23:47 +02:00
iwilltry42
89c318f478 merge 2019-07-09 11:18:13 +02:00
iwilltry42
7f87e04ecf update README 2019-07-09 11:15:56 +02:00
iwilltry42
c257be4960 update README 2019-07-09 11:14:36 +02:00
iwilltry42
07e458d6f1 test 2019-07-08 09:59:01 +02:00
iwilltry42
036a8a9fd0 Merge branch 'feature/load-images' of https://github.com/rancher/k3d into feature/load-images 2019-07-08 09:58:33 +02:00
iwilltry42
f670dde640 test 2019-07-08 09:58:26 +02:00
Andy Zhou
6060d46ab2
Merge pull request #88 from darobs/darobs/invert-timeout-logic
Fix inverted timeout logic on create.
2019-07-03 19:43:06 -07:00
Ubuntu
4bde59702d error should occur when current time is after start+timout 2019-07-04 02:12:40 +00:00
iwilltry42
93fa5630ac create named volume 2019-07-03 16:51:41 +02:00
iwilltry42
cbdeea3bfa create named volume 2019-07-03 16:50:02 +02:00
iwilltry42
deccb0122a enable importing multiple images at once v1.3.0-dev.0 2019-07-01 12:17:03 +02:00
iwilltry42
ab2c54ca1d add import-image command for importing single image 2019-07-01 11:31:35 +02:00
Thorsten Klein
341f0b3cbe
Merge pull request #80 from andyz-dev/ignore-docker-machine
[Enhancement] Ignore docker-machine command line error (@andyz-dev)
2019-06-29 11:08:40 +02:00
Andy Zhou
7d42a4ebd1 Ignore docker-machine command line error
It turns out that docker client only pays attention to the following
environment variables:

DOCKER_HOST to set the url to the docker server.
DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest.
DOCKER_CERT_PATH to load the TLS certificates from.
DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default.

A miss configured DOCKER_MACHINE_NAME won't affect docker client, so k3d
should just ignore the error.
2019-06-14 12:51:32 -07:00
Andy Zhou
bd5d7a6268
Merge pull request #79 from andyz-dev/extra-log
[Enhancement] Log more information when the docker-machine command fails
2019-06-14 07:55:36 -07:00
Andy Zhou
aa6e142b81 Log more information when the docker-machine command fails
Currently, when the 'docker-machine' command fails, we only logs

   "exit status 1'

Which is not very helpful in root cause analysis.

With this patch, the 'docker-machine' command's stderr output is also
logged.

  # To cause docker-machine command fail
  $ export DOCKER_MACHINE_NAME=xx
  $ k3d create
2019/06/13 16:45:31 Created cluster network with ID 6fc91e0e5e912443e6b847f113a6a0bb85ccd610e5232592296d4b199f0347cf
2019/06/13 16:45:31 Error executing 'docker-machine ip'
2019/06/13 16:45:31 Docker machine "xx" does not exist. Use "docker-machine ls" to list machines. Use "docker-machine create" to add a new one.
exit status 1
2019-06-13 16:47:27 -07:00
Thorsten Klein
5ebe276162
Merge pull request #76 from andyz-dev/no-timeout
[Enhancement] Deprecate --timeout, shift short hand options around
v1.2.2
2019-06-07 15:00:32 +02:00
Andy Zhou
f037e1b225 Deprecate --timeout, shift shot hand options around
We have been giving user warnings about --timeout going away for a
while. Now fully deprecate it.

Use -t for --wait option

Move -w from --wait to --workers. Many users of K3d generate multi-node
clusters, -w will make their life easier.
2019-06-06 12:26:26 -07:00
Andy Zhou
8a59078c87
Merge pull request #75 from andyz-dev/api-port
[Enhancement] Api port
2019-06-06 06:55:30 -07:00
Andy Zhou
fa18c37155 Simplify Dockerm machine ip handling
Based on review comments from @iwilltry42
2019-06-05 09:18:57 -07:00
Andy Zhou
fc6a01d55a Allow --api-port to take host with either name or IP address
To allow some flexibilities in how user specifies the --api-port
argument.  In case the 'host' is an string, We will try to convert
it into an IP address for port mapping. IP address is also allowed.
2019-06-03 17:51:55 -07:00
Andy Zhou
1080c0b157 Fix up kubeconfig.yaml with --api-port host 2019-06-03 17:51:55 -07:00
Andy Zhou
a72945af71 Enhance docekr port mapping for --api-port 2019-06-03 17:51:55 -07:00
Andy Zhou
58849e4a01 Make use of the parseApiPort() function when creating cluster 2019-06-03 17:51:55 -07:00
Andy Zhou
1e6ac3cce8 Enhance ClusterSpec
Pass the apiPort sturct directly via ClusterSpec.
2019-06-03 17:22:23 -07:00
Andy Zhou
f0c1b24e0b Add parseApiPort()
Now that --api-port takes a string argument, add a parser function to
handle error checking for this argument.
2019-06-03 17:21:44 -07:00
Andy Zhou
b97ef230bd Refactor
The APIs of createServer() and createWorker() takes too many arguments.
It is getting harder to maintain.

Use a new struct ClusterSpec to make API simpler. This also reduces
some code duplications.
2019-06-03 17:18:51 -07:00
Andy Zhou
1565e43365 Modify --api-port to take a stirng argument
--api-port only takes the port as argument. This patch modifies it to
take a string argument, in the form of host:port.
2019-06-03 17:16:46 -07:00
Andy Zhou
bd58e9b874
Merge pull request #71 from andyz-dev/docker-machine
[Feature] Docker machine
2019-06-01 11:03:42 -07:00
Andy Zhou
f3ec169414 Add docker machine IP to SAN
When running on a docker machine, the default X598 certificate does not
allow access via docker machine's IP. This patch fixes this by adding
"--tls-san <docker machine IP>" to the K3S server argument list.
2019-06-01 10:57:42 -07:00
Andy Zhou
92b5d90216
Merge pull request #72 from andyz-dev/network-name
[Enhancement] Add k3d- prefix to docker network name
2019-05-31 10:39:54 -07:00
Andy Zhou
d1a709365f
Merge pull request #70 from rancher/feature/auto-shell-and-zsh
[Feature] auto mode and zsh support for shell command
2019-05-31 10:39:12 -07:00
iwilltry42
f771dcf8b5 shell flag text 2019-05-31 12:34:44 +02:00