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

Bug 1916853: pkg/operator: ensure etcd endpoints cm #525

Merged
merged 2 commits into from Jan 18, 2021
Merged

Bug 1916853: pkg/operator: ensure etcd endpoints cm #525

merged 2 commits into from Jan 18, 2021

Conversation

hexfusion
Copy link
Contributor

@hexfusion hexfusion commented Jan 15, 2021 •
edited

Today if the openshift-etcd namespace is deleted the cluster will not recover as the endpoints cm resource will not be recreated. This is fatal of course because the apiserver can no longer observe the list of backend endpoints. This PR tolerates the missing configmap in the endpoints controller allowing for it to be recreated.

Closes #513

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 15, 2021
@hexfusion
Copy link
Contributor Author

/hold testing with cluster-bot

@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 Jan 15, 2021
@hexfusion
Copy link
Contributor Author

I see the flaw here as the resource is not actually static, looking at endpoint controller.

@hexfusion hexfusion changed the title pkg/operator: ensure etcd endpoints cm Bug 1916853: pkg/operator: ensure etcd endpoints cm Jan 15, 2021
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Jan 15, 2021
@openshift-ci-robot
Copy link

@hexfusion: This pull request references Bugzilla bug 1916853, 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.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1916853: pkg/operator: ensure etcd endpoints cm

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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 15, 2021
@hexfusion
Copy link
Contributor Author

flake

/test images

@openshift-ci-robot
Copy link

@hexfusion: This pull request references Bugzilla bug 1916853, which is valid.

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

In response to this:

Bug 1916853: pkg/operator: ensure etcd endpoints cm

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.

@hexfusion
Copy link
Contributor Author

/hold need to fix client failure.

@marun
Copy link
Contributor

marun commented Jan 15, 2021

/lgtm
/retry

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 2021
@hexfusion
Copy link
Contributor Author

/hold cancel

@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 Jan 15, 2021
@hexfusion
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

6 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.

@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.

@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.

@openshift-bot
Copy link
Contributor

/retest

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

@hexfusion
Copy link
Contributor Author

/test unit

@hexfusion
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

@hexfusion
pkg/operator: ensure etcd endpoints cm
d56eaf4 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@hexfusion
Copy link
Contributor Author

unit failure isn't making any sense to me...

set -o pipefail; go test  -race -json ./pkg/... ./cmd/... | gotest2junit > /tmp/artifacts/junit_report.xml
# github.com/openshift/cluster-etcd-operator/pkg/operator/etcdendpointscontroller [github.com/openshift/cluster-etcd-operator/pkg/operator/etcdendpointscontroller.test]
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:44:5: undefined: node
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:44:22: undefined: withMasterLabel
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:44:41: undefined: withNodeInternalIP
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:45:5: undefined: node
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:45:22: undefined: withMasterLabel
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:45:41: undefined: withNodeInternalIP
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:46:5: undefined: node
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:46:22: undefined: withMasterLabel
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:46:41: undefined: withNodeInternalIP
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:47:5: undefined: bootstrapConfigMap
pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go:47:5: too many errors

@hexfusion
Copy link
Contributor Author

I see #461 merged before the retest....

@hexfusion
pkg/operator/etcdendpointscontroller: add test case for missing etcd-…
1d9bdd9 
…endpoints configmap

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2021
@hexfusion
Copy link
Contributor Author

/test e2e-agnostic

1 similar comment
@hexfusion
Copy link
Contributor Author

/test e2e-agnostic

@retroflexer
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, marun, retroflexer

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-merge-robot openshift-merge-robot merged commit 668c44f into openshift:master Jan 18, 2021
@openshift-ci-robot
Copy link

@hexfusion: All pull requests linked via external trackers have merged:

Bugzilla bug 1916853 has been moved to the MODIFIED state.

In response to this:

Bug 1916853: pkg/operator: ensure etcd endpoints cm

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.

@hexfusion
Copy link
Contributor Author

/cherry-pick release-4.6

@hexfusion hexfusion deleted the ensure-etcd-endpoints branch January 18, 2021 13:02
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 18, 2021
Closed
@openshift-cherrypick-robot
Copy link

@hexfusion: new pull request created: #528

In response to this:

/cherry-pick release-4.6

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.

@hexfusion
Copy link
Contributor Author

/cherry-pick release-4.5

@openshift-cherrypick-robot
Copy link

@hexfusion: #525 failed to apply on top of branch "release-4.5":

Applying: pkg/operator: ensure etcd endpoints cm
Using index info to reconstruct a base tree...
M	pkg/operator/etcdendpointscontroller/etcdendpointscontroller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/etcdendpointscontroller/etcdendpointscontroller.go
CONFLICT (content): Merge conflict in pkg/operator/etcdendpointscontroller/etcdendpointscontroller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pkg/operator: ensure etcd endpoints cm
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.5

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.

@hexfusion hexfusion mentioned this pull request Jan 19, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marun marun marun left review comments

@ironcladlou ironcladlou Awaiting requested review from ironcladlou

@retroflexer retroflexer Awaiting requested review from retroflexer

Assignees

@marun marun

@retroflexer retroflexer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cluster requires manual step to recover after deleting openshift-etcd ns
7 participants
@hexfusion @openshift-ci-robot @marun @openshift-bot @retroflexer @openshift-cherrypick-robot @openshift-merge-robot