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.

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

salt: Use systemd cgroupdriver instead of cgroupfs #3377

Merged
merged 1 commit into from
May 12, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'salt', 'kubelet', 'containerd'

Context:

#3366

Summary:

To match recommendation from Kubernetes/kubeadm, change the
cgroupDriver from Kubelet to systemd and update containerd config
file accordingly

Sees: https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd-systemd

Acceptance criteria:

  • Install: OK
  • Upgrade: OK
  • Downgrade: OK

This change only implies all containers to restart but that kind of behavior is already handled by the upgrade/downgrade process


Fixes: #3366

@TeddyAndrieux TeddyAndrieux requested a review from a team May 11, 2021 12:43
@bert-e
Copy link
Contributor

bert-e commented May 11, 2021

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 11, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/use-systemd-cgroup-for-kubelet branch from db5629c to 5ffaa75 Compare May 11, 2021 12:43
@bert-e
Copy link
Contributor

bert-e commented May 11, 2021

Conflict

There is a conflict between your branch improvement/use-systemd-cgroup-for-kubelet and the
destination branch development/2.10.

Please resolve the conflict on the feature branch (improvement/use-systemd-cgroup-for-kubelet).

 $ git fetch
 $ git checkout origin/improvement/use-systemd-cgroup-for-kubelet
 $ git merge origin/development/2.10
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/use-systemd-cgroup-for-kubelet

To match recommendation from Kubernetes/kubeadm, change the
`cgroupDriver` from Kubelet to `systemd` and update containerd config
file accordingly

Sees: https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd-systemd

Fixes: #3366
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/use-systemd-cgroup-for-kubelet branch from 5ffaa75 to d7a71a4 Compare May 12, 2021 09:52
@bert-e
Copy link
Contributor

bert-e commented May 12, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 12, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 12, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.10

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 12, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.10

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit d7a71a4 into development/2.10 May 12, 2021
@bert-e bert-e deleted the improvement/use-systemd-cgroup-for-kubelet branch May 12, 2021 12:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use systemd cgroupdriver instead of cgroupfs in Kubelet
3 participants