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

Implementation of Conditions feature in Openstack Machine Controller #972

Closed
wants to merge 23 commits into from

Conversation

swapnilbabladkar
Copy link

Changes made in the following files:

v1alpha3 - openstackmachine_types.go , conditions_consts.go
v1alpha4 - openstackmachine_types.go , conditions_consts.go
controllers - openstackmachine_controller.go

What this PR does / why we need it:
This a work in progress for implemnting conditions feature for Cluster API Openstack - Machine controller

**Which issue(s) this PR fixes format, will close the issue(s) when PR gets merged)*:
#832

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 18, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @swapnilbabladkar!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-openstack 🎉. 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/cluster-api-provider-openstack 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
Copy link
Contributor

Hi @swapnilbabladkar. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 18, 2021
@swapnilbabladkar
Copy link
Author

Please provide with a /ok-to-test label

@jichenjc
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 Aug 18, 2021
@jichenjc
Copy link
Contributor

is this duplicate to #952 ?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 20, 2021
@netlify
Copy link

netlify bot commented Sep 13, 2021

✔️ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

🔨 Explore the source changes: d1a845f

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/61a09acf15d8590007f118e7

😎 Browse the preview: https://deploy-preview-972--kubernetes-sigs-cluster-api-openstack.netlify.app

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2021
@swapnilbabladkar
Copy link
Author

is this duplicate to #952 ?

#952 can be closed, changes can be tracked on this PR

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 6, 2021
@hidekazuna
Copy link
Contributor

@swapnilbabladkar Many unused constants still exist. Please add constants we use only. I think we do not need conditions for v1alpha3. Can you remove from v1alpha3?

- Removed conditions from v1alpha3
- Conditions support for following :
	InstanceRunningCondition
	InstanceNotFoundReason
	InstanceProvisionFailedReason
	WaitingForClusterInfrastructureReason
	WaitingForBootstrapDataReason
- Changed Machine to Instance in conditions
@swapnilbabladkar
Copy link
Author

@swapnilbabladkar Many unused constants still exist. Please add constants we use only. I think we do not need conditions for v1alpha3. Can you remove from v1alpha3?

Yes I now have only the constants being used in conditions for Machine. Also I have removed conditions from v1alpha3 in the latest commit : ac3a67e.

Thanks

@swapnilbabladkar
Copy link
Author

Please review changes

@hidekazuna
Copy link
Contributor

@swapnilbabladkar Still PR includes api/v1alpha3/openstackmachine_types.go. Please do not update api/v1alpha3/openstackmachine_types.go

@hidekazuna
Copy link
Contributor

@swapnilbabladkar updated PR, but still api/v1alpha3/openstackmachine_types.go updated.

Copy link
Member

@tobiasgiese tobiasgiese left a comment

Choose a reason for hiding this comment

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

Please squash your commits before merging

@@ -126,6 +127,21 @@ type OpenStackMachineStatus struct {
// controller's output.
// +optional
FailureMessage *string `json:"errorMessage,omitempty"`

Copy link
Member

Choose a reason for hiding this comment

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

Please don't update the v1alpha3. We're not going to release (at least to my understanding) any new v1alpha3 version.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: swapnilbabladkar
To complete the pull request process, please assign neolit123 after the PR has been reviewed.
You can assign the PR to them by writing /assign @neolit123 in a comment when ready.

The full list of commands accepted by this bot can be found 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

- Removal of conditions support for v1alpha3
- Addition of conditions instanceStatus.State() switch statement in controllers/openstackmachine_controller.go
@hidekazuna
Copy link
Contributor

@swapnilbabladkar v1beta1 API is added(#1047 ). Please update this PR to change v1beta1 API.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 24, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 26, 2021
@k8s-ci-robot
Copy link
Contributor

@swapnilbabladkar: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-openstack-build d1a845f link true /test pull-cluster-api-provider-openstack-build
pull-cluster-api-provider-openstack-test d1a845f link true /test pull-cluster-api-provider-openstack-test
pull-cluster-api-provider-openstack-e2e-test d1a845f link true /test pull-cluster-api-provider-openstack-e2e-test

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.

Copy link
Contributor

@hidekazuna hidekazuna left a comment

Choose a reason for hiding this comment

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

@swapnilbabladkar Still working on this?

@@ -0,0 +1,35 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that v1beta1 is created, add api/v1beta1/condition_consts.go instead of this,please.

@@ -19,6 +19,7 @@ package v1alpha4
import (
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that v1beta1 is created, update api/v1beta1/openstackmachine_types.go instead of this, please.

@@ -684,6 +684,13 @@ func (in *OpenStackMachineStatus) DeepCopyInto(out *OpenStackMachineStatus) {
*out = new(string)
Copy link
Contributor

Choose a reason for hiding this comment

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

After add or update files under api/v1beta1/ directory, you need to run make generate again.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 3, 2022
@k8s-ci-robot
Copy link
Contributor

@swapnilbabladkar: PR needs rebase.

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.

@tobiasgiese
Copy link
Member

@swapnilbabladkar are you still working on this PR?

@tobiasgiese
Copy link
Member

Closing this PR, #1288 will replace it

@tobiasgiese tobiasgiese closed this Jul 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants