Skip to content

Comments

Limit fail-on-swap override to cluster-up#17385

Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
liggitt:fail-on-swap
Nov 20, 2017
Merged

Limit fail-on-swap override to cluster-up#17385
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
liggitt:fail-on-swap

Conversation

@liggitt
Copy link
Contributor

@liggitt liggitt commented Nov 20, 2017 •
edited
Loading

Follow up from rebase. Ansible disables swap, so we only need to prevent the "crash on start" behavior for cluster-up

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 20, 2017
@soltysh soltysh mentioned this pull request Nov 20, 2017
Merged
19 tasks
@liggitt
Copy link
Contributor Author

liggitt commented Nov 20, 2017

/assign @mfojtik

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 20, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Nov 20, 2017 •
edited
Loading

extended_clusterup failed with #17394 which is fixed in #17395

@bparees
Copy link
Contributor

bparees commented Nov 20, 2017

@liggitt fyi I had to cherry pick the helper.go change into my PR to get cluster up to work post-rebase. Not sure why since I see how you're hardcoding the setting to false, but it seems like something in cluster up wasn't picking up that false value until it was set explicitly in the config.

@bparees
Copy link
Contributor

bparees commented Nov 20, 2017

fyi my PR is here: #17338

@bparees
Copy link
Contributor

bparees commented Nov 20, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2017
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Nov 20, 2017

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, liggitt

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

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Nov 20, 2017

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Nov 20, 2017

Automatic merge from submit-queue (batch tested with PRs 17395, 17385).

@openshift-merge-robot openshift-merge-robot merged commit 0c4900a into openshift:master Nov 20, 2017
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 21, 2017

@liggitt: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_clusterup d8265d0 link /test extended_clusterup
ci/openshift-jenkins/extended_conformance_install_update d8265d0 link /test extended_conformance_install_update
ci/openshift-jenkins/extended_conformance_install d8265d0 link /test extended_conformance_install
ci/openshift-jenkins/extended_conformance_gce d8265d0 link /test extended_conformance_gce

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.

@liggitt liggitt deleted the fail-on-swap branch November 21, 2017 04:55
bparees
bparees reviewed Nov 21, 2017
View reviewed changes
pkg/oc/bootstrap/docker/openshift/helper.go
}
nodeCfg.KubeletArguments["cgroup-driver"] = []string{cgroupDriver}
}
nodeCfg.KubeletArguments["fail-swap-on"] = []string{"false"}
Copy link
Contributor

@bparees bparees Nov 21, 2017

Choose a reason for hiding this comment

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

this appears to have broken backwards compatibility for cluster up.

Copy link
Contributor

@bparees bparees Nov 21, 2017

Choose a reason for hiding this comment

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

 error: Invalid NodeConfig /var/lib/origin/openshift.local.config/node-localhost/node-config.yaml
       flag: Invalid value: "fail-swap-on": is not a valid flag

Copy link
Contributor Author

@liggitt liggitt Nov 21, 2017

Choose a reason for hiding this comment

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

will update with a version gated check

Copy link
Contributor

@bparees bparees Nov 21, 2017

Choose a reason for hiding this comment

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

sadly it's going to have to be something like "greater than 3.8.0-alpha.0".

Copy link
Contributor Author

@liggitt liggitt Nov 21, 2017

Choose a reason for hiding this comment

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

oh, I know. and I'm sad

Copy link
Contributor Author

@liggitt liggitt Nov 21, 2017

Choose a reason for hiding this comment

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

#17410

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bparees bparees bparees left review comments

Assignees

@mfojtik mfojtik

@bparees bparees

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/post-rebase 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@liggitt @bparees @openshift-merge-robot @openshift-ci-robot @mfojtik