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

Bug 1997347: ETCD-223: pkg/operator: add cluster backup upgrade controller #647

Conversation

hexfusion
Copy link
Contributor

Signed-off-by: Sam Batschelet sbatsche@redhat.com

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 24, 2021
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 24, 2021
@hexfusion hexfusion force-pushed the add-cluster-backup-controller branch 3 times, most recently from 4505685 to a26ecf8 Compare August 24, 2021 05:40
@hexfusion hexfusion changed the title [wip] pkg/operator: add cluster backup upgrade controller ETCD-223: pkg/operator: add cluster backup upgrade controller Aug 24, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 24, 2021
@hexfusion hexfusion added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 24, 2021
@wking
Copy link
Member

wking commented Aug 25, 2021

/retitle Bug 1997347: ETCD-223: pkg/operator: add cluster backup upgrade controller

@openshift-ci openshift-ci bot changed the title ETCD-223: pkg/operator: add cluster backup upgrade controller Bug 1997347: ETCD-223: pkg/operator: add cluster backup upgrade controller Aug 25, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 25, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 25, 2021

@hexfusion: An error was encountered querying GitHub for users with public email (geliu@redhat.com) for bug 1997347 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. non-200 OK status code: 403 Forbidden body: "{\n \"documentation_url\": \"https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#secondary-rate-limits\",\n \"message\": \"You have exceeded a secondary rate limit. Please wait a few minutes before you try again.\"\n}\n"

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1997347: ETCD-223: pkg/operator: add cluster backup upgrade controller

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.

Copy link
Contributor

@lilic lilic left a comment

Choose a reason for hiding this comment

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

Couple of comments. As mentioned before overall idea lgtm, I would just like to see this in 4.8 first but think it was discussed on slack already.

One other thing that would be great here is:

  • adding metric for failed backups
  • creating alert if this backup fails

Are we blocking upgrades if this fails or we do not have the backup?

@hexfusion
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 30, 2021
@hexfusion
Copy link
Contributor Author

/override ci/prow/e2e-gcp-five-control-plane-replicas

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 30, 2021

@hexfusion: Overrode contexts on behalf of hexfusion: ci/prow/e2e-gcp-five-control-plane-replicas

In response to this:

/override ci/prow/e2e-gcp-five-control-plane-replicas

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.

Copy link
Contributor

@lilic lilic left a comment

Choose a reason for hiding this comment

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

Couple of questions, must have mixed it on initial review.

- hostPath:
path: /etc/kubernetes/static-pod-resources/etcd-certs
name: cert-dir

Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: new line not needed?

pkg/cmd/verify/verify.go Outdated Show resolved Hide resolved
pkg/cmd/verify/backupstorage.go Outdated Show resolved Hide resolved
pkg/cmd/verify/backupstorage.go Outdated Show resolved Hide resolved
pkg/cmd/verify/backupstorage.go Outdated Show resolved Hide resolved
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@hexfusion hexfusion force-pushed the add-cluster-backup-controller branch from 9f68fc6 to 59a504d Compare August 31, 2021 10:47
Copy link
Contributor

@lilic lilic left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

🎉

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, lilic

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

@hexfusion
Copy link
Contributor Author

/cherry-pick release-4.8

@openshift-cherrypick-robot

@hexfusion: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.8

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

/override ci/prow/e2e-gcp-five-control-plane-replicas

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2021

@hexfusion: Overrode contexts on behalf of hexfusion: ci/prow/e2e-gcp-five-control-plane-replicas

In response to this:

/override ci/prow/e2e-gcp-five-control-plane-replicas

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

/test e2e-agnostic-upgrade

@hexfusion
Copy link
Contributor Author

/override ci/prow/e2e-gcp-five-control-plane-replicas

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2021

@hexfusion: Overrode contexts on behalf of hexfusion: ci/prow/e2e-gcp-five-control-plane-replicas

In response to this:

/override ci/prow/e2e-gcp-five-control-plane-replicas

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-merge-robot openshift-merge-robot merged commit b4a70ef into openshift:master Aug 31, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2021

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

Bugzilla bug 1997347 has been moved to the MODIFIED state.

In response to this:

Bug 1997347: ETCD-223: pkg/operator: add cluster backup upgrade controller

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-cherrypick-robot

@hexfusion: #647 failed to apply on top of branch "release-4.8":

Applying: pkg/operator: add cluster backup upgrade controller
.git/rebase-apply/patch:104: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/etcdcli/etcdcli.go
M	pkg/etcdcli/helpers.go
M	pkg/etcdcli/interfaces.go
A	pkg/operator/defragcontroller/defragcontroller.go
M	pkg/operator/etcd_assets/bindata.go
M	pkg/operator/starter.go
M	pkg/testutils/testutils.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/testutils/testutils.go
CONFLICT (content): Merge conflict in pkg/testutils/testutils.go
Auto-merging pkg/operator/starter.go
CONFLICT (content): Merge conflict in pkg/operator/starter.go
Auto-merging pkg/operator/etcd_assets/bindata.go
CONFLICT (modify/delete): pkg/operator/defragcontroller/defragcontroller.go deleted in HEAD and modified in pkg/operator: add cluster backup upgrade controller. Version pkg/operator: add cluster backup upgrade controller of pkg/operator/defragcontroller/defragcontroller.go left in tree.
Auto-merging pkg/etcdcli/interfaces.go
CONFLICT (content): Merge conflict in pkg/etcdcli/interfaces.go
Auto-merging pkg/etcdcli/helpers.go
CONFLICT (content): Merge conflict in pkg/etcdcli/helpers.go
Auto-merging pkg/etcdcli/etcdcli.go
CONFLICT (content): Merge conflict in pkg/etcdcli/etcdcli.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: add cluster backup upgrade controller
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.8

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 deleted the add-cluster-backup-controller branch August 31, 2021 15:35
yselkowitz added a commit to multi-arch/cluster-etcd-operator that referenced this pull request Sep 1, 2021
hexfusion added a commit to hexfusion/cluster-etcd-operator that referenced this pull request Sep 1, 2021
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
hexfusion pushed a commit to hexfusion/cluster-etcd-operator that referenced this pull request Sep 1, 2021
hexfusion pushed a commit to hexfusion/cluster-etcd-operator that referenced this pull request Sep 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants