Differences

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

--- kubernetes_github_workflow [2018/04/08 14:15] – [The workflow] rpjday
+++ kubernetes_github_workflow [2018/04/08 14:21] (current) – [The workflow] rpjday
@@ Line 28: / Line 28: @@
 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>