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

Remove deprecated implicit hooks directory handling #2731

Merged
merged 1 commit into from Sep 13, 2019

Conversation

saschagrunert
Copy link
Member

If hooks_dir is unset, CRI-O will not longer default to
/usr/share/containers/oci/hooks.d and /etc/containers/oci/hooks.d
because this behavior is depcrecated since some releases.

Documentation has been adapted as well.

If `hooks_dir` is unset, CRI-O will not longer default to
`/usr/share/containers/oci/hooks.d` and `/etc/containers/oci/hooks.d`
because this behavior is depcrecated since some releases.

Documentation has been adapted as well.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
@openshift-ci-robot openshift-ci-robot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Aug 16, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert

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

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 16, 2019
@saschagrunert
Copy link
Member Author

/test integration_fedora

@TomSweeneyRedHat
Copy link
Contributor

LGTM
I'm assuming this will be noted in the Release Announcement?

@saschagrunert
Copy link
Member Author

/retest

@haircommander
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. labels Sep 13, 2019
@haircommander haircommander added the release-1.16 this PR should make it into release-1.16 label Sep 13, 2019
@saschagrunert
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit c33d10a into cri-o:master Sep 13, 2019
@saschagrunert saschagrunert deleted the hooks branch September 13, 2019 15:16
@haircommander
Copy link
Member

/cherry-pick release-1.16

@openshift-cherrypick-robot

@haircommander: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/cri-o\n ! [remote rejected] cherry-pick-2731-to-release-1.16 -> cherry-pick-2731-to-release-1.16 (cannot lock ref 'refs/heads/cherry-pick-2731-to-release-1.16': reference already exists)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/openshift-cherrypick-robot/cri-o'\n", error: exit status 1

In response to this:

/cherry-pick release-1.16

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.

@openshift-cherrypick-robot

@haircommander: new pull request created: #2802

In response to this:

/cherry-pick release-1.16

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.

@vrothberg
Copy link
Member

We're seeing regressions by the changed behavior as some deployments were relying on these defaults. To be fair, CRI-O has been warning about the deprecation for almost a year but the fact we're regressing shows that warnings are not enough and that we didn't scream about this when releasing so package updates and/or config managers can properly set the hooks_dir in crio.conf.

This PR is just pulling the trigger of an earlier decision and doesn't deserve any blame but I still wanted to share the impact.

haircommander added a commit to haircommander/machine-config-operator that referenced this pull request Dec 2, 2019
In CRI-O we moved to not using implicit hooks dirs (cri-o/cri-o#1943, cri-o/cri-o#2731).
Unfortunately, we never set a default, until: cri-o/cri-o#3011. The default isn't enough, though.
We also need /etc/containers/oci/hook.d because /usr is immutable, so a user can't add hooks.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@openshift-ci-robot openshift-ci-robot mentioned this pull request Dec 3, 2019
haircommander added a commit to haircommander/machine-config-operator that referenced this pull request Dec 4, 2019
In CRI-O we moved to not using implicit hooks dirs (cri-o/cri-o#1943, cri-o/cri-o#2731).
Unfortunately, we never set a default, until: cri-o/cri-o#3011. The default isn't enough, though.
We also need /etc/containers/oci/hook.d because /usr is immutable, so a user can't add hooks.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants