User Tools

Site Tools


kubernetes_github_workflow

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
kubernetes_github_workflow [2018/04/08 14:15]
rpjday [The workflow]
kubernetes_github_workflow [2018/04/08 14:21] (current)
rpjday [The workflow]
Line 28: Line 28:
 origin https://​github.com/​rpjday/​kubernetes (push) origin https://​github.com/​rpjday/​kubernetes (push)
 $ $
 +</​code>​
 +
 +Define the remote ''​upstream''​ for the official Kubernetes repo, and make sure you can't push to it:
 +
 +<​code>​
 +$ git remote add upstream https://​github.com/​kubernetes/​kubernetes.git
 +$ git remote set-url --push upstream no_push
 +$ git remote -v
 +origin https://​github.com/​rpjday/​kubernetes (fetch)
 +origin https://​github.com/​rpjday/​kubernetes (push)
 +upstream https://​github.com/​kubernetes/​kubernetes.git (fetch)
 +upstream no_push (push)
 +$
 +</​code>​
 +
 +Finally, regularly pull new content and merge it into the ''​master''​ branch:
 +
 +<​code>​
 +$ git checkout master
 +$ git fetch upstream
 +$ git merge upstream/​master
 </​code>​ </​code>​
kubernetes_github_workflow.1523196931.txt.gz ยท Last modified: 2018/04/08 14:15 by rpjday