github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,102 Commits
32 Branches
881 Tags
630 MiB
Commit Graph

1102 Commits (abf6c10e73fbc19587f0a2a3683880ca92fe60a5)

Author SHA1 Message Date
Joakim Roubert abf6c10e73
Merge branch 'master' into joakimr-axis_comparison 2020-03-16 07:43:51 +01:00
Craig Jellick 037a993971
Merge pull request #1538 from rancher/davidnuzik-patch-template 
Ask more clearly for K3s args and logs
 2020-03-13 18:21:50 -07:00
David Nuzik 1c8124cc02
Ask more clearly for K3s args and logs 
In the bug report template, more clearly ask the user for K3s arguments and logs
 2020-03-13 15:24:19 -07:00
Erik Wilson b8fd023f83
Merge pull request #1453 from ibuildthecloud/selinux-install 
Don't require selinux utils and require k3s_selinux
 2020-03-13 13:29:14 -07:00
Erik Wilson 5753dbd6ae
Merge branch 'master' into selinux-install 2020-03-13 09:51:36 -07:00
Joakim Roubert 9421da08ac
Merge branch 'master' into joakimr-axis_comparison 2020-03-13 10:28:06 +01:00
Craig Jellick 65f7fbe5c3
Merge pull request #1525 from galal-hussein/add_asterisk 
Add asterisks for omitted values in nodeconfig
 2020-03-12 14:13:02 -07:00
galal-hussein 356fe006a2 Add asterisks for omitted values in nodeconfig 2020-03-12 20:18:56 +02:00
Erik Wilson 9a21fc513f
Merge pull request #1519 from galal-hussein/revert_nginx_traefik 
Revert nginx traefik
 2020-03-10 18:43:32 -07:00
galal-hussein 97cb85ced8 Fix test-run-basics to check for traefik 2020-03-11 01:54:12 +02:00
galal-hussein 3f927d8006 Revert "Replace traefik with nginx" 
This reverts commit 9a17033095.
 2020-03-11 01:45:23 +02:00
Erik Wilson 876a7f33a8
Merge pull request #1518 from erikwilson/rpm-publish 
Only publish rpm on tag
 2020-03-10 14:46:59 -07:00
Erik Wilson 769110e7e0 Only publish rpm on tag 2020-03-10 14:45:17 -07:00
Erik Wilson 0d31909b81
Merge pull request #1501 from erikwilson/rpm-publish 
Publish RPMs
 2020-03-10 13:24:25 -07:00
Erik Wilson d578198ac0 Add rpm build & repo publish 2020-03-10 11:48:14 -07:00
Erik Wilson 456962b2b8 Update versioning for no .git or go 2020-03-10 11:25:43 -07:00
Erik Wilson 3410986357 Update install script for rpm install 2020-03-10 11:25:43 -07:00
Erik Wilson 2071247a2f Cleanup prompt for vagrant centos 2020-03-10 11:25:43 -07:00
Erik Wilson c01fec0cd3
Merge pull request #1515 from erikwilson/airgap-test 
Testing - Check for changes in the airgap image list
 2020-03-10 09:24:07 -07:00
Erik Wilson d95707e294 Clean up airgap image list 2020-03-09 20:29:41 -07:00
Erik Wilson 9b8e829ec7 Check for changes in the airgap image list 2020-03-09 19:58:00 -07:00
Erik Wilson c74f745a86
Merge pull request #1512 from galal-hussein/multiarch_default_backend 
default backend multiarch image
 2020-03-09 15:15:45 -07:00
galal-hussein c4f18227fc default backend multiarch 2020-03-09 23:52:04 +02:00
Joakim Roubert e5d43e1382
Merge branch 'master' into joakimr-axis_comparison 2020-03-09 10:16:23 +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 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
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