-
Story
-
Resolution: Done
-
Undefined
-
None
-
None
-
None
-
Upstream
-
False
-
None
-
False
-
OCPSTRAT-910 - Rebase AWS Pod Identity Webhook to v0.4.0
-
-
Rebase aws-pod-identity-webhook fork to include upstream enhancements and fixes.
Process:
1. Fork upstream into personal account
2. Clone Fork
git clone git@github.com:joelddiaz/amazon-eks-pod-identity-webhook.git
3. Add upstream remote
git remote add --fetch upstream https://github.com/aws/amazon-eks-pod-identity-webhook
4. Add OpenShift remote
git remote add --fetch openshift https://github.com/openshift/aws-pod-identity-webhook.git
5. Create branch for PR
git checkout -b rebase-master master
6. Merge openshift/master into rebase-master using ours strategy
git merge -s ours openshift/master
7. Make a list of carry commits (output by merge -s ours) and cherry-picked them into rebase-master branch. Evaluate the need to carry patches based on their inclusion in upstream.