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

Use docker-distribution that fixes OADP-4817, OADP-1945, OADP-3143 #290

Merged
merged 2 commits into from
Jan 23, 2025

Conversation

mpryc
Copy link
Contributor

@mpryc mpryc commented Jan 17, 2025

Use version of docker-distribution that contains the fixes for the following bugs:

  • OADP-4817 Imagestream backups are partially failing when dpa is configured with caCert

  • OADP-1945 caCert support for imagestream backup

  • OADP-3143 image registry backup: S3 storage doesn't use proxy environment when skipVerify=true

Relevant udistribution PR:
migtools/udistribution#112

@openshift-ci openshift-ci bot requested review from eemcmullan and kaovilai January 17, 2025 13:40
@mpryc mpryc force-pushed the OADP-3143 branch 2 times, most recently from eac91aa to 7865053 Compare January 21, 2025 15:16
Use version of docker-distribution that contains the fixes
for the following bugs:
 - OADP-4817
   Imagestream backups are partially failing when dpa is configured with caCert
 - OADP-1945
   caCert support for imagestream backup

 - OADP-3143
   image registry backup: S3 storage doesn't use proxy environment when skipVerify=true

Signed-off-by: Michal Pryc <[email protected]>
Use udistribution v0.0.14-oadp-1.4 tag
that fixes OADP-4817, OADP-1945, OADP-3143

Signed-off-by: Michal Pryc <[email protected]>
Copy link

openshift-ci bot commented Jan 23, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mpryc

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 23, 2025
@kaovilai
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2025
@mpryc
Copy link
Contributor Author

mpryc commented Jan 23, 2025

/cherry-pick oadp-1.4

@openshift-cherrypick-robot
Copy link
Contributor

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

In response to this:

/cherry-pick oadp-1.4

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-sigs/prow repository.

@mateusoliveira43
Copy link
Contributor

do we need 1.4.2 release before merging code to 1.4 branch?

Copy link

openshift-ci bot commented Jan 23, 2025

@mpryc: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 0eb3681 into openshift:master Jan 23, 2025
3 checks passed
@openshift-cherrypick-robot
Copy link
Contributor

@mpryc: #290 failed to apply on top of branch "oadp-1.4":

Applying: Use docker-distribution that fixes OADP-4817, OADP-1945, OADP-3143
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: Use udistribution oad-1.4 tag
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
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
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Use udistribution oad-1.4 tag

In response to this:

/cherry-pick oadp-1.4

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-sigs/prow repository.

mpryc added a commit to mpryc/openshift-velero-plugin that referenced this pull request Jan 23, 2025
Use udistribution v0.0.14-oadp-1.4 tag
Use docker-distribution master (hash a24972526437)
that fixes OADP-4817, OADP-1945, OADP-3143

Backport of the: openshift#290

Signed-off-by: Michal Pryc <[email protected]>
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants