public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 23:09:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve release docs - updated (#8414)

Browse Source 
* add updated improves

Signed-off-by: Johnatas <johnatasr@hotmail.com>

* change push tags version example

Signed-off-by: Johnatas <johnatasr@hotmail.com>

---------

Signed-off-by: Johnatas <johnatasr@hotmail.com>
This commit is contained in:
Johnatas
2023-09-28 22:52:14 -03:00
committed by GitHub
parent 0e5c760625
commit 021c5b291b
1 changed files with 93 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
docs/release/kubernetes-upgrade.md
View File

@@ -4,6 +4,18 @@ This document details the K3S kubernetes patch release process.
# Before You Begin # Before You Begin
You’ll be primarily using git and go. Git can be installed via the local package manager. Make sure Go is installed and configured correctly, utilizing a “gopath”. This can be set via an environment variable called GOPATH. eg. export GOPATH=”${HOME}/go”, typically. You’ll be primarily using git and go. Git can be installed via the local package manager. Make sure Go is installed and configured correctly, utilizing a “gopath”. This can be set via an environment variable called GOPATH. eg. export GOPATH=”${HOME}/go”, typically.
Ensure proper GPG Signing, disable GPG signing in git config with:
```sh
git config --local commit.gpgSign false
```
Configure GPG signing for tags as needed.
In Docker, prevent user mismatch with:
```sh
git config --global core.safelyUseIncompatibleGitCredentialHelper true
```
## Clone and Setup Remotes ## Clone and Setup Remotes
Clone from upstream then add k3s-io fork and your personal fork. Clone from upstream then add k3s-io fork and your personal fork.
```sh ```sh
@@ -68,53 +80,55 @@ echo -e ${BUILD_CONTAINER} | docker build -t ${GOIMAGE}-dev -
# Rebasing pulls in the tags.sh script. # Rebasing pulls in the tags.sh script.
# Now create the tags by executing tag.sh with the given version variables. # Now create the tags by executing tag.sh with the given version variables.
docker run --rm -u $(id -u) \ docker run --rm -u $(id -u):$(id -g) \
--mount type=tmpfs,destination=${GOPATH}/pkg \ -v ${GOPATH}/src:/go/src:rw \
-v ${GOPATH}/src:/go/src \ -v ${GOPATH}/pkg:/go/pkg:rw \
-v ${GOPATH}/.cache:/go/.cache \ -v ${GOPATH}/.cache:/go/.cache:rw \
-v ${GLOBAL_GIT_CONFIG_PATH}:/go/.gitconfig \ -v ${GLOBAL_GIT_CONFIG_PATH}:/go/.gitconfig:rw \
-e GIT_TRACE=1 \ -e GIT_TRACE=1 \
-e HOME=/go \ -e HOME=/go \
-e GOCACHE=/go/.cache \ -e GOCACHE=/go/.cache \
-w /go/src/github.com/kubernetes/kubernetes ${GOIMAGE}-dev ./tag.sh ${NEW_K3S_VER} 2>&1 | tee ~/tags-${NEW_K3S_VER}.log -w /go/src/github.com/kubernetes/kubernetes \
${GOIMAGE}-dev chown -R $(id -u) .git | ./tag.sh ${NEW_K3S_VER} 2>&1 | tee ~/tags-${NEW_K3S_VER}.log
``` ```
After tag.sh runs, you should see a list of `git push` commands at the end of the output. After tag.sh runs, you should see a list of `git push` commands at the end of the output.
Save this output to a file called ```push.sh``` and mark it as executable by running the following command: Save this output to a file called ```push.sh``` and mark it as executable by running the following command:
```sh ```sh
chmod +x push.sh chmod +x push.sh
``` ```
### tag.sh example output (The kubernetes versions will correspond to those of the patch release, 1.27 is shown below): ### tag.sh example output (The kubernetes versions will correspond to those of the patch release, 1.28 is shown below):
```sh ```sh
git push ${REMOTE} staging/src/k8s.io/api/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/api/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/apiextensions-apiserver/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/apiextensions-apiserver/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/apimachinery/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/apimachinery/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/apiserver/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/apiserver/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/client-go/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/client-go/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/cli-runtime/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/cli-runtime/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/cloud-provider/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/cloud-provider/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/cluster-bootstrap/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/cluster-bootstrap/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/code-generator/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/code-generator/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/component-base/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/component-base/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/component-helpers/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/component-helpers/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/controller-manager/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/controller-manager/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/cri-api/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/cri-api/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/csi-translation-lib/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/csi-translation-lib/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kube-aggregator/v1.22.12-k3s1 git push ${REMOTE} staging/src/k8s.io/dynamic-resource-allocation/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/controller-manager/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/endpointslice/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kms/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kms/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kube-aggregator/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kube-aggregator/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kube-controller-manager/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kube-controller-manager/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kube-proxy/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kubectl/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kube-scheduler/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kubelet/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kubectl/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kube-proxy/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/kubelet/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/kube-scheduler/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/legacy-cloud-providers/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/legacy-cloud-providers/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/metrics/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/metrics/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/mount-utils/v1.27.0-k3s1 git push ${REMOTE} staging/src/k8s.io/mount-utils/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/sample-apiserver/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/pod-security-admission/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/sample-cli-plugin/v1.27-k3s1 git push ${REMOTE} staging/src/k8s.io/sample-apiserver/v1.28.2-k3s1
git push ${REMOTE} staging/src/k8s.io/sample-controller/v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/sample-cli-plugin/v1.28.2-k3s1
git push ${REMOTE} v1.27.3-k3s1 git push ${REMOTE} staging/src/k8s.io/sample-controller/v1.28.2-k3s1
git push ${REMOTE} v1.28.2-k3s1
``` ```
## Push tags to k3s-io remote ## Push tags to k3s-io remote
``` ```
@@ -182,7 +196,7 @@ Once CI passes and you receive two approvals, you may now squash-merge the PR an
Releases are kicked off and created by tagging a new tag. Releases are kicked off and created by tagging a new tag.
To create a new release in Github UI perform the following: To create a new release in Github UI perform the following:
1. Set title and tag according to the release version you're working on. E.g. v1.22.5-rc1+k3s1. 1. Set title and tag according to the release version you're working on. E.g. v1.28.2-rc1+k3s1.
2. Leave description blank. 2. Leave description blank.
3. Check the pre-release field. 3. Check the pre-release field.
4. Publish 4. Publish
@@ -190,33 +204,21 @@ To create a new release in Github UI perform the following:
The resulting run can be viewed here: The resulting run can be viewed here:
[k3s-io/k3s Drone Dashboard](https://drone-publish.k3s.io/k3s-io/k3s) [k3s-io/k3s Drone Dashboard](https://drone-publish.k3s.io/k3s-io/k3s)
# Create GA Release Candidate It may be necessary to create a new release candidate to accommodate changes in dependencies such as modifications in https://github.com/k3s-io/k3s-upgrade. To do this, repeat the previous process for tagging and increment the rc version.
Once QA has verified that the RC is good (or that any fixes have been added in follow up release candidates), it is time for the general release.
1. Create new release in the Github web interface # Check system-agent-installer-k3s Release Images
2. Set title: ${NEW_K8S}, add description with release notes. Leave the tag section blank. The system-agent-installer-k3s repository is used with Rancher v2prov system. Any K3s version set in Rancher KDM must be published here as well (RCs and full releases).
3. Check the pre-release field. To ensure this synchronization, visit the [repository](https://github.com/rancher/system-agent-installer-k3s) and verify the creation of new releases and corresponding tags that align with the version numbers.
4. Save as draft until RC testing is complete.
Once QA signs off on a RC: Build progress can be tracked [here](https://hub.docker.com/r/rancher/system-agent-installer-k3s/tags).
1. Set tag to be created - this tag should match the tag in the drafted title.
2. Ensure prerelease is checked.
3. Publish.
24 hours after CI has completed and artifacts are created: # Check Release Images
1. Uncheck prerelease, and save.
2. Update channel server
The resulting CI/CD run can be viewed here:
[k3s-io/k3s Drone Dashboard](https://drone-publish.k3s.io/k3s-io/k3s)
# Create Release Images
The k3s-upgrade repository bundles a k3s binary and script that allows a user to upgrade to a new k3s release. This process is normally automated, however this can fail. If the automation does fail, do the following: The k3s-upgrade repository bundles a k3s binary and script that allows a user to upgrade to a new k3s release. This process is normally automated, however this can fail. If the automation does fail, do the following:
Go to the [k3s-upgrade repository](https://github.com/k3s-io/k3s-upgrade) and manually create a new tag for the release. This will kick off a build of the image. Go to the [k3s-upgrade repository](https://github.com/k3s-io/k3s-upgrade) and manually create a new tag for the release. This will kick off a build of the image.
1. Draft a new release 1. Draft a new release
2. Enter the tag (e.g. v1.22.5-rc1+k3s1). 2. Enter the tag (e.g. v1.28.2-rc1+k3s1).
3. Check k3s and k3s-upgrade images Exist 3. Check k3s and k3s-upgrade images Exist
This process will take some time but upon completion, the images will be listed here. This process will take some time but upon completion, the images will be listed here.
@@ -258,11 +260,36 @@ A later version can point to those arguments with no change:
maxChannelServerVersion: v2.6.99 maxChannelServerVersion: v2.6.99
serverArgs: *serverArgs-v1 serverArgs: *serverArgs-v1
``` ```
If you are unsure of the new minor versions min/max constraints you can ask the Project manager and/or QA.
# Create system-agent-installer-k3s Release Images ##### QA may request change for the specs based on rcs:
The system-agent-installer-k3s repository is used with Rancher v2prov system. Any K3s version set in Rancher KDM must be published here as well (RCs and full releases). ```yaml
[Go to the repo](https://github.com/rancher/system-agent-installer-k3s) and manually create a new release and tag it with the corresponding version numbers. This will kick off a build of the image. - version: v1.28.2-rc1+k3s1
Build progress can be tracked [here](https://drone-publish.rancher.io/rancher/system-agent-installer-k3s). minChannelServerVersion: v2.8.0-alpha1
maxChannelServerVersion: v2.8.99
serverArgs: *serverArgs-v7
```
If you are unsure of the new minor versions min/max constraints you can ask the Project manager and/or QA.
# Create GA Release Candidate
Once QA has verified that the RC is good (or that any fixes have been added in follow up release candidates), it is time for the general release.
1. Create new release in the Github web interface
2. Set title: ${NEW_K8S}, add description with release notes. Leave the tag section blank.
3. Check the pre-release field.
4. Save as draft until RC testing is complete.
Once QA signs off on a RC:
1. Set tag to be created - this tag should match the tag in the drafted title.
2. Ensure prerelease is checked.
3. Publish.
4. Reiterate the previous checking processes and update KDM specifications accordingly with the GA release tags.
##### `24 hours after` CI has completed and artifacts are created:
1. Uncheck prerelease, and save.
2. Update channel server
The resulting CI/CD run can be viewed here:
[k3s-io/k3s Drone Dashboard](https://drone-publish.k3s.io/k3s-io/k3s)
# Update Channel Server # Update Channel Server
Once the release is verified, the channel server config needs to be updated to reflect the new version for “stable”. [channel.yaml can be found at the root of the K3s repo.](https://github.com/k3s-io/k3s/blob/master/channel.yaml) Once the release is verified, the channel server config needs to be updated to reflect the new version for “stable”. [channel.yaml can be found at the root of the K3s repo.](https://github.com/k3s-io/k3s/blob/master/channel.yaml)
@@ -274,3 +301,4 @@ channels:
- name: stable - name: stable
latest: <new-k8s-version>+k3s1 # Replace this semver with the version corresponding to the release latest: <new-k8s-version>+k3s1 # Replace this semver with the version corresponding to the release
``` ```
##### After completing all these processes, ensure that you publish in the release Slack thread that patch releases have been completed and the code freeze has ended.