github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
822 Commits
33 Branches
860 Tags
624 MiB
Commit Graph

822 Commits (eff502342a320580527b7b7525f95f68f453d450)

Author SHA1 Message Date
Joakim Roubert b86d08a318
Merge branch 'master' into joakimr-axis_wget 2019-08-26 18:38:05 +02:00
Erik Wilson 9a89d1f4c3
Merge pull request #761 from ibuildthecloud/master 
Check for semanage command availability
 2019-08-26 09:35:41 -07:00
Erik Wilson 59f0f004d0
Merge branch 'master' into master 2019-08-26 09:35:14 -07:00
Erik Wilson 3c716e49e4
Merge pull request #753 from joakimr-axis/joakimr-axis_cmdsubst 
install.sh: Use contemporary command substitution syntax
 2019-08-26 09:26:52 -07:00
Erik Wilson 5679cfafaf
Merge pull request #707 from ibuildthecloud/pr683 
Integrate Kine
 2019-08-26 09:25:37 -07:00
Darren Shepherd 1c93798037 Check for semanage command availability 2019-08-24 23:32:11 -07:00
Darren Shepherd 2cb6f52339 Disable storing bootstrap information by default 2019-08-24 22:27:24 -07:00
Joakim Roubert 76342565a2
Update install.sh 2019-08-24 08:11:08 +02:00
Joakim Roubert 7a96fbb3f8 install.sh: Cleanup of quotes 
Where no variable expansion is done, " is replaced with '.
Copying content of one variable to another variable never needs quotes.
Some calls to echo and fatal need no quotes at all, but have been left
with ' to make it easier to see where the string begins and ends.
The fatal function now also sends output to stderr.

Change-Id: I2504707e5c550bc498e7663cedf58c224cd0a15b
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 15:14:46 +02:00
Joakim Roubert db441f28b8 install.sh: Add wget fallback if curl isn't available 
Reportedly, some systems don't have curl but wget. With this patch,
install.sh will use wget instead of curl if the latter is not available
on the target system.

Change-Id: I0bc78feec6d8e1dbf7fbef7c2e10833b79bdbbdc
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 14:41:11 +02:00
Joakim Roubert 7a01e0fae3 install.sh: Use -eq instead of = for integer comparison 
For integer comparison, it is recommended to use '-eq' instead of the
broader comparison '='. From the manual:

n1 -eq n2  True if the integers n1 and n2 are algebraically equal.
s1 = s2    True if the strings s1 and s2 are identical.

Change-Id: I3a92c3944a19e7a618438a9e3e304d9de5d9874f
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 10:32:18 +02:00
Joakim Roubert 9982da1953 install.sh: Use contemporary command substitution syntax 
The install.sh script currently uses a mix of the legacy backquote
syntax and the recommended contemporary $() syntax. This patch brings
consistency by replacing the occurrences of the legacy backquote ones
with the $() syntax.

Change-Id: I018f3250175064dcb22ef86a0240b2c804153641
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 10:26:43 +02:00
Joakim Roubert 1d220e33a5 install.sh: Use built-in shell functionality instead of awk 
If install.sh relies on awk, install.sh malfunctions when run on a
device with a limited environment where awk is not available. This patch
replaces the use of awk with built-in shell script functionality.

Change-Id: I071d9f565ff7ef38445a6dd0ea9692b903721601
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 09:58:38 +02:00
Darren Shepherd bcd1fce4a1
Merge pull request #750 from erikwilson/unresolvable-hostname 
Remove hostname requirement in `/etc/hosts`
 2019-08-22 22:17:37 -07:00
Carlos Eduardo 993e6a1950 Enable metrics endpoint to Traefik 2019-08-22 19:42:58 -03:00
Erik Wilson e6067314c9 Localhost -> 127.0.0.1 2019-08-22 11:56:00 -07:00
Darren Shepherd a005219c5b Update vendor 2019-08-22 09:14:47 -07:00
galal-hussein 1ae0c540d7 Refactor bootstrap, move kine startup code to kine, integrate kine 2019-08-22 09:14:43 -07:00
Erik Wilson a76ca2e887 Remove hostname requirement in `/etc/hosts` 2019-08-21 22:56:20 -07:00
Erik Wilson ffe0288b68
Merge pull request #744 from erikwilson/v0.8.0-to-v0.8.1 
Update k3s v0.8.0 to v0.8.1
 2019-08-20 17:33:26 -07:00
Erik Wilson 9c99578bd6 Update k3s v0.8.0 to v0.8.1 2019-08-20 17:32:49 -07:00
Erik Wilson d116e74a88
Merge pull request #742 from warmchang/traefik,helm-controller 
Update traefik to 1.7.12 & helm-controller to v0.2.2
 2019-08-20 13:53:24 -07:00
William Zhang 458cea6633 Update traefik to 1.7.12 
Signed-off-by: William Zhang <warmchang@outlook.com>
 2019-08-20 02:35:07 +00:00
William Zhang b67207a195 Update helm-controller to v0.2.2 
Signed-off-by: William Zhang <warmchang@outlook.com>
 2019-08-20 01:49:14 +00:00
Darren Shepherd 70a42477e2
Merge pull request #741 from erikwilson/update-k3s-1.14.6 
Update k8s to v1.14.6-k3s.1
 2019-08-19 14:56:23 -07:00
Erik Wilson 94760b1ecb Update k8s to v1.14.6-k3s.1 2019-08-19 11:58:47 -07:00
Darren Shepherd e6817c3809
Merge pull request #736 from warmchang/go1.12.8 
Upgrade to go1.12.9 & golang/x/net dependency vendor
 2019-08-16 19:35:28 -07:00
William Zhang 2a0e453675 trash/prune golang/x/net 
Signed-off-by: William Zhang <warmchang@outlook.com>
 2019-08-16 15:56:37 +08:00
William Zhang 602562963b Update golang/x/net dependency 
Signed-off-by: William Zhang <zhang.wanmin@zte.com.cn>
 2019-08-16 15:56:36 +08:00
William Zhang 635e1295c2 upgrade to go1.12.9 & alpine3.10 
Signed-off-by: William Zhang <zhang.wanmin@zte.com.cn>
 2019-08-16 15:55:52 +08:00
Darren Shepherd 99716deb08
Merge pull request #705 from yamt/cg 
Appease kubelet warnings on docker for mac
 2019-08-15 17:13:14 -07:00
Darren Shepherd 63dfc168d7
Merge pull request #718 from erikwilson/log-update 
Cleanup logging
 2019-08-15 17:12:29 -07:00
Darren Shepherd c6eaacb15d
Merge pull request #729 from warmchang/go-bindata 
Move from jteeuwen/go-bindata to go-bindata/go-bindata
 2019-08-15 17:11:24 -07:00
William Zhang bdb8550638 🔧 jteeuwen/go-bindata --> go-bindata/go-bindata 
Signed-off-by: William Zhang <warmchang@outlook.com>
 2019-08-12 03:24:03 +00:00
Erik Wilson c849525a27
Merge pull request #722 from erikwilson/debug-lb-logs 
Change load balancer logging to debug
 2019-08-09 14:12:31 -07:00
Erik Wilson ee1df60f52
Merge pull request #694 from yamt/docker-compose-ha 
docker-compose.yml variant to deploy HA
 2019-08-09 14:10:33 -07:00
Erik Wilson 16da9edf45
Merge pull request #714 from erikwilson/node-controller-panic-fix 
Fix panic in node controller
 2019-08-09 14:09:06 -07:00
Erik Wilson 6e3b70c000
Merge pull request #720 from erikwilson/openrc-log-fix 
Fix logging for openrc
 2019-08-09 14:08:30 -07:00
YAMAMOTO Takashi 20bad87231 Add a variant of docker-compose.yml to deploy HA 2019-08-09 10:16:50 +09:00
Erik Wilson 98254a3412 Change load balancer logging to debug 2019-08-08 10:48:11 -07:00
Erik Wilson d8c4f3811e Fix logging for openrc 2019-08-07 23:07:16 -07:00
Erik Wilson 30e050a692 Cleanup logging 2019-08-07 22:45:54 -07:00
Erik Wilson 3c342e22a6 Fix panic in node controller 2019-08-06 10:42:42 -07:00
Erik Wilson 862c7ee379
Merge pull request #711 from erikwilson/v0.7.0-to-v0.8.0 
Update v0.7.0 to v0.8.0
 2019-08-05 15:42:36 -07:00
Erik Wilson 7028320ca3 Update v0.7.0 to v0.8.0 2019-08-05 15:11:49 -07:00
Erik Wilson f867995ff7
Merge pull request #708 from erikwilson/vendor-v1.14.5-k3s.1 
Update k8s to v1.14.5-k3s.1
 2019-08-05 13:56:50 -07:00
Erik Wilson 5d88cc7113 Update k8s to v1.14.5-k3s.1 2019-08-05 11:39:53 -07:00
YAMAMOTO Takashi fc8eddae29 Appease kubelet warnings on docker for mac 
On my environment, the name=systemd entry in /proc/self/cgroup
looks like:

	13:name=systemd:/docker/917b388b40c70b17a3283d852d38bfcdc84d1bf8242e32a779eacd98a610e499

Kubelet periodically complains like:

	E0802 06:42:52.667123       1 summary_sys_containers.go:47] Failed to get system container stats for "/docker/917b388b40c70b17a3283d852d38bfcdc84d1bf8242e32a779eacd98a610e499/kube-proxy": failed to get cgroup stats for "/docker/917b388b40c70b17a3283d852d38bfcdc84d1bf8242e32a779eacd98a610e499/kube-proxy": failed to get container info for "/docker/917b388b40c70b17a3283d852d38bfcdc84d1bf8242e32a779eacd98a610e499/kube-proxy": unknown container "/docker/917b388b40c70b17a3283d852d38bfcdc84d1bf8242e32a779eacd98a610e499/kube-proxy"
 2019-08-02 16:22:51 +09:00
Erik Wilson c170115c54
Merge pull request #676 from erikwilson/go-proxy 
Add go load-balancing proxy
 2019-08-01 16:03:41 -07:00
Erik Wilson 5deef13086
Merge pull request #687 from yamt/cacerts 
Simplify startWrangler a bit
 2019-08-01 16:01:42 -07:00