Skip to content

Bug 1794493: Update crio.yaml templates with correct values #1405

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
Closed
umohnani8 wants to merge 2 commits into from
Closed

Bug 1794493: Update crio.yaml templates with correct values #1405

umohnani8 wants to merge 2 commits into from

Conversation

@umohnani8
Copy link
Contributor

@umohnani8 umohnani8 commented Jan 23, 2020

Update the templates with the corret defaults from cri-o.

Signed-off-by: Urvashi Mohnani [email protected]

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 23, 2020
@umohnani8
Copy link
Contributor Author

umohnani8 commented Jan 23, 2020

Opening this with the updated template fixes. @haircommander will probably pull this into his PR when he adds in the e2e tests.

@umohnani8
Update crio.yaml templates with correct values
2e2d80e 
Update the templates with the corret defaults from cri-o.

Signed-off-by: Urvashi Mohnani <[email protected]>
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 23, 2020
@haircommander
Copy link
Member

haircommander commented Jan 23, 2020

/retest

@wking
Copy link
Member

wking commented Jan 23, 2020

/retitle Bug 1792749: Update crio.yaml templates with correct values

@openshift-ci-robot openshift-ci-robot changed the title Fixes: #1792749 Update crio.yaml templates with correct values Bug 1792749: Update crio.yaml templates with correct values Jan 23, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 23, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 23, 2020

@umohnani8: This pull request references Bugzilla bug 1792749, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Bug 1792749: Update crio.yaml templates with correct values

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.

wking
wking reviewed Jan 23, 2020
View reviewed changes
templates/master/01-master-container-runtime/_base/files/crio.yaml
# so we add /etc/containers/oci/hooks.d as well
hooks_dir = [
"/etc/containers/oci/hooks.d",
"/etc/containers/oci/hooks.d",
Copy link
Member

@wking wking Jan 23, 2020

Choose a reason for hiding this comment

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

injecting trailing whitespace, what!? ;) Obviously a nit, but maybe worth fixing in whatever source this was pulled from.

wking
wking reviewed Jan 23, 2020
View reviewed changes
templates/master/01-master-container-runtime/_base/files/crio.yaml

# The port on which the metrics server will listen.
metrics_port = 9537

No newline at end of file
Copy link
Member

@wking wking Jan 23, 2020

Choose a reason for hiding this comment

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

removing a trailing newline? I'd rather keep it, but I dunno if Go's YAML parser cares or not.

kikisdeliveryservice
kikisdeliveryservice approved these changes Jan 23, 2020
View reviewed changes
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

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

Approve, but deferring to @wking for LGTM ;)

@wking
Copy link
Member

wking commented Jan 23, 2020

/retitle Bug 1794493: Update crio.yaml templates with correct values

This PR is actually fixing 1794493. We hope that will also fix 1792749. If 1792749 is in fact fixed by this PR, we can close it as a dup of 1794493 after demonstrating the fix works.

@openshift-ci-robot openshift-ci-robot changed the title Bug 1792749: Update crio.yaml templates with correct values Bug 1794493: Update crio.yaml templates with correct values Jan 23, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 23, 2020

@umohnani8: This pull request references Bugzilla bug 1794493, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Bug 1794493: Update crio.yaml templates with correct values

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.

@kikisdeliveryservice kikisdeliveryservice added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 23, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 23, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kikisdeliveryservice, umohnani8

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [kikisdeliveryservice]

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

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jan 23, 2020

level=error msg="Error: Error waiting for AMI (ami-02831ae178a35dd3d) to be ready: timeout while waiting for state to become 'available' (last state: 'pending', timeout: 40m0s)"

/retest

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jan 23, 2020

an e2e test is forthcoming so holding to ship with fix.

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2020
@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jan 24, 2020

/retest

1 similar comment
@ashcrow
Copy link
Member

ashcrow commented Jan 25, 2020

/retest

ashcrow
ashcrow reviewed Jan 25, 2020
View reviewed changes
templates/master/01-master-container-runtime/_base/files/crio.yaml
# for the runtime. If not specified, then the internal default seccomp profile
# will be used.
# seccomp_profile = "/etc/crio/seccomp.json"
seccomp_profile = ""
Copy link
Member

@ashcrow ashcrow Jan 25, 2020

Choose a reason for hiding this comment

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

Is it true that explicitly setting to "" is the same as "not specified"?

ashcrow
ashcrow reviewed Jan 25, 2020
View reviewed changes
Copy link
Member

@ashcrow ashcrow left a comment

Choose a reason for hiding this comment

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

nit: A bit of extra whitespace at the end of some lines.

One question posted. Neither blocking.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 25, 2020

@umohnani8: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 2e2d80e link /test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

@runcom
Copy link
Member

runcom commented Jan 25, 2020

/skip

@haircommander haircommander mentioned this pull request Jan 28, 2020
Merged
@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jan 28, 2020

Can we close this and defer to #1414 which has these changes plus e2e?

@umohnani8
Copy link
Contributor Author

umohnani8 commented Jan 29, 2020

Closing in favour of #1414

@umohnani8 umohnani8 closed this Jan 29, 2020
@haircommander haircommander mentioned this pull request Feb 6, 2020
Merged
@umohnani8 umohnani8 deleted the crio-template branch January 22, 2026 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ashcrow ashcrow ashcrow left review comments

@wking wking wking left review comments

+1 more reviewer

@kikisdeliveryservice kikisdeliveryservice kikisdeliveryservice approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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.

7 participants

@umohnani8 @haircommander @wking @openshift-ci-robot @kikisdeliveryservice @ashcrow @runcom