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

Bug 1857650: oVirt, fix incorrect template removal condition #3894

Conversation

Gal-Zaidman
Copy link
Contributor

We want to remove the cluster template and the VM associated with it
when the overriding variable is not set, meaning when the installer
creates the cluster template.
If the override env variable is set then an existing template is used
on the installation and we don't want to remove it

Signed-off-by: Gal-Zaidman gzaidman@redhat.com

We want to remove the cluster template and the VM associated with it
when the override variable is not set, meaning when the installer
creates the cluster template.
If the override env vatiable is set then an existing template is used
on the installtion and we don't want to remove it

Signed-off-by: Gal-Zaidman <gzaidman@redhat.com>
RemoveTemplate: ok && customImage != "",
// if we have a custom image, don't remove the template,
// otherwise its a per deployment template, destroy it
RemoveTemplate: !ok,
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi Gal, just curious, why are you inverting ok with not ? IMO, should be just ok.

Example of RemoveTemplate usage:

if uninstaller.Metadata.Ovirt.RemoveTemplate {

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi Douglas, I think it's correct what this PR is doing.
If you have a custom image, you have the OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE defined in your env (the lookup ok variable is true) and, according to the code comment, we don't wont to remove the template in case the user has a custom image.
Otherwise the ok will be false so we need to set RemoveTemplate to true.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Exactly,
OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE is present --> ok = True --> RemoveTemplate = False --> Template will not be removed and that is what we want because that is a template the installation didn't create
OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE is not present --> ok = False --> RemoveTemplate = True --> Template will be removed and that is what we want because that is a template the installation created

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the clarification guy. Looks sane to me too :)

@gekorob
Copy link
Contributor

gekorob commented Jul 16, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 16, 2020
@Gal-Zaidman Gal-Zaidman changed the title oVirt: fix incorrect template removal condition oVirt: add condition for non existing tmp-vm Jul 16, 2020
@Gal-Zaidman Gal-Zaidman changed the title oVirt: add condition for non existing tmp-vm oVirt: fix incorrect template removal condition Jul 16, 2020
@Gal-Zaidman Gal-Zaidman changed the title oVirt: fix incorrect template removal condition Bug 1857650: oVirt, fix incorrect template removal condition Jul 16, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jul 16, 2020
@openshift-ci-robot
Copy link
Contributor

@Gal-Zaidman: This pull request references Bugzilla bug 1857650, which is invalid:

  • expected the bug to target the "4.6.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1857650: oVirt, fix incorrect template removal condition

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-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jul 16, 2020
@Gal-Zaidman
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@Gal-Zaidman: This pull request references Bugzilla bug 1857650, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

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-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 16, 2020
@dougsland
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dougsland

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 16, 2020
@openshift-bot
Copy link
Contributor

/retest

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@Gal-Zaidman
Copy link
Contributor Author

/hold

holding until we finish testing

@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 16, 2020
@dougsland
Copy link
Contributor

/test e2e-ovirt

1 similar comment
@dougsland
Copy link
Contributor

/test e2e-ovirt

@Gal-Zaidman
Copy link
Contributor Author

/test e2e-ovirt

Please don't retest until #3897 is merged

@dougsland
Copy link
Contributor

/test e2e-ovirt

@dougsland
Copy link
Contributor

ci/prow/e2e-ovirt — Job succeeded.

@dougsland
Copy link
Contributor

/unhold

@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
@openshift-merge-robot openshift-merge-robot merged commit 7f40b63 into openshift:master Jul 16, 2020
@openshift-ci-robot
Copy link
Contributor

@Gal-Zaidman: All pull requests linked via external trackers have merged: openshift/installer#3894. Bugzilla bug 1857650 has been moved to the MODIFIED state.

In response to this:

Bug 1857650: oVirt, fix incorrect template removal condition

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.

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants