Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,620 Commits 27 Branches 785 Tags 625 MiB
215fb157ff
Commit Graph

201 Commits

Author SHA1 Message Date
Brad Davidson
c4ac620b8b
Merge pull request #2159 from brandond/config_file_rename 
Rename flags.conf to config.yaml
 2020-08-25 21:43:48 -07:00
Brad Davidson
b4d81a9e33 Remove lingering references to dqlite 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-24 17:09:19 -07:00
Brad Davidson
43fcc5ddcb Rename flags.conf => config.yaml 
Related to https://github.com/rancher/rke2/issues/150

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-24 14:56:30 -07:00
Brian Downs
324bb55986 add ctx to hook, handle hook errors 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-08-19 16:54:58 -07:00
Brian Downs
fa2c1422b3 change name of variable 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-08-19 14:30:53 -07:00
Brian Downs
a4b2953017 add setup hook capabilities for rke2 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-08-19 13:42:45 -07:00
Jacob Blain Christen
e2089bea18
cli: add --selinux flag to agent/server sub-cmds (#2111) 
* cli: add --selinux flag to agent/server sub-cmds

Introduces --selinux flag to affirmatively enable SELinux in containerd.
Deprecates --disable-selinux flag which now defaults to true which
auto-detection of SELinux configuration for containerd is no longer
supported.  Specifying both --selinux and --disable-selinux will result
in an error message encouraging you to pick a side.

* Update pkg/agent/containerd/containerd.go

update log warning message about enabled selinux host but disabled runtime

Co-authored-by: Brad Davidson <brad@oatmail.org>
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-08-11 16:17:32 -07:00
Brian Downs
5a81fdbdc5 update cis flag implementation to propogate the rest of the way through to kubelet 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-07-20 16:31:56 -07:00
Jason
e3f8789114
Add containerd snapshotter flag (#1991) 
* Add containerd snapshotter flag

Signed-off-by: Jason-ZW <zhenyang@rancher.com>

* Fix CamelCase nit and option description

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Jason-ZW <zhenyang@rancher.com>

Co-authored-by: Brad Davidson <brad@oatmail.org>
 2020-07-18 01:16:23 +02:00
Brian Downs
abb2d9aad1 add flag usage 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-07-14 15:55:18 -07:00
Brian Downs
57a6319fac add protect-kernel-defaults to kubelet 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-07-14 15:46:10 -07:00
Erik Wilson
e1dc3451bc
Add config file support 2020-07-10 10:34:00 -07:00
Darren Shepherd
7e59c0801e Make program name a variable to be changed at compile time 2020-06-06 16:39:41 -07:00
Darren Shepherd
2f5ee914f9 Add supervisor port 
In k3s today the kubernetes API and the /v1-k3s API are combined into
one http server.  In rke2 we are running unmodified, non-embedded Kubernetes
and as such it is preferred to run k8s and the /v1-k3s API on different
ports.  The /v1-k3s API port is called the SupervisorPort in the code.

To support this separation of ports a new shim was added on the client in
then pkg/agent/proxy package that will launch two load balancers instead
of just one load balancer.  One load balancer for 6443 and the other
for 9345 (which is the supervisor port).
 2020-05-05 15:54:51 -07:00
Erik Wilson
39c3854648
Merge pull request #1720 from ilknarf/master 
remove redundant Sprintf
 2020-05-04 20:50:58 -07:00
Erik Wilson
c71561129e
Merge pull request #1716 from ibuildthecloud/debugpublic 
Make debug variable public to be used by wrapper programs
 2020-05-04 20:50:36 -07:00
Erik Wilson
c941e1d0bb
Merge pull request #1695 from ibuildthecloud/kubeproxy 
Add ability to disable kubeproxy
 2020-05-04 20:26:22 -07:00
Erik Wilson
df1725cb06
Merge pull request #1694 from ibuildthecloud/inittwice 
Allow InitLogging to be called twice
 2020-05-04 20:22:04 -07:00
Frank
a18d94e5f9 remove redundant Sprintf 2020-04-30 10:48:12 -05:00
Darren Shepherd
56770ff2cc Make debug variable public to be used by wrapper programs 2020-04-29 11:37:59 -07:00
Darren Shepherd
5715e1ba0d Add ability to disable kubeproxy 2020-04-27 11:24:00 -07:00
Darren Shepherd
8cc9efdf7c Allow InitLogging to be called twice 
This makes it a bit easier to embed k3s into another go program
 2020-04-27 11:16:08 -07:00
Darren Shepherd
8b8af94eb2 Move disabled items to a const to keep more consistency 
This also help when embedding k3s because we can programmitically know
all the components to disable.
 2020-04-27 11:15:35 -07:00
galal-hussein
3f927d8006 Revert "Replace traefik with nginx" 
This reverts commit 9a17033095.
 2020-03-11 01:45:23 +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
a3cb9ee1f6 Simplify SELinux detection and add --disable-selinux flag 2020-02-28 10:10:55 -07:00
Erik Wilson
0374c4f63d Add --disable flag 2020-01-30 16:45:01 -07:00
Erik Wilson
1a2690d7be
Merge pull request #1192 from galal-hussein/add_encryption_config 
Add secret encryption config
 2020-01-27 13:59:09 -07:00
Erik Wilson
7675f9f85c Clean up host-gw variable names 2020-01-08 17:43:07 -07:00
Segator
c23f12765e hostgw flannel support 2020-01-08 17:43:07 -07:00
galal-hussein
388cd9c4e8 Add secret encryption configuration 2019-12-23 13:16:27 +02:00
Erik Wilson
d4959d53af
Merge pull request #1182 from erikwilson/docker-pause-image 
Allow --pause-image to set docker sandbox image also
 2019-12-11 10:36:07 -07:00
Erik Wilson
2eacfa75cb
Merge pull request #1180 from erikwilson/cleanup-flannel-backend-help-text 
Cleanup --flannel-backend help text
 2019-12-11 10:35:50 -07:00
Erik Wilson
2de93d70cf Allow --pause-image to set docker sandbox image also 2019-12-10 16:16:26 -07:00
Erik Wilson
11e4d01efe Cleanup --flannel-backend help text 2019-12-10 14:51:16 -07:00
Jacob Blain Christen
063efb25bb Mutable --node-label values for server/agent sub-commands. 
Values passed in via the server/agent `--node-label` flag are treated as mutable. They are passed through to the kubelet just as before but after the kubelet comes up they are applied again. This allows for passing labels a k3s start-time that may be necessary for scheduling but may change from boot to boot, e.g. `k3os.io/version` after an upgrade.

Tested locallon on my amd64 workstation with the docker container.

Addresses #1119.
 2019-12-09 16:40:15 -07:00
galal-hussein
99b8222e8d Change storage to datastore 2019-11-15 21:52:07 -07:00
Erik Wilson
95ff805c98 Fix broken K3S_TOKEN env 2019-11-14 12:42:42 -07:00
Erik Wilson
d4151b7739 Add the --with-node-id flag to agent 2019-11-13 16:13:41 -07:00
Erik Wilson
a73f8b1773 Update check-config.sh for k3s 2019-11-13 08:34:24 -07:00
Erik Wilson
e4b3730fa2 Go DNS lookup order hack 2019-11-12 20:16:31 -07:00
Erik Wilson
55c05ac500 Refactor node password location 2019-11-12 15:30:34 -07:00
Darren Shepherd
3e213d1347 Allow --debug to be set with K3S_DEBUG env var 2019-11-12 08:22:48 +00:00
Darren Shepherd
3f5fb70116 Move server arguments to experimental for dqlite related 2019-11-12 01:12:24 +00:00
Darren Shepherd
e2431bdf9d Add dqlite support 2019-11-10 03:49:56 +00:00
Darren Shepherd
53d3ab074c Shrink k3s wrapper binary 2019-11-08 21:35:58 +00:00
Erik Wilson
0fef39de65 Add default multi-arch metrics-server deployment 2019-11-05 10:11:08 -07:00
Darren Shepherd
ba240d0611 Refactor tokens, bootstrap, and cli args 2019-10-30 19:06:49 -07:00
Erik Wilson
f648a64ee3
Merge pull request #923 from AkihiroSuda/fix-rootless-kubelet-flags 
rootless: add kubelet flags automatically
 2019-10-25 01:40:06 -07:00
Akihiro Suda
aafccdbccb rootless: add kubelet flags automatically 
Fix https://github.com/rancher/k3s/issues/784

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-10-25 17:10:14 +09:00
Erik Wilson
ad4ea681ce Hide the --disable-agent flag 2019-10-24 21:51:58 -07:00
Erik Wilson
da3a7c6bbc Add network policy controller 2019-10-18 16:11:42 -07:00
galal-hussein
d2c1f66496 Add k3s cloud provider 2019-10-16 21:13:15 +02:00
galal-hussein
5ccc880ddb Add private registry to containerd 2019-10-08 01:54:53 +02:00
galal-hussein
56e0e5ad7e Add default local storage provisioner 2019-09-30 18:17:33 +02:00
Erik Wilson
6f7a1a70fa Label new flannel flags as experimental 2019-09-27 18:33:05 -07:00
Erik Wilson
959acf9c92 Add --flannel-backend flag 2019-09-27 18:26:39 -07:00
Erik Wilson
3cd807a657 Add --flannel-conf flag 2019-09-27 18:26:39 -07:00
Darren Shepherd
2cb6f52339 Disable storing bootstrap information by default 2019-08-24 22:27:24 -07:00
galal-hussein
1ae0c540d7 Refactor bootstrap, move kine startup code to kine, integrate kine 2019-08-22 09:14:43 -07:00
Erik Wilson
30e050a692 Cleanup logging 2019-08-07 22:45:54 -07:00
Erik Wilson
a17e336993 Use go tcpproxy 2019-07-30 09:53:15 -07:00
Darren Shepherd
dbb7b04c3d Add option to disable scheduler 2019-07-12 09:59:03 -07:00
Erik Wilson
24b73403c7 Cleanup bootstrap 2019-06-30 12:39:54 -07:00
Erik Wilson
4b540f8d94 Cleanup command help text 2019-06-28 18:18:03 -07:00
galal-hussein
37582b6fac Add cert storage backend flag 2019-06-28 20:47:21 +02:00
Erik Wilson
2c9444399b Refactor certs 2019-06-25 15:04:04 -07:00
galal-hussein
17d8708ca5 Add storage backend flags 2019-06-12 00:48:47 +02:00
Erik Wilson
199f673676
Merge pull request #479 from galal-hussein/add_storage_backend_options 
Add MySQL and Postgress support
 2019-05-28 16:57:38 -07:00
galal-hussein
e9cd8adbf6 Add Storage endpoint option 2019-05-16 01:05:24 +02:00
galal-hussein
930093dfe9 Expose node labels and taints and add node roles 2019-05-08 01:47:07 +02:00
haokang.ke
52f845ec84 Make pause image configurable (#345) 2019-05-03 10:36:12 -07:00
Darren Shepherd
0e3711b8b7
Merge pull request #339 from km4rcus/cluster-domain-option 
Add --cluster-domain option
 2019-04-15 10:06:07 -07:00
Darren Shepherd
08c3d0d4ef
Merge pull request #250 from yoink00/master 
Allow flannel interface to be specified on the command line
 2019-04-15 10:01:22 -07:00
Stuart Wallace
2268e028a2 Add ability to override flannel interface 2019-04-12 21:06:43 +01:00
Marco Mancini
b445bad171 Add --cluster-domain option 2019-04-12 08:06:35 +02:00
galal-hussein
e5d8d72e59 Fix comment of bind address 2019-04-12 02:30:49 +02:00
Darren Shepherd
046a817818 Add rootless support 2019-04-09 10:38:04 -07:00
galal-hussein
7794528aa1 Add extra flags for server and agent components 2019-04-09 08:20:38 +02:00
galal-hussein
d255574150 Add bind address server config 2019-03-31 02:10:23 +02:00
Erik Wilson
a4df9f4ab1 Kubelet resolv.conf DNS update 
Allow the kubelet resolv-conf flag to be set, or automatically
discovered from /etc/resolv.conf & /run/systemd/resolve/resolv.conf if
no loopback devices are present, or create our own which points to
nameserver 8.8.8.8
 2019-03-26 23:13:54 +00:00
Erik Wilson
1d61576e54 Fix linting issues 2019-03-25 16:04:29 -07:00
Darren Shepherd
4463408819
Merge pull request #239 from takmatsu/add-hosts 
Add tls-san flag
 2019-03-25 09:54:21 -07:00
Erik Wilson
2768f559c1 Fix go fmt error 2019-03-24 12:19:05 -07:00
Takeaki Matsumoto
3a6b305455 Change flag name and type 2019-03-23 17:34:55 +00:00
Takeaki Matsumoto
9551e1db21 Add advertise-address flag 
In NAT or LB environment,
we need not just the certs for local ip, but also additional ips.
advertise-address flag enables to add optional ips.
 2019-03-18 08:26:23 +00:00
Vladimir Zorin
44cce9a76f Set ClusterDNS to ServiceCIDR network address + 10 when cluster-dns is not provided 2019-03-06 20:41:07 +02:00
Vladimir Zorin
7ad03ad8b0 Add cluster-dns server arg support 2019-03-06 13:16:04 +02:00
Vladimir Zorin
b8c3ff1dab Add --service-cidr server arg support 2019-03-06 12:37:03 +02:00
Darren Shepherd
8acc17fcf3
Merge branch 'master' into tokenfile 2019-03-04 10:10:01 -07:00
Darren Shepherd
70e6ca4ab8 Support external CRI implementations 2019-03-04 10:08:12 -07:00
Darren Shepherd
3d113ceb2d Add agent command to server command 2019-03-04 10:08:12 -07:00
Darren Shepherd
91f9472751 Add traefik to no-deploy help text 2019-03-04 10:07:10 -07:00
Darren Shepherd
e5b7d36c55 Actually pass cluster-cidr on to server 2019-03-04 10:06:37 -07:00
Darren Shepherd
e28e497168 Add --token-file support 2019-03-01 17:07:55 -07:00
Darren Shepherd
01b3bb315e Fix version printing on startup 2019-02-07 21:45:31 -07:00
Darren Shepherd
793ac4fb89 Add crictl 2019-02-07 21:45:31 -07:00
Darren Shepherd
e832588662 Add embedded service load balancer 2019-02-04 16:47:53 -07:00
Darren Shepherd
287e0f44c9 Prepare for initial release 2019-01-22 14:20:29 -07:00
Darren Shepherd
62c62cc7b4 Continued refactoring 2019-01-11 21:52:30 -07:00