Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Fix deprovisioning process in TestBroker #2656

Merged
merged 2 commits into from
Jun 13, 2019

Conversation

jasiu001
Copy link
Contributor

@jasiu001 jasiu001 commented Jun 12, 2019

This PR is a

  • Feature Implementation
  • Bug Fix
  • Documentation

What this PR does / why we need it:
The PR fixes deprovisioning ServiceInstance process in test-broker.
test-broker controller contains few services, some of them are not deprovision asynchronous, it means they achieve this condition.

The are two problems: first deprovisionAttempts field of testServiceInstance is not increase anywhere so it means condition will be always true. Second, if condition is true then status code 0 is passed to NewErrorWithHTTPStatus method which causes panic.

Additionally, PR changes DeprovisionFailTimes (to 0) field for two services thanks to which they are removed immediately.

Please leave this checklist in the PR comment so that maintainers can ensure a good PR.

Merge Checklist:

  • New feature
    • Tests
    • Documentation
  • SVCat CLI flag
  • Server Flag for config
    • Chart changes
    • removing a flag by marking deprecated and hiding to avoid
      breaking the chart release and existing clients who provide a
      flag that will get an error when they try to update

@k8s-ci-robot
Copy link
Contributor

Welcome @jasiu001!

It looks like this is your first PR to kubernetes-sigs/service-catalog 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/service-catalog has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 12, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @jasiu001. Thanks for your PR.

I'm waiting for a kubernetes-sigs or kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 12, 2019
@mszostok
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 12, 2019
@@ -318,6 +319,7 @@ func CreateController() controller.Controller {
Bindable: true,
PlanUpdateable: true,
},
DeprovisionFailTimes: -1,
Copy link
Contributor

@mszostok mszostok Jun 12, 2019

Choose a reason for hiding this comment

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

that needs to be fixed in code,

if you set DeprovisionFailTimes to 0 then it should not fail at all. In your case you will have one fail and only the second call will be successful.

so basically this:

if instance.deprovisionAttempts <= service.DeprovisionFailTimes {

should be changed to:

if service.DeprovisionFailTimes > 0 && instance.deprovisionAttempts < service.DeprovisionFailTimes {

@mszostok
Copy link
Contributor

@jasiu001 you need to execute the go fmt

@mszostok
Copy link
Contributor

/test pull-service-catalog-xbuild

@mszostok
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2019
@jberkhahn
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jasiu001, jberkhahn

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 13, 2019
@k8s-ci-robot k8s-ci-robot merged commit 87ab5c4 into kubernetes-retired:master Jun 13, 2019
viviyww pushed a commit to viviyww/service-catalog that referenced this pull request Jun 20, 2019
* Fix deprovisioning process in TestBroker

* Fix file format
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants