github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,335 Commits
33 Branches
863 Tags
625 MiB
Commit Graph

1335 Commits (e3f87891142a38aa4e6194c76741f17f30911ee8)

Author SHA1 Message Date
Joakim Roubert a9826491f8
Merge branch 'master' into joakimr-axis_backticks 2020-03-09 10:17:07 +01:00
Joakim Roubert f50773df4d
Merge branch 'master' into joakimr-axis_markdown 2020-03-09 10:16:55 +01:00
Joakim Roubert e5d43e1382
Merge branch 'master' into joakimr-axis_comparison 2020-03-09 10:16:23 +01:00
Joakim Roubert b0209dfe1c
Merge branch 'master' into joakimr-axis_dockerfileshellcmd 2020-03-09 10:14:38 +01:00
Erik Wilson a1be671dbf
Merge pull request #1506 from galal-hussein/use_nginx_multiarch 
use multiarch image for nginx
 2020-03-06 16:04:38 -07:00
galal-hussein 717b5a765e use multiarch image for nginx 2020-03-07 00:19:32 +02:00
Joakim Roubert 2a39fffea9 Dockerfile.dapper: Use = instead of == for portability 
By using the POSIX = instead of == in the shell script comparison, we
don't have to rely on the go container's /bin/sh being a shell that
handles ==. (Even if it currently is.)

Change-Id: Ie02c8e27c3eecc957278c274fee661abb2c8abcf
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-05 15:30:11 +01:00
Joakim Roubert 0a54d46c5b Fix inconsistent shell script comparison operator == 
In package-airgap and provision/vagrant, replace == with = which is
used in all other script string comparisons in this repository to keep
things consistent.

Change-Id: I2f59e9a8d1d2fc2984ed3952fd4794f1028b6f66
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-04 16:26:55 +01:00
Joakim Roubert 5fa0083750 Use contemporary $() instead of legacy `` in shell commands 
The "$()" form of command substitution solves a problem of inconsistent
behavior when using backquotes and is recommended over the legacy
backticks.

Change-Id: I7f0df0535822b64680b6c076e930814417bf1480
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-04 16:16:27 +01:00
Joakim Roubert 4286ba7163 Fix markdown files according to markdownlint recommendations 
There are some issues and quirks in the markdown documentation files
suggested by the markdownlint project checker that might benefit from
being fixed, which this patch does.

Change-Id: I33245825e5bb543b5ce1732204984d4a0b169668
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-04 11:06:55 +01:00
Erik Wilson ceff3f58fb
Merge pull request #1466 from galal-hussein/traefik_to_nginx 
Replace traefik with nginx
 2020-03-02 15:04:09 -07:00
galal-hussein 9a17033095 Replace traefik with nginx 2020-03-03 00:00:39 +02:00
Erik Wilson 673d8b64f8
Merge pull request #1474 from erikwilson/dev-build-update 
Use trigger for manifest and dispatch in drone pipeline
 2020-03-02 10:29:57 -07:00
Erik Wilson d502dea234 Use trigger for manifest and dispatch in drone pipeline 2020-03-02 10:28:26 -07:00
Erik Wilson 7d52b02f6d
Merge pull request #1473 from erikwilson/dev-build-update 
Add ubuntu to vagrant provision
 2020-03-02 10:28:17 -07:00
Erik Wilson 65bfae5581
Merge pull request #1472 from arpankapoor/ansible-fixes 
Ansible systemd unit file similar to install.sh
 2020-03-02 10:02:16 -07:00
Erik Wilson 74b5a4d5e0 Add ubuntu to vagrant provision 2020-03-02 09:38:07 -07:00
Arpan Kapoor d01978147e
Add ExecStartPre to ansible systemd node unit files 2020-03-01 19:32:19 +05:30
Arpan Kapoor 4f57cdd5e0
Add Type and TimeoutStartSec to ansible systemd unit files 2020-03-01 19:31:31 +05:30
Erik Wilson 069bc21fd7
Merge pull request #1468 from erikwilson/dev-build-update 
Cleanup vagrant provision scripts
 2020-02-28 18:07:02 -07:00
Erik Wilson 4370fc1482 Remove old runc & containerd shims on build 2020-02-28 17:32:42 -07:00
Erik Wilson 89fa8afaa3 Cleanup vagrant provision scripts 2020-02-28 16:51:19 -07:00
Erik Wilson 4b84b1f8b4
Merge pull request #1465 from erikwilson/dev-build-update 
Clean up building && provide Vagrant centos7 setup
 2020-02-28 15:43:26 -07:00
