Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix data-dir handling for crictl and helm charts #622

Merged
merged 2 commits into from
Dec 17, 2020
Merged

Fix data-dir handling for crictl and helm charts #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ea918
Update k3s
brandond Dec 16, 2020
7e4ccbb
Pass through data-dir to Helm charts as global.rke2DataDir`
brandond Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/advanced.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RKE2 will generate the `config.toml` for containerd in `/var/lib/rancher/rke2/ag

For advanced customization of this file you can create another file called `config.toml.tmpl` in the same directory and it will be used instead.

The `config.toml.tmpl` will be treated as a Go template file, and the `config.Node` structure is being passed to the template. See [this template](https://github.com/rancher/k3s/blob/master/pkg/agent/templates/templates.go#L16-L32) for an example of how to use the structure to customize the configuration file.
The `config.toml.tmpl` will be treated as a Go template file, and the `config.Node` structure is being passed to the template. See [this template](https://github.com/k3s-io/k3s/blob/master/pkg/agent/templates/templates.go#L16-L32) for an example of how to use the structure to customize the configuration file.

## Secrets Encryption Config

Expand Down
2 changes: 1 addition & 1 deletion docs/architecture/architecture.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ On server nodes, the `helm-controller` can now apply to the cluster any [charts]

The RKE2 process will now run indefinitely until it receives a SIGTERM or SIGKILL or if the `containerd` process exits.

[gh-k3s]: <https://github.com/rancher/k3s> "K3s - Lightweight Kubernetes"
[gh-k3s]: <https://github.com/k3s-io/k3s> "K3s - Lightweight Kubernetes"
[io-k3s]: <https://k3s.io> "K3s - Lightweight Kubernetes"
[gh-kubernetes]: <https://github.com/kubernetes/kubernetes> "Production-Grade Container Orchestration"
[io-kubernetes]: <https://kubernetes.io> "Production-Grade Container Orchestration"
Expand Down
8 changes: 6 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ replace (
github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc92
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
go.etcd.io/etcd => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
google.golang.org/grpc => google.golang.org/grpc v1.27.1
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2
Expand Down Expand Up @@ -50,17 +51,20 @@ replace (

require (
github.com/containerd/containerd v1.4.3 // indirect
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible // indirect
github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c
github.com/k3s-io/helm-controller v0.8.0
github.com/pkg/errors v0.9.1
github.com/rancher/helm-controller v0.7.3
github.com/rancher/k3s v1.19.6-0.20201210225642-b11612e2744f // v1.19.5+k3s1
github.com/rancher/k3s v1.19.2-0.20201208230637-989c936993fb
github.com/rancher/wrangler v0.6.1
github.com/sirupsen/logrus v1.6.0
github.com/urfave/cli v1.22.2
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
google.golang.org/grpc v1.31.1
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/apiserver v0.19.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/kubernetes v1.19.5 // indirect
sigs.k8s.io/yaml v1.2.0
)
Loading