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

Fix vm state bug and deletion bug #340

Merged
merged 3 commits into from
Oct 30, 2023
Merged

Fix vm state bug and deletion bug #340

merged 3 commits into from
Oct 30, 2023

Conversation

shyamradhakrishnan
Copy link
Member

What this PR does / why we need it:
Fix vm state bug and deletion bug

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #337 , #339

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Oct 19, 2023
@shyamradhakrishnan
Copy link
Member Author

e2e

nchronizedAfterSuite] PASSED [0.000 seconds]
[SynchronizedAfterSuite]
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/e2e_suite_test.go:261
------------------------------
[SynchronizedAfterSuite] PASSED [597.206 seconds]
[SynchronizedAfterSuite]
/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/test/e2e/e2e_suite_test.go:261

  Timeline >>
  STEP: Tearing down the management cluster @ 10/19/23 06:24:06.696
  << Timeline
------------------------------

Ran 7 of 28 Specs in 2999.034 seconds
SUCCESS! -- 7 Passed | 0 Failed | 0 Pending | 21 Skipped

@shyamradhakrishnan
Copy link
Member Author

unit test

$ make test
GOBIN=/home/ubuntu/go/src/github.com/oracle/cluster-api-provider-oci/hack/tools/bin ./scripts/go_install.sh sigs.k8s.io/controller-runtime/tools/setup-envtest setup-envtest v0.0.0-20230131074648-f5014c077fc3
kube-builder assets: /home/ubuntu/.local/share/kubebuilder-envtest/k8s/1.24.2-linux-amd64
KUBEBUILDER_ASSETS="/home/ubuntu/.local/share/kubebuilder-envtest/k8s/1.24.2-linux-amd64" go test -coverprofile=coverage.out ./...
?   	github.com/oracle/cluster-api-provider-oci	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/api/v1beta1	51.774s	coverage: 23.7% of statements
ok  	github.com/oracle/cluster-api-provider-oci/api/v1beta2	0.039s	coverage: 15.6% of statements
?   	github.com/oracle/cluster-api-provider-oci/cloud/config	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/metrics	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/cloud/ociutil	0.005s	coverage: 19.6% of statements
ok  	github.com/oracle/cluster-api-provider-oci/cloud/scope	231.084s	coverage: 75.1% of statements
?   	github.com/oracle/cluster-api-provider-oci/cloud/scope/mocks	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/base	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/base/mock_base	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/compute	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/compute/mock_compute	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/computemanagement	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/computemanagement/mock_computemanagement	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/containerengine	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/containerengine/mock_containerengine	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/identity	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/identity/mock_identity	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/loadbalancer	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/loadbalancer/mock_lb	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/networkloadbalancer/mock_nlb	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/vcn	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/cloud/services/vcn/mock_vcn	[no test files]
ok  	github.com/oracle/cluster-api-provider-oci/cloud/util	0.212s	coverage: 61.1% of statements
ok  	github.com/oracle/cluster-api-provider-oci/controllers	26.736s	coverage: 58.6% of statements
ok  	github.com/oracle/cluster-api-provider-oci/exp/api/v1beta1	14.028s	coverage: 15.3% of statements
ok  	github.com/oracle/cluster-api-provider-oci/exp/api/v1beta2	0.016s	coverage: 4.8% of statements
ok  	github.com/oracle/cluster-api-provider-oci/exp/controllers	0.791s	coverage: 56.3% of statements
?   	github.com/oracle/cluster-api-provider-oci/feature	[no test files]
?   	github.com/oracle/cluster-api-provider-oci/version	[no test files]
go tool cover -func=coverage.out -o coverage.txt
go tool cover -html=coverage.out -o coverage.html

joekr
joekr previously approved these changes Oct 20, 2023
View reviewed changes
controllers/ocimachine_controller.go Show resolved Hide resolved
@shyamradhakrishnan
Do not put machine in failed state if VM is is topping or stopped sta…
64cd0f7 
…te, and use ID from instance during deletion
@shyamradhakrishnan shyamradhakrishnan merged commit 5407081 into oracle:main Oct 30, 2023
2 checks passed
shyamradhakrishnan added a commit to shyamradhakrishnan/cluster-api-provider-oci that referenced this pull request Oct 31, 2023
@shyamradhakrishnan
Fix vm state bug and deletion bug (oracle#340)
743b049 
* Do not put machine in failed state if VM is in stopping or stopped state, and use ID from instance during deletion
shyamradhakrishnan added a commit to shyamradhakrishnan/cluster-api-provider-oci that referenced this pull request Mar 22, 2024
@shyamradhakrishnan
Fix vm state bug and deletion bug (oracle#340)
b5f0392 
* Do not put machine in failed state if VM is in stopping or stopped state, and use ID from instance during deletion
shyamradhakrishnan added a commit to shyamradhakrishnan/cluster-api-provider-oci that referenced this pull request Mar 29, 2024
@shyamradhakrishnan
Fix vm state bug and deletion bug (oracle#340)
b11aadd 
* Do not put machine in failed state if VM is in stopping or stopped state, and use ID from instance during deletion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joekr joekr joekr approved these changes

Assignees
No one assigned
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

machine status still showing 'failed' after restart a 'stopped' instance
2 participants
@shyamradhakrishnan @joekr