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

Fixes for etcd status fields #594

Merged
merged 7 commits into from
Jul 5, 2023
Merged

Fixes for etcd status fields #594

merged 7 commits into from
Jul 5, 2023

Conversation

unmarshall
Copy link
Contributor

@unmarshall unmarshall commented May 5, 2023 •
edited by shreyas-s-rao
Loading

How to categorize this PR?

/area control-plane
/kind bug
/kind cleanup

What this PR does / why we need it:
Status.ClusterSize is now marked as deprecated and will not be used hereafter. Logic to compute AllMembersReady condition has been fixed to eventually report the correct status.

NOTE: Further improvements are required to rename this to AllMemberLeasesActive instead as registration and periodic renewal of a lease is no indicator to if etcd is ready and is therefore quite misleading. We already have etcd.Status.Ready to correctly indicate readiness.

Which issue(s) this PR fixes:
Fixes #557

Release note:

:warning: `etcd.Status.ClusterSize`, `etcd.Status.ServiceName`, `etcd.Status.UpdatedReplicas` have been marked as deprecated and users should refrain from depending on these fields.

`AllMembersReady` condition has now been fixed to eventually show the correct overall readiness of an etcd cluster.

@unmarshall unmarshall requested a review from a team as a code owner May 5, 2023 05:16
@gardener-robot gardener-robot added area/control-plane Control plane related kind/bug Bug kind/cleanup Something that is not needed anymore and can be cleaned up needs/review Needs review size/m Size of pull request is medium (see gardener-robot robot/bots/size.py) labels May 5, 2023
@gardener-robot-ci-3 gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 5, 2023
@ishan16696
Copy link
Member

/assign

@shreyas-s-rao shreyas-s-rao self-assigned this Jun 5, 2023
@ishan16696
Copy link
Member

Hi @unmarshall ,
Can you please resolve the merge conflicts.

@gardener-robot-ci-3 gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 15, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 15, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 15, 2023
@gardener-robot-ci-2 gardener-robot-ci-2 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 15, 2023
ishan16696
ishan16696 reviewed Jun 16, 2023
View reviewed changes
api/v1alpha1/types_etcd.go Show resolved Hide resolved
api/v1alpha1/types_etcd.go Show resolved Hide resolved
controllers/etcd/reconciler.go Outdated Show resolved Hide resolved
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 19, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 19, 2023
shreyas-s-rao
shreyas-s-rao requested changes Jun 26, 2023
View reviewed changes
Copy link
Contributor

@shreyas-s-rao shreyas-s-rao left a comment

Choose a reason for hiding this comment

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

@unmarshall thanks for the PR. I've left couple of suggestions. PTAL.

I have also taken the liberty to slightly edit the release note in the PR description.

pkg/health/condition/check_all_members.go Outdated Show resolved Hide resolved
pkg/health/condition/check_all_members.go Show resolved Hide resolved
@gardener-robot gardener-robot added the needs/changes Needs (more) changes label Jun 26, 2023
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 26, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 26, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 26, 2023
@gardener-robot-ci-3 gardener-robot-ci-3 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 26, 2023
@gardener-robot-ci-3 gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Jun 26, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Jul 3, 2023
@shreyas-s-rao shreyas-s-rao added this to the v0.19.0 milestone Jul 3, 2023
shreyas-s-rao
shreyas-s-rao approved these changes Jul 4, 2023
View reviewed changes
Copy link
Contributor

@shreyas-s-rao shreyas-s-rao left a comment

Choose a reason for hiding this comment

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

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/changes Needs (more) changes needs/review Needs review labels Jul 4, 2023
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jul 4, 2023
ishan16696
ishan16696 approved these changes Jul 4, 2023
View reviewed changes
Copy link
Member

@ishan16696 ishan16696 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Please update the release note before merging the PR as mentioned in the comment: #594 (comment)

@unmarshall unmarshall merged commit d373635 into gardener:master Jul 5, 2023
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Jul 5, 2023
shreyas-s-rao added a commit to shreyas-s-rao/etcd-druid that referenced this pull request Jul 11, 2023
@unmarshall @shreyas-s-rao
Fixes for etcd status fields (gardener#594)
ad4ff41 
* fix for etcd status

* fixed make check error

* removed deprecation notice for CurrentReplicas

* Update pkg/health/condition/check_all_members.go

Co-authored-by: Shreyas Rao <[email protected]>

* Update pkg/health/condition/check_all_members.go

Co-authored-by: Shreyas Rao <[email protected]>

* fixed formatting issues

* address review comments, removed clusterInBootStrap logic

---------

Co-authored-by: Shreyas Rao <[email protected]>
@shreyas-s-rao shreyas-s-rao mentioned this pull request Jul 11, 2023
Merged
shreyas-s-rao added a commit that referenced this pull request Jul 12, 2023
@shreyas-s-rao @acumino @unmarshall
Cherry-pick PRs for v0.18.4 (#637)
bd914c9 
* Exclude outdated client-go in `go.mod` (#627)

* Fixes for etcd status fields (#594)

* Use structured log messages (#632)

* Add CVE categorization (#634)

* Print build version and go runtime info (#636)

Co-authored-by: Shreyas Rao <[email protected]>
Co-authored-by: Sonu Kumar Singh <[email protected]>
Co-authored-by: Madhav Bhargava <[email protected]>
@shreyas-s-rao shreyas-s-rao mentioned this pull request Jul 19, 2023
Open
9 tasks
@unmarshall unmarshall deleted the statusfixes branch October 9, 2023 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ishan16696 ishan16696 ishan16696 approved these changes

@shreyas-s-rao shreyas-s-rao shreyas-s-rao approved these changes

Assignees

@shreyas-s-rao shreyas-s-rao

@ishan16696 ishan16696

Labels
area/control-plane Control plane related kind/bug Bug kind/cleanup Something that is not needed anymore and can be cleaned up needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) size/m Size of pull request is medium (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Milestone
v0.19.0
Development

Successfully merging this pull request may close these issues.

[BUG] Potential improvements in etcd resource status or in Custom Columns of etcd resource
7 participants
@unmarshall @ishan16696 @shreyas-s-rao @gardener-robot-ci-1 @gardener-robot-ci-2 @gardener-robot-ci-3 @gardener-robot