github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
822 Commits
33 Branches
860 Tags
624 MiB
Commit Graph

69 Commits (eff502342a320580527b7b7525f95f68f453d450)

Author SHA1 Message Date
Erik Wilson e810ee1678
Merge pull request #967 from erikwilson/killall-cleanup 
Cleanup k3s-killall
 2019-10-26 16:54:09 -07:00
Erik Wilson fecdee6fb5 Fix installs for older systemd 2019-10-26 16:18:45 -07:00
Erik Wilson ef9c1f23f0 Cleanup k3s-killall 2019-10-26 16:13:59 -07:00
Erik Wilson 33f6a4e683
Merge pull request #965 from erikwilson/systemd-service-cleanup 
Cleanup systemd service file
 2019-10-26 13:53:17 -07:00
Erik Wilson 36dc38f361 Cleanup systemd service file 
Move command with line continuations to bottom of service file to
prevent including systemd directives.

Changes After network-online to Wants network-online for air-gap.
 2019-10-26 13:11:50 -07:00
Erik Wilson e3cd52a49e Remove iptables on k3s-killall.sh 2019-10-25 03:14:11 -07:00
Erik Wilson ad4ea681ce Hide the --disable-agent flag 2019-10-24 21:51:58 -07:00
Christian Tramnitz 7b37988fb1
make match case-insensitive 2019-10-23 02:00:10 +02:00
Christian Tramnitz 06f477410b
inherit proxy settings on install 
Write proxy settings into FILE_K3S_ENV on install. This should address #627
 2019-10-23 01:56:19 +02:00
Erik Wilson 0e0fbea23c Uninstall/killall should clean up /var/lib/kubelet also 2019-10-17 19:11:27 -07:00
Erik Wilson bb3aca1817 Cleanup killall and uninstall 2019-10-17 15:41:39 -07:00
Joakim Roubert d982c33bfc
Merge branch 'master' into joakimr-axis_quotes 2019-10-08 07:47:07 +02:00
Joakim Roubert f0bce02a62
Update install.sh 
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-10-04 07:41:05 +02:00
Joakim Roubert 2548f3ebaa
Update install.sh 
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-10-01 08:49:01 +02:00
Joakim Roubert ce388e3788
Update install.sh 
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-09-28 14:29:49 +02:00
Joakim Roubert 2b5eff7237
Merge branch 'master' into joakimr-axis_noawk 2019-09-19 09:55:31 +02:00
Erik Wilson 76d685ae5d
Merge pull request #815 from dweomer/install/openrc 
install.sh: fix openrc service depend in heredoc
 2019-09-18 15:59:34 -07:00
Erik Wilson ad7b2e0a5d
Merge pull request #756 from joakimr-axis/joakimr-axis_wget 
install.sh: Add wget fallback if curl isn't available
 2019-09-18 15:55:42 -07:00
Jacob Blain Christen 4d5cca6b50 install.sh: fix openrc service depend in heredoc 
This change sets up the correct dependency on the `network-online`
service provided by openrc.

See:
- https://github.com/OpenRC/openrc/blob/0.39.2/service-script-guide.md#be-wary-of-need-net-dependencies
- https://github.com/OpenRC/openrc/blob/0.39.2/init.d/net-online.in#L18
 2019-09-18 11:22:59 -07:00
Joakim Roubert a0d2743868
Update install.sh 2019-09-03 08:15:39 +02:00
Joakim Roubert 0a67557c4a Update install.sh after review comments 
Change-Id: I8acf9f0fc0115dd8a45027b1d7610b47aa7462d9
 2019-09-03 08:12:22 +02:00
Joakim Roubert 98410df788
Update install.sh according to yamt's suggestion 2019-09-03 07:51:33 +02:00
Joakim Roubert e822bcafa1
Update install.sh 2019-09-03 06:36:36 +02:00
Raimund Hook 2fe5d2768b Changed SELinux error to fatal 
If the install errors out on semanage not found, a file not found is
thrown as a 'file not found' for error. Updating to 'fatal' resolves
this as the script then exits as intended and throws an 'error'.
 2019-08-28 15:35:56 +01:00
