2019-01-12 04:58:27 +00:00
|
|
|
# Kubernetes
|
|
|
|
|
|
|
|
|
|
<img src="https://github.com/kubernetes/kubernetes/raw/master/logo/logo.png" width="100">
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
Kubernetes without the features I don't care about.
|
|
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
Rebase Instructions
|
|
|
|
|
-------------------
|
2019-01-12 04:58:27 +00:00
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
## Patch rebase
|
2019-01-12 04:58:27 +00:00
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
These are instructions for rebasing a patch version. For example if the current
|
|
|
|
|
k3s k8s version is v1.13.3 and v1.13.4 comes out these are the procedures on how
|
|
|
|
|
to rebase and create a new release. If v1.14 comes out that procedure is different.
|
2019-01-12 04:58:27 +00:00
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
The below instructions will use the example of rebasing from v1.13.3 to v1.13.4.
|
|
|
|
|
For git commands the remote `rancher` is github.com/rancher/k3s and the remote
|
|
|
|
|
`upstream` refers to github.com/kubernetes/kubernetes
|
2019-01-12 04:58:27 +00:00
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
* Create a branch in github.com/rancher/k3s called k3s-${VERSION} that is branched
|
|
|
|
|
from the upstream tag ${VERSION}.
|
|
|
|
|
|
2019-01-12 04:58:27 +00:00
|
|
|
```bash
|
2019-03-01 00:10:03 +00:00
|
|
|
VERSION=v1.13.4
|
|
|
|
|
git fetch upstream
|
|
|
|
|
git checkout -b k3s-${VERSION} ${VERSION}
|
|
|
|
|
git push rancher k3s-${VERSION}
|
2019-01-12 04:58:27 +00:00
|
|
|
```
|
|
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
* Start rebase
|
2019-01-12 04:58:27 +00:00
|
|
|
```bash
|
2019-03-01 00:10:03 +00:00
|
|
|
OLD_VERSION=v1.13.3
|
|
|
|
|
VERSION=v1.13.4
|
|
|
|
|
git fetch rancher
|
|
|
|
|
git checkout k3s-${VERSION}
|
|
|
|
|
git reset --hard rancher/k3s-${OLD_VERSION}
|
|
|
|
|
git rebase -i ${VERSION}
|
2019-01-12 04:58:27 +00:00
|
|
|
```
|
2019-03-01 00:10:03 +00:00
|
|
|
* When presented with the patch edit screen you want to drop an commit titled
|
|
|
|
|
"Update Vendor" or a version commit like "v1.13.3-k3s.6"
|
|
|
|
|
* Continue rebase and resolve any conflicts.
|
|
|
|
|
* Run the below to update vendor and apply tag
|
2019-01-12 04:58:27 +00:00
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
```bash
|
|
|
|
|
VERSION=v1.13.4
|
2019-03-29 00:03:05 +00:00
|
|
|
./deps.sh && ./tag.sh ${VERSION}-k3s.1
|
2019-03-01 00:10:03 +00:00
|
|
|
```
|
2019-01-12 04:58:27 +00:00
|
|
|
|
2019-03-01 00:10:03 +00:00
|
|
|
* Update the README.md with anything that might have changed in the procedure
|
|
|
|
|
* Put in PR to github.com/rancher/k3s k3s-${VERSION} branch
|
|
|
|
|
* After merge apply ${VERSION}-k3s.1 tag in github then vendor into k3s
|
