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

templates/common/_base/units: disable docker #1907

Closed
wants to merge 1 commit into from
Closed

templates/common/_base/units: disable docker #1907

wants to merge 1 commit into from

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1898

/assign vrutkovs

@vrutkovs
templates/common/_base/units: disable docker
efd085b 
This adds a condition to docker.socket which it can't fullfil,
so that OKD nodes would not run unused docker service.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 7, 2020
Merged
@vrutkovs
Copy link
Member

vrutkovs commented Jul 7, 2020

/retitle templates/common/_base/units: disable docker

@openshift-ci-robot openshift-ci-robot changed the title [master] [fcos] templates/common/_base/units: disable docker templates/common/_base/units: disable docker Jul 7, 2020
@vrutkovs
Copy link
Member

vrutkovs commented Jul 7, 2020

RHCOS doesn't ship docker, but FCOS does. In order to use MCO on both RHCOS and FCOS it should disable unnecessary services regardless of the base OS

@ashcrow ashcrow requested a review from runcom July 7, 2020 14:32
@ashcrow
Copy link
Member

ashcrow commented Jul 7, 2020

/retest

@ashcrow ashcrow removed their request for review July 7, 2020 14:32
@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jul 7, 2020 •
edited
Loading

these two jobs are currently broken: scaleuprhel7/metal-ipi

/skip

@kikisdeliveryservice
Copy link
Contributor

e2e-aws has been struggling for the last few days

/retest

@cgwalters
Copy link
Member

/approve
/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, openshift-cherrypick-robot

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 lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 14, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@cgwalters cgwalters mentioned this pull request Jul 14, 2020
Merged
LorbusChris
LorbusChris suggested changes Jul 14, 2020
View reviewed changes
Copy link
Member

@LorbusChris LorbusChris left a comment

Choose a reason for hiding this comment

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

I think we should call this file docker.socket.yaml (!yml) to keep naming in line with the other templates?

@LorbusChris
Copy link
Member

I don't want to block on the above, but I want to give @vrutkovs a change to see it before it merges :) feel free to un-hold if you feel it doesn't matter much.
/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 Jul 14, 2020
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 efd085b link /test e2e-aws-scaleup-rhel7
ci/prow/e2e-metal-ipi efd085b link /test e2e-metal-ipi
ci/prow/e2e-gcp-upgrade efd085b link /test e2e-gcp-upgrade

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.

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.

@vrutkovs vrutkovs mentioned this pull request Jul 16, 2020
Merged
@vrutkovs
Copy link
Member

Closing this in favor of #1930
/close

@openshift-ci-robot
Copy link
Contributor

@vrutkovs: Closed this PR.

In response to this:

Closing this in favor of #1930
/close

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.

@LorbusChris
Copy link
Member

LorbusChris commented Jul 16, 2020 •
edited
Loading

this is the last part missing before we can drop MCO's fcos branch in 4.6 - let's get this in as-is, I'll rename the file as part of #1926
/hold cancel

edit: oh well should've refreshed the window :D

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LorbusChris LorbusChris LorbusChris requested changes

@yuqi-zhang yuqi-zhang Awaiting requested review from yuqi-zhang

@runcom runcom Awaiting requested review from runcom

Assignees

@vrutkovs vrutkovs

@cgwalters cgwalters

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@openshift-cherrypick-robot @vrutkovs @ashcrow @kikisdeliveryservice @cgwalters @openshift-ci-robot @openshift-bot @LorbusChris