Skip to content

fix: OADP velero 1.4 branch #53237

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

Merged
openshift-merge-bot merged 1 commit into from
Jun 17, 2024
Merged

fix: OADP velero 1.4 branch #53237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci-operator/config/openshift/velero/openshift-velero-oadp-1.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tests:
steps:
test:
- as: unit
commands: make -f Makefile.prow ci
commands: PATH="/go/bin:$PATH" make -f Makefile.prow ci
Copy link
Copy Markdown
Contributor

@mpryc mpryc Jun 17, 2024

Choose a reason for hiding this comment

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

Which image is that from?

I wonder if it's not easier to use one of the go env to ensure it's there ,because we can't be sure konveyor will always stay there:

https://github.com/konveyor/builder/blob/main/Dockerfile.ubi9#L13-L32

Copy link
Copy Markdown
Member

@kaovilai kaovilai Jun 17, 2024

Choose a reason for hiding this comment

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

From here https://github.com/openshift/ci-tools/blame/master/pkg/steps/source.go#L102

This is added to our image when our repo is configured to use imagestreamtag which openshift prow replaces FROM in our dockerfile. Not something specified in konveyor builder.

Copy link
Copy Markdown
Contributor Author

@mateusoliveira43 mateusoliveira43 Jun 17, 2024

Choose a reason for hiding this comment

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

image_stream_tag line 2 (which would be fine)

but as Tiger noted openshift/ci-tools#4165 this is needed

Copy link
Copy Markdown
Contributor

@mpryc mpryc Jun 17, 2024

Choose a reason for hiding this comment

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

thanks !

from: src
resources:
requests:
Expand Down