k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,180 Commits
31 Branches
776 Tags
634 MiB
Commit Graph

1180 Commits (release-1.17)

Author SHA1 Message Date
Erik Wilson d48f3b1f89 Merge remote-tracking branch 'rancher/master' into release-1.17 2020-03-20 15:38:52 -07:00
Erik Wilson 895618fc5b
Merge pull request #1559 from erikwilson/bump-cri-1.3.0-k3s5 
Bump cri to 1.3.0-k3s.5
 2020-03-20 15:34:01 -07:00
Erik Wilson b6cb8149c0 Bump cri to 1.3.0-k3s.5 2020-03-20 15:06:53 -07:00
Erik Wilson e5e7617aaa Merge branch 'master' into release-1.17 2020-03-16 18:09:56 -07:00
Erik Wilson e3a3b8221e
Merge pull request #1549 from erikwilson/package-airgap-image-list 
Add airgap image list to release artifacts
 2020-03-16 18:09:10 -07:00
Erik Wilson 2835c76e5d Add airgap image list to release artifacts 2020-03-16 18:03:20 -07:00
Erik Wilson 002aaae6eb Merge branch 'master' into release-1.17 2020-03-16 17:30:37 -07:00
Erik Wilson 53a9c5658b
Merge pull request #1548 from erikwilson/rpm-cleanup 
Update RPM systemd services for easy modification.
 2020-03-16 17:26:05 -07:00
Erik Wilson d15eb6aab6 Update RPM systemd services for easy modification. 
Modified installer produces a k3s-server and k3s-agent systemd
service, with env files located in /etc/rancher/k3s.

The k3s-server service may be started without modification but
k3s-agent requires a token and url modification to the
/etc/rancher/k3s/k3s-agent.env file for functionality.

The k3s-server service will conflict with the k3s-agent service,
so both may not be started at the same time.

Creates ./package/rpm/ repo dir for rpm specific resources and
relocates k3s.spec.
 2020-03-16 17:23:43 -07:00
Erik Wilson 9a8837153d
Merge pull request #1537 from galal-hussein/fix_ci 
Use curl to send dispatch event to k3s-upgrade repo
 2020-03-16 17:13:39 -07:00
Erik Wilson 52199f0709
Merge pull request #1534 from erikwilson/bump-k8s-v1.17.4 
Update k8s to v1.17.4-k3s1
 2020-03-16 17:12:58 -07:00
Erik Wilson 648b5824b0 Reduce memory for dev vms 2020-03-16 17:12:21 -07:00
Erik Wilson dacd8545c4 Update k8s to v1.17.4-k3s1 2020-03-16 17:12:21 -07:00
galal-hussein 0e4263b65a Use curl to send dispatch event to k3s-upgrade repo 2020-03-16 19:30:40 +02: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
Craig Jellick 12c83ff192
Merge pull request #1526 from galal-hussein/backport_add_asterisk 
[release-1.17] Backport add asterisk
 2020-03-13 18:02:44 -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
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 179cb47db0 Add asterisks for omitted values in nodeconfig 2020-03-12 20:38:27 +02:00
galal-hussein 356fe006a2 Add asterisks for omitted values in nodeconfig 2020-03-12 20:18:56 +02:00
Erik Wilson fa85cf7816 Merge remote-tracking branch 'rancher/master' into release-1.17 2020-03-11 08:49:15 -07: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 455f3768e3
Merge pull request #1514 from galal-hussein/backport_drone_yaml_2 
drone.yml backport
 2020-03-10 09:24:39 -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
galal-hussein f154ff2646 drone.yml backport 2020-03-10 01:50:38 +02: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
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
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