Erik Wilson
cbceb0858a
Merge pull request #1495 from joakimr-axis/joakimr-axis_comparison
...
Fix inconsistent shell script comparison operator ==
2020-03-25 12:16:29 -07:00
Erik Wilson
9f8fc74e4d
Merge pull request #1494 from joakimr-axis/joakimr-axis_backticks
...
Use contemporary $() instead of legacy `` in shell commands
2020-03-25 12:15:41 -07:00
Erik Wilson
eb96a437e1
Merge pull request #1493 from joakimr-axis/joakimr-axis_markdown
...
Fix markdown files according to markdownlint recommendations
2020-03-25 12:15:10 -07:00
Erik Wilson
ceb6bfbbf3
Merge pull request #1275 from louiznk/feat/toleration/control_plane
...
feat: add NoSchedule toleration on key node-role.kubernetes.io/master
2020-03-25 12:14:17 -07:00
louiznk
45ab3e54ac
Merge branch 'master' into feat/toleration/control_plane
2020-03-25 19:37:42 +01:00
louis
f2a4e1d57d
feat: add master taint toleration to klipper, coredns, metrics-server, traefik and local-storage
2020-03-25 19:11:10 +01:00
Erik Wilson
805dcc07ab
Merge pull request #1566 from hvnsweeting/master
...
Fix error when get version using Wget
2020-03-25 10:49:41 -07:00
Joakim Roubert
4ea818c668
Merge branch 'master' into joakimr-axis_markdown
2020-03-24 09:30:17 +01:00
Joakim Roubert
36908f2152
Merge branch 'master' into joakimr-axis_comparison
2020-03-24 09:24:52 +01:00
Joakim Roubert
3857733b5c
Merge branch 'master' into joakimr-axis_backticks
2020-03-24 07:59:38 +01:00
Joakim Roubert
30f4cb60e2
Merge branch 'master' into joakimr-axis_dockerfileshellcmd
2020-03-24 07:55:25 +01:00
Erik Wilson
a9af4a27ff
Merge pull request #1560 from galal-hussein/use_mirrored_images
...
use mirrored images for traefik and coredns
2020-03-23 10:42:47 -07:00
galal-hussein
2b6faa925f
use mirrored images for traefik and coredns
2020-03-23 19:00:30 +02:00
Viet Hung Nguyen
f741e8f9c5
Fix error when get version using Wget
...
GitHub now returns lowercase:
wget -SqO /dev/null https://github.com/rancher/k3s/releases/latest |& grep -i location
location: https://github.com/rancher/k3s/releases/tag/v1.17.3+k3s1
2020-03-22 17:29:51 +07:00
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
