Skip to content

update git submodules

Wesley Hayutin edited this page Jun 22, 2026 · 2 revisions

Update Velero restic submodule to HEAD of oadp-1.6

1. Clean up the submodule from the earlier cherry-pick branch

cd restic
git checkout oadp-1.6
git branch -D cve-2026-33186-oadp-1.6
cd ..

2. Fetch the latest from the restic remote and update the submodule

This reads the branch = oadp-1.6 setting from .gitmodules, fetches from openshift/restic, and checks out the latest commit on that branch.

git submodule update --remote restic

3. Verify the update

git diff --submodule restic

4. Commit the change

git add restic
git commit -m "Update restic submodule to fix CVE-2026-33186

Update restic submodule to latest HEAD of oadp-1.6 branch,
picking up CVE fixes for google.golang.org/grpc."

5. Push to your fork and create a PR

git push weshayutin HEAD:update-restic-submod-1.6
gh pr create --repo openshift/velero --base oadp-1.6 \
  --title "Update restic submodule to fix CVE-2026-33186" \
  --body "Update restic submodule to latest HEAD of oadp-1.6 branch."

Note: The restic oadp-1.6 branch HEAD (8c4c3fbfe) is currently what the submodule already points to. The CVE fix commits must be merged into the restic oadp-1.6 branch first (via a PR on openshift/restic) before step 2 will pull in any changes. whayutin@fedora:~/OPENSHIFT/git/OADP/velero$