Erik Wilson 94167cdb4e
Merge branch 'master' into joakimr-axis_quotes 2019-08-26 09:43:34 -07:00
Joakim Roubert 6d07cb47b7
Merge branch 'master' into joakimr-axis_noawk 2019-08-26 18:43:30 +02:00
Erik Wilson cc76ca6931
Merge branch 'master' into joakimr-axis_comparison 2019-08-26 09:38:23 -07:00
Joakim Roubert b86d08a318
Merge branch 'master' into joakimr-axis_wget 2019-08-26 18:38:05 +02:00
Erik Wilson 59f0f004d0
Merge branch 'master' into master 2019-08-26 09:35:14 -07:00
Darren Shepherd 1c93798037 Check for semanage command availability 2019-08-24 23:32:11 -07:00
Joakim Roubert 76342565a2
Update install.sh 2019-08-24 08:11:08 +02:00
Joakim Roubert 7a96fbb3f8 install.sh: Cleanup of quotes 
Where no variable expansion is done, " is replaced with '.
Copying content of one variable to another variable never needs quotes.
Some calls to echo and fatal need no quotes at all, but have been left
with ' to make it easier to see where the string begins and ends.
The fatal function now also sends output to stderr.

Change-Id: I2504707e5c550bc498e7663cedf58c224cd0a15b
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 15:14:46 +02:00
Joakim Roubert db441f28b8 install.sh: Add wget fallback if curl isn't available 
Reportedly, some systems don't have curl but wget. With this patch,
install.sh will use wget instead of curl if the latter is not available
on the target system.

Change-Id: I0bc78feec6d8e1dbf7fbef7c2e10833b79bdbbdc
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 14:41:11 +02:00
Joakim Roubert 7a01e0fae3 install.sh: Use -eq instead of = for integer comparison 
For integer comparison, it is recommended to use '-eq' instead of the
broader comparison '='. From the manual:

n1 -eq n2  True if the integers n1 and n2 are algebraically equal.
s1 = s2    True if the strings s1 and s2 are identical.

Change-Id: I3a92c3944a19e7a618438a9e3e304d9de5d9874f
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 10:32:18 +02:00
Joakim Roubert 9982da1953 install.sh: Use contemporary command substitution syntax 
The install.sh script currently uses a mix of the legacy backquote
syntax and the recommended contemporary $() syntax. This patch brings
consistency by replacing the occurrences of the legacy backquote ones
with the $() syntax.

Change-Id: I018f3250175064dcb22ef86a0240b2c804153641
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 10:26:43 +02:00
Joakim Roubert 1d220e33a5 install.sh: Use built-in shell functionality instead of awk 
If install.sh relies on awk, install.sh malfunctions when run on a
device with a limited environment where awk is not available. This patch
replaces the use of awk with built-in shell script functionality.

Change-Id: I071d9f565ff7ef38445a6dd0ea9692b903721601
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-08-23 09:58:38 +02:00
Erik Wilson d8c4f3811e Fix logging for openrc 2019-08-07 23:07:16 -07:00
Erik Wilson 23501c08cb
Merge pull request #662 from cryptk/systemd-delay 
Add a little extra delay between restart attempts
 2019-07-27 07:57:45 -07:00
cryptk f9dd8dedc8 Add a little extra delay between restart attempts 
This extra delay prevents systemd from determining that the service is restarting "too quickly".
 2019-07-25 13:02:19 -05:00
Erik Wilson c443101bfc Install symlink skip or force, links ctr 2019-07-23 09:50:50 -07:00
Ray Tsang 32f1d66932 Added K3S_INSTALL_SKIP_SYMLINK flag 2019-07-19 11:27:57 -07:00
peter_he d140911b55 Fix install.sh comment typo (#638) 2019-07-15 08:37:31 -07:00
Erik Wilson deb4178459 Quote installer arguments 2019-06-18 09:45:05 -07:00
galal-hussein 8188bc62aa Add Restart=always to systemd unit 2019-05-08 02:54:40 +02:00
Erik Wilson 7ca50efb8b Add k3s-killall.sh script to installer 2019-05-01 14:27:39 -07:00
Darren Shepherd 0726ce75e9
Merge pull request #416 from galal-hussein/change_systemd_target 
Change systemd unit file target to network-online.target
 2019-04-30 11:24:17 -07:00
galal-hussein c30c809642 Change systemd unit file target to network-online.target 2019-04-30 01:28:58 +02:00
Darren Shepherd 8867c509ce Add ability to set architecture 
The ARCH env var can be set by the install.sh caller.  This is
specifically important if you want to install arm on arm64.
 2019-04-29 09:14:43 -07:00
Erik Wilson 3af2618393 Fix systemd install not starting 2019-04-26 22:13:38 -07:00
Erik Wilson fa673468ce Add INSTALL_K3S_BIN_DIR_READ_ONLY variable 2019-04-25 14:18:16 -07:00