diff --git a/README.md b/README.md index 7d617ab93a..5fd1071199 100644 --- a/README.md +++ b/README.md @@ -103,12 +103,12 @@ The RPM will install a corresponding `rke2-server.service` or `rke2-agent.servic In addition to configuring RKE2 with environment variables and cli arguments, RKE2 can also use a config file. -By default, values present in a `yaml` file located at `/etc/rancher/rke2/flags.conf` will be used on install. +By default, values present in a `yaml` file located at `/etc/rancher/rke2/config.yaml` will be used on install. An example of a basic `server` config file is below: ```yaml -# /etc/rancher/rke2/flags.conf +# /etc/rancher/rke2/config.yaml write-kubeconfig-mode: "0644" tls-san: - "foo.local" diff --git a/go.mod b/go.mod index 3190d98f51..4cb6d06168 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/pkg/errors v0.9.1 github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect - github.com/rancher/k3s v1.18.3-0.20200821205209-037d8b1393d6 + github.com/rancher/k3s v1.18.3-0.20200826044348-c4ac620b8ba2 github.com/rancher/spur v0.0.0-20200617165101-8702c8e4ce7a github.com/rancher/wrangler v0.6.1 github.com/sirupsen/logrus v1.6.0 diff --git a/go.sum b/go.sum index 4427feeae0..2507f2bca2 100644 --- a/go.sum +++ b/go.sum @@ -665,8 +665,8 @@ github.com/rancher/flannel v0.11.0-k3s.2 h1:0GVr5ORAIvcri1LYTE8eMQ+NrRbuPeIniPaW github.com/rancher/flannel v0.11.0-k3s.2/go.mod h1:Hn4ZV+eq0LhLZP63xZnxdGwXEoRSxs5sxELxu27M3UA= github.com/rancher/helm-controller v0.7.2 h1:noDPX08rnEoYhTGfgyLdEqG7DvihYbWJagbdS9OiA7s= github.com/rancher/helm-controller v0.7.2/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= -github.com/rancher/k3s v1.18.3-0.20200821205209-037d8b1393d6 h1:pQekjpSJ75ukkzU/IcOTR3AZeuPE0RBzj87nXHyeCas= -github.com/rancher/k3s v1.18.3-0.20200821205209-037d8b1393d6/go.mod h1:JEM5eCFDD5g1m/Lm5CQfyAPZsfeSBJumMyiEAQ6L/Nw= +github.com/rancher/k3s v1.18.3-0.20200826044348-c4ac620b8ba2 h1:okeIRaEWHTgP/y+nwPGLxG9WXLiaUhHw71E4db7fdNM= +github.com/rancher/k3s v1.18.3-0.20200826044348-c4ac620b8ba2/go.mod h1:JEM5eCFDD5g1m/Lm5CQfyAPZsfeSBJumMyiEAQ6L/Nw= github.com/rancher/kine v0.4.0 h1:1IhWy3TzjExG8xnj46eyUEWdzqNAD1WrgL4eEBKm6Uc= github.com/rancher/kine v0.4.0/go.mod h1:IImtCJ68AIkE+VY/kUI0NkyJL5q5WzO8QvMsSXqbrpA= github.com/rancher/kubernetes v1.18.4-k3s1 h1:eTwiRm2Gu8AUDgrda5FK8atZvkh6/3ZDoRFsxmnLvLc= diff --git a/pkg/cli/cmds/k3sopts.go b/pkg/cli/cmds/k3sopts.go index acfcecbd11..4e3af31d66 100644 --- a/pkg/cli/cmds/k3sopts.go +++ b/pkg/cli/cmds/k3sopts.go @@ -10,7 +10,7 @@ import ( ) func init() { - cmds.ConfigFlag.Value = "/etc/rancher/rke2/flags.conf" + cmds.ConfigFlag.Value = "/etc/rancher/rke2/config.yaml" } var (