Skip to content

Fix restic file not build output right location #5949

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

Open
abserari wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix restic file not build output right location #5949

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac25721
Fix restic file not build output right location
abserari Mar 4, 2023
297a7e5
Merge branch 'main' into patch-3
abserari Mar 6, 2023
277d406
Merge branch 'main' into patch-3
abserari Mar 21, 2023
0e9103a
Update Tiltfile
abserari Mar 21, 2023
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 Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ local_resource(

local_resource(
"restic_binary",
cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/restic; BIN=velero GOOS=linux GOARCH=amd64 GOARM="" RESTIC_VERSION=0.13.1 OUTPUT_DIR=_tiltbuild/restic ./hack/build-restic.sh',
cmd = 'cd ' + '.' + ';rm -rf ../restic; BIN=velero GOOS=linux GOARCH=amd64 GOARM="" RESTIC_VERSION=0.13.1 OUTPUT_DIR=../velero/_tiltbuild/restic ./hack/build-restic.sh',
Copy link
Collaborator

@kaovilai kaovilai Apr 25, 2023

Choose a reason for hiding this comment

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

I'm not sure we'd want to run rm -rf without confirmation.

If your $PWD is /git/velero and you have /git/restic as well wouldn't this command delete restic dir outside of velero repo?

Copy link
Contributor Author

@abserari abserari Apr 25, 2023

Choose a reason for hiding this comment

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

yes, you're right about the concern, I don't think rm -f should be in this file when it removes outside files. Maybe we need to change the restic download shell script and let all the thing under the Velero repo is good.

The origin reason is someone committed ./hack/build-restic.sh, and don't notice the file was also used by tilt up, so broke the restic download behavior in tilt up.

I suggest creating a new hack script for tilt to download the restic file, although there would be some redundant code.

Copy link
Collaborator

@kaovilai kaovilai Apr 25, 2023

Choose a reason for hiding this comment

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

could nest this under Makefile target ./path/to/restic/code:
and then add this path to gitignore.

)

# Note: we need a distro with a bash shell to exec into the Velero container
Expand Down