Erik Wilson 8725798578
Merge pull request #1464 from erikwilson/selinux-update 
Simplify SELinux detection and add --disable-selinux flag
 2020-02-28 15:42:45 -07:00
Erik Wilson 2abd8a512e
Merge pull request #1467 from galal-hussein/fix_dispatch_event2 
use github_token for dispatch event
 2020-02-28 15:41:03 -07:00
Erik Wilson 5eb1b21822 Clean up building && provide Vagrant centos7 setup 2020-02-28 15:39:11 -07:00
galal-hussein 7113230213 use github_token for dispatch event 2020-02-28 21:37:56 +02:00
Erik Wilson a3cb9ee1f6 Simplify SELinux detection and add --disable-selinux flag 2020-02-28 10:10:55 -07:00
Erik Wilson 0aeea78060
Merge pull request #1444 from KnicKnic/k3s_build_windows 
K3s build windows (no agents)
 2020-02-27 11:46:21 -07:00
Erik Wilson d049a5d09f
Merge pull request #1462 from galal-hussein/dispatch_event_fix 
Add depends on manifest to dispatch
 2020-02-26 18:45:18 -07:00
galal-hussein 0bb94286ed Add depends on manifest to dispatch 2020-02-27 02:55:32 +02:00
Erik Wilson f31a8d9e94
Merge pull request #1456 from galal-hussein/new_branch 
Send dispatch event with drone
 2020-02-26 13:09:24 -07:00
galal-hussein b2ac8aad22 Send dispatch event with drone 2020-02-25 20:10:32 +02:00
Erik Wilson c43e5acda6
Merge pull request #1448 from ibuildthecloud/master 
Support SELinux
 2020-02-24 16:50:27 -07:00
Darren Shepherd 429e9d4966 Don't require selinux utils and require k3s_selinux 
If you are installing k3s on a selinux enforcing system then we
required that you also install k3s_selinux RPM to put in the proper
policy.
 2020-02-24 16:08:02 -07:00
Darren Shepherd 124def22ed Update vendor 2020-02-24 16:03:11 -07:00
Darren Shepherd 4d32fe9959 Support SELinux 2020-02-24 16:03:09 -07:00
Erik Wilson 9a1f9a8a4c
Merge pull request #1430 from St0rmingBr4in/fix-home 
contrib/ansible: Fix home path and use kubectl to set the server url in conf
 2020-02-24 15:24:33 -07:00
Erik Wilson 742571e6a5
Merge pull request #1429 from St0rmingBr4in/inventory-subdirectory 
contrib/ansible: Move example inventory into subdirectory and add extra_server_args
 2020-02-24 15:21:32 -07:00
Erik Wilson 4210800648
Merge pull request #1343 from ibuildthecloud/rootless 
Create pidns for rootless
 2020-02-24 15:05:52 -07:00
Erik Wilson b8d8fc3eff
Merge pull request #1440 from KnicKnic/master 
do not rename inuse files
 2020-02-24 15:00:13 -07:00
Erik Wilson 046b40a75e
Merge pull request #1451 from erikwilson/master 
Add 'k3s' to kubernetes version metadata in dev builds
 2020-02-24 14:58:52 -07:00
Erik Wilson c100dfc2cb Add 'k3s' to kubernetes version metadata in dev builds 2020-02-24 14:50:03 -07:00
Knic Knic c2db115ec3 fix formatting 2020-02-23 00:48:26 -08:00
Knic Knic 2346ccc63f get build on windows and get api_server to work 2020-02-22 23:17:59 -08:00
Knic Knic 522e08872a do not rename inuse files 2020-02-21 22:45:05 -08:00
Julien DOCHE cddcbe7833 contrib/ansible: Add extra_server_args variable 
Signed-off-by: Julien DOCHE <julien.doche@gmail.com>
 2020-02-17 21:42:40 +01:00
Julien DOCHE afbef43efd contrib/ansible: Use kubectl to set the server url in conf 
Sometimes https://127.0.0.1:6443 can be written in the conf, the regexp does
not account for that.

Signed-off-by: Julien DOCHE <julien.doche@gmail.com>
 2020-02-17 20:55:44 +01:00
Julien DOCHE 9c23860ce8 contrib/ansible: Fix home is not necessarily in /home 
Signed-off-by: Julien DOCHE <julien.doche@gmail.com>
 2020-02-17 20:49:01 +01:00
Julien DOCHE fd891d0bd9 contrib/ansible: Move example inventory to its own subdirectory 
Signed-off-by: Julien DOCHE <julien.doche@gmail.com>
 2020-02-16 21:08:42 +01:00