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

1232 Commits (f38082673d20cae997cbf0f71424615686364fb9)

Author SHA1 Message Date
Joakim Roubert c589fb98e9
Merge branch 'master' into joakimr-axis_comparison 2020-03-21 13:42:38 +01:00
Joakim Roubert c2eebc703e
Merge branch 'master' into joakimr-axis_backticks 2020-03-21 13:42:28 +01:00
Joakim Roubert 9521ccebc4
Merge branch 'master' into joakimr-axis_markdown 2020-03-21 13:42:13 +01:00
Joakim Roubert a710a2b4df
Merge branch 'master' into joakimr-axis_dockerfileshellcmd 2020-03-21 13:41:57 +01: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
Joakim Roubert 7d206ea5c7
Merge branch 'master' into joakimr-axis_markdown 2020-03-17 08:28:38 +01:00
Joakim Roubert b5b8545c6d
Merge branch 'master' into joakimr-axis_backticks 2020-03-17 08:28:31 +01:00
Joakim Roubert 9741fe7c85
Merge branch 'master' into joakimr-axis_comparison 2020-03-17 08:28:25 +01:00
Joakim Roubert b7357c3abb
Merge branch 'master' into joakimr-axis_dockerfileshellcmd 2020-03-17 08:27:46 +01: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 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
Joakim Roubert 6fe49aaec3
Merge branch 'master' into joakimr-axis_markdown 2020-03-16 07:44:02 +01:00
Joakim Roubert abf6c10e73
Merge branch 'master' into joakimr-axis_comparison 2020-03-16 07:43:51 +01:00
Joakim Roubert a17def329a
Merge branch 'master' into joakimr-axis_dockerfileshellcmd 2020-03-16 07:43:26 +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 9a3ba3383a
Merge branch 'master' into joakimr-axis_markdown 2020-03-13 10:28:38 +01:00
Joakim Roubert 52d1f5ab74
Merge branch 'master' into joakimr-axis_backticks 2020-03-13 10:28:18 +01:00
Joakim Roubert 9421da08ac
Merge branch 'master' into joakimr-axis_comparison 2020-03-13 10:28:06 +01:00
Joakim Roubert 73fd5454a3
Merge branch 'master' into joakimr-axis_dockerfileshellcmd 2020-03-13 10:27:50 +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 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