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

crio: align template crio.conf with upstream #6432

Merged
merged 1 commit into from
Aug 1, 2020
Merged

crio: align template crio.conf with upstream #6432

merged 1 commit into from
Aug 1, 2020

Conversation

hafe
Copy link
Contributor

@hafe hafe commented Jul 19, 2020 •
edited
Loading

  • log level by default increased to 'info'
  • cgroup manager by default set to 'systemd'
  • stream port (used by kubelet) bound to 127.0.0.1 for security reasons
  • metrics can be enabled and port specified
  • Capabilities NET_RAW and SYS_CHROOT removed from defaults

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug

/kind cleanup

/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Rendered template (crio.conf) should be diff-ed with the one from the rpm and/or command "crio config"

Does this PR introduce a user-facing change?: yes

@k8s-ci-robot k8s-ci-robot requested review from EppO and floryut July 19, 2020 20:22
@k8s-ci-robot
Copy link
Contributor

Hi @hafe. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 19, 2020
@floryut
Copy link
Member

floryut commented Jul 19, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 19, 2020
@hafe
crio: align template crio.conf with upstream
dbc8235 
* log level by default increased to 'info'
* cgroup manager by default set to 'systemd'
* stream port (used by kubelet) bound to 127.0.0.1 for security reasons
* metrics can be enabled and port specified
@EppO
Copy link
Contributor

EppO commented Jul 31, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 31, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Aug 1, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hafe, Miouge1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2020
@k8s-ci-robot k8s-ci-robot merged commit c6e5be9 into kubernetes-sigs:master Aug 1, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Aug 6, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
4e1e4ba 
* 'master' of https://github.com/kubernetes-sigs/kubespray: (30 commits)
  Minor Ambassador docs updates (kubernetes-sigs#6503)
  Fix cilium strict kube proxy replacement in HA (kubernetes-sigs#6473)
  Upgrade JetStack Cert-Manager to v0.15.2 (kubernetes-sigs#6414)
  Fix E306 in tests/ (kubernetes-sigs#6495)
  Fix E306 in roles/kubernetes (kubernetes-sigs#6500)
  Allows tls verify skip on webhook auth url (kubernetes-sigs#6472)
  Fix E306 in scripts/ (kubernetes-sigs#6496)
  Correct sample inventory to pass yamllint (kubernetes-sigs#6499)
  Option for MetalLB to talk BGP (kubernetes-sigs#6383)
  bootstrap-os for remove-node (kubernetes-sigs#6154)
  Quoted type constraints are deprecated (kubernetes-sigs#6497)
  Update base image to v2.13.3 (kubernetes-sigs#6494)
  Fix Flexvolume mount in Openstack Controller (kubernetes-sigs#6480)
  Remove hvac dependency (kubernetes-sigs#6476)
  Create a PodDisruptionBudget for the Cinder CSI controllerplugin (kubernetes-sigs#6385)
  Upgrade molecule to v3 (kubernetes-sigs#6468)
  Remove workaround for kubeadm upgrade (kubernetes-sigs#6478)
  Update kube-router to 1.0.1 and kube-ovn to 1.3.0 (kubernetes-sigs#6479)
  fix src for audit webhook config yaml (kubernetes-sigs#6470)
  crio: align template crio.conf with upstream (kubernetes-sigs#6432)
  ...
@floryut floryut mentioned this pull request Aug 14, 2020
Closed
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 10, 2021
@hafe @LuckySB
crio: align template crio.conf with upstream (kubernetes-sigs#6432)
f8fc8f8 
* log level by default increased to 'info'
* cgroup manager by default set to 'systemd'
* stream port (used by kubelet) bound to 127.0.0.1 for security reasons
* metrics can be enabled and port specified
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeanfabrice jeanfabrice jeanfabrice left review comments

@EppO EppO Awaiting requested review from EppO

@floryut floryut Awaiting requested review from floryut

Assignees

@EppO EppO

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@hafe @k8s-ci-robot @floryut @EppO @Miouge1 @jeanfabrice