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

OCPBUGS-22477: Remove z-upgrades from UpgradeBackupController #1140

Merged
merged 1 commit into from Nov 9, 2023

Conversation

tjungblu
Copy link
Contributor

@tjungblu tjungblu commented Oct 27, 2023

This removes the z-upgrade trigger for the UpgradeBackupControllers again and adds a front-running retention by deleting all existing backups before taking a new backup.

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 27, 2023
@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-22477, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-18984 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-18984 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @geliu2016

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

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 openshift-ci bot requested a review from geliu2016 October 27, 2023 09:11
@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-22477, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-18984 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-18984 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @geliu2016

In response to this:

This removes the z-upgrade trigger for the UpgradeBackupControllers again and adds a front-running retention by deleting all existing backups before taking a new backup.

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2023
@Elbehery
Copy link
Contributor

/lgtm
/approve

@Elbehery
Copy link
Contributor

@tjungblu verify-deps fails on

< 	github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
`go.mod` content is incorrect - did you run `go mod tidy`?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@Elbehery
Copy link
Contributor

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@tjungblu
Copy link
Contributor Author

/hold

need to test this still

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 27, 2023
@dusk125
Copy link
Contributor

dusk125 commented Oct 27, 2023

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 27, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2023
@tjungblu
Copy link
Contributor Author

tjungblu commented Nov 1, 2023

briefly testing this from 4.14.0 to 4.14.1, upgrade backup controller does not attempt to take any snapshot and the upgrade proceeds.

Still need to test the serial upgrades and y upgrades, the latter didn't work yesterday.

@tjungblu
Copy link
Contributor Author

tjungblu commented Nov 1, 2023

y-upgrade to 4.15 does trigger a snapshot (wrong). I think it's because the z-upgrade to 4.14.1 is simply overriding the CEO image. Gotta check how I can do it without merging this first. Otherwise I need to create a new cluster everytime 🙄

@Elbehery
Copy link
Contributor

Elbehery commented Nov 8, 2023

/retest-required

Copy link
Contributor

openshift-ci bot commented Nov 8, 2023

@tjungblu: 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
ci/prow/e2e-aws-etcd-recovery 8fbfc5b link false /test e2e-aws-etcd-recovery
ci/prow/e2e-gcp-qe-no-capabilities 8fbfc5b link false /test e2e-gcp-qe-no-capabilities

Full PR test history. Your PR dashboard.

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.

@tjungblu
Copy link
Contributor Author

tjungblu commented Nov 8, 2023

/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 Nov 8, 2023
@Elbehery
Copy link
Contributor

Elbehery commented Nov 8, 2023

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2023
Copy link

@geliu2016 geliu2016 left a comment

Choose a reason for hiding this comment

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

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 9, 2023
Copy link
Contributor

openshift-ci bot commented Nov 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Elbehery, geliu2016, tjungblu

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-bot openshift-merge-bot bot merged commit 6bc9eab into openshift:release-4.14 Nov 9, 2023
16 of 18 checks passed
@openshift-ci-robot
Copy link

@tjungblu: Jira Issue OCPBUGS-22477: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-22477 has been moved to the MODIFIED state.

In response to this:

This removes the z-upgrade trigger for the UpgradeBackupControllers again and adds a front-running retention by deleting all existing backups before taking a new backup.

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.

@tjungblu
Copy link
Contributor Author

tjungblu commented Nov 9, 2023

/cherry-pick release-4.13

@openshift-cherrypick-robot

@tjungblu: #1140 failed to apply on top of branch "release-4.13":

Applying: OCPBUGS-22477: Remove z-upgrades from UpgradeBackupController
.git/rebase-apply/patch:40: trailing whitespace.
        
.git/rebase-apply/patch:42: trailing whitespace.
          echo "removing all backups in ${DELETE_BACKUP_DIR}" 
.git/rebase-apply/patch:82: trailing whitespace.
        
.git/rebase-apply/patch:84: trailing whitespace.
          echo "removing all backups in ${DELETE_BACKUP_DIR}" 
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/operator/etcd_assets/bindata.go
M	pkg/operator/upgradebackupcontroller/upgradebackupcontroller.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/github.com/mcuadros/go-version/stability.go
Removing vendor/github.com/mcuadros/go-version/sort.go
Removing vendor/github.com/mcuadros/go-version/normalize.go
Removing vendor/github.com/mcuadros/go-version/group.go
Removing vendor/github.com/mcuadros/go-version/doc.go
Removing vendor/github.com/mcuadros/go-version/constraint.go
Removing vendor/github.com/mcuadros/go-version/compare.go
Removing vendor/github.com/mcuadros/go-version/README.md
Removing vendor/github.com/mcuadros/go-version/LICENSE
Removing vendor/github.com/mcuadros/go-version/.travis.yml
Removing vendor/github.com/mcuadros/go-version/.gitignore
Auto-merging pkg/operator/upgradebackupcontroller/upgradebackupcontroller.go
Auto-merging pkg/operator/etcd_assets/bindata.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-22477: Remove z-upgrades from UpgradeBackupController
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.13

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.

@tjungblu
Copy link
Contributor Author

tjungblu commented Nov 9, 2023

/jira ?

@tjungblu
Copy link
Contributor Author

tjungblu commented Nov 9, 2023

/jira clone OCPBUGS-22477

@tjungblu tjungblu deleted the OCPBUGS-22477 branch November 9, 2023 13:50
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2023-11-09-092851

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-etcd-operator-container-v4.14.0-202311211133.p0.g6bc9eab.assembly.stream for distgit cluster-etcd-operator.
All builds following this will include this PR.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

8 participants