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

Jump to bottom

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

merged 2 commits into from
Dec 17, 2020

Conversation

brandond
Copy link
Member

@brandond brandond commented Dec 17, 2020 •
edited
Loading

Proposed Changes

  • Bump K3s version to pull through crictl.yaml fix from Multiple small fixes k3s-io/k3s#2475
  • Update rancher/helm-controller to k3s-io/helm-controller to track with k3s (and update a couple docs to track the move as well)
  • Pass through data-dir to helm charts as global.rke2DataDir so that templates can update host paths accordingly

Types of Changes

  • K3s
  • Helm chart bootstrap

Verification

  • Start RKE2 with --data-dir=/opt/rancher/rke2 in CLI flags or config file
  • Note that /var/lib/rancher/rke2 does not exist
  • Note that all pods start up successfully

Linked Issues

#474
#535
rancher/rke2-charts#36

Further Comments

@brandond
Update k3s
91ea918 
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner December 17, 2020 00:12
@brandond brandond requested review from briandowns and a team December 17, 2020 00:30
galal-hussein
galal-hussein approved these changes Dec 17, 2020
View reviewed changes
Copy link
Contributor

@galal-hussein galal-hussein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@brandond brandond merged commit 129bcc6 into rancher:master Dec 17, 2020
@brandond brandond deleted the bump_k3s_474 branch June 6, 2024 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@briandowns briandowns briandowns approved these changes

@galal-hussein galal-hussein galal-hussein approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brandond @galal-hussein @briandowns