Release Guide
These steps describe how to conduct a release of the operator-sdk repo using example versions. Replace these versions with the current and new version you are releasing, respectively.
Table of Contents:
- Prerequisites
- Major and minor releases
- Patch releases
scorecard-test-kuttlimage releases- Release tips
Prerequisites
The following tools and permissions are needed to conduct a release of the operator-sdk repo.
Tools
Permissions
- Must be a Netlify admin
- Must be an admin on the operator-sdk repo
Setting Up Tools for MacOS Users
To install the prerequisite tools on MacOS, complete the following steps:
-
Install GNU
sedandmake, which may not be installed by default:-
brew install gnu-sed make
-
-
Verify that the version of
makeis higher than 4.2 using commandmake --version. -
Add the gnubin directory for
maketo your PATH from your~/.bashrcto allow you to usegmakeasmake:-
echo 'export PATH="/usr/local/opt/make/libexec/gnubin:$PATH"' >> ~/.bashrc
-
-
Verify that the version of
sedis higher than 4.3 using commandgnu-sed --version. -
Add the gnubin directory for
gnu-sedto your PATH from your~/.bashrcto allow you to usegnu-sedassed:-
echo 'export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"' >> ~/.bashrc
-
Major and Minor Releases
We will use the v1.3.0 release version in this example.
Be sure to substitute the version you are releasing into the provided commands.
To perform a major or minor release, you must perform the following actions:
- Ensure a new Netlify branch is created
- Create a release branch and lock down the master branch
- Create and merge a PR for the release branch
- Unlock the master branch and push a release tag to it
- Perform some clean up actions and announce the new release to the community
Procedure
-
Before creating a new release branch, it is imperative to perform the following initial setup steps:
- In the Branches and deploy contexts
pane in Netlify, click into the Additional branches list section and add
v1.13.x.- This will watch the branch when there are changes on Github (creating the branch, or adding a commit).
- NOTE: You must be a Netlify admin in order to edit the branches list.
- In the Branches and deploy contexts
pane in Netlify, click into the Additional branches list section and add
-
Create a release branch by running the following, assuming the upstream SDK repo is the
upstreamremote on your machine:-
git checkout master git fetch upstream master git pull master git checkout -b v1.3.x git push upstream v1.3.x
-
-
Make sure that the list of supported OLM versions is up to date:
- Identify if a new version of OLM needs to be officially supported by ensuring that the latest three releases listed on the OLM release page are all listed as supported in the Overview section of the SDK docs.
- If a new version of OLM needs to be added and an old version removed, follow the steps in the updating OLM bindata section before moving onto the next step.
-
Lock down the
masterbranch to prevent further commits before the release completes:- Go to
Settings -> Branchesin the SDK repo. - Under
Branch protection rules, clickEditon themasterbranch rule. - In section
Protect matching branchesof theRule settingsbox, increase the number of required approving reviewers to 6. - Scroll down to save your changes to protect the
masterbranch.
- Go to
-
Create and push a release commit
-
Create a new branch to push the release commit:
-
export RELEASE_VERSION=v1.3.0 git checkout master git pull master git checkout -b release-$RELEASE_VERSION
-
-
Update the top-level Makefile variable
IMAGE_VERSIONto the upcoming release tagv1.3.0. This variable ensures sample projects have been tagged correctly prior to the release commit.-
sed -i -E 's/(IMAGE_VERSION = ).+/\1v1\.3\.0/g' MakefileIf this command fails on MacOS with a warning “sed is not found”, follow the step 5 in the Setting Up Tools for MacOS Users section to map
gsedtosed.
-
-
Run the pre-release
maketarget:-
make prerelease
The following changes should be present:
Makefile: IMAGE_VERSION should be modified to the upcoming release tag. (This variable ensures sampleprojects have been tagged correctly prior to the release commit.)changelog/generated/v1.3.0.md: commit changes (created by changelog generation).changelog/fragments/*: commit deleted fragment files (deleted by changelog generation).website/content/en/docs/upgrading-sdk-version/v1.3.0.md: commit changes (created by changelog generation).website/config.toml: commit changes (modified by release script).testdata/*: Generated sample code.
-
-
Commit these changes and push to your remote (assuming your remote is named
origin):-
git add Makefile changelog website testdata git commit -sm "Release $RELEASE_VERSION" git push origin release-$RELEASE_VERSION
-
-
-
Create and merge a new PR for the release-v1.3.0 branch created in step 5.4.
- You can force-merge your PR to the locked-down
masterif you have admin access to the operator-sdk repo, or ask an administrator to do so. - Note that the docs PR check will fail because the site isn’t published yet; the PR can be merged anyways.
- You can force-merge your PR to the locked-down
-
Unlock the
masterbranch- Go to
Settings -> Branchesin the SDK repo. - Under
Branch protection rules, clickEditon themasterbranch rule. - In section
Protect matching branchesof theRule settingsbox, reduce the number of required approving reviewers back to 1.
- Go to
-
Create and push a release tag on
master-
Refresh your local
masterbranch, tag the release PR commit, and push to the main operator-sdk repo (assumes the remote’s name isupstream):-
git checkout master git pull master make tag git push upstream refs/tags/$RELEASE_VERSION
-
-
-
Fast-forward the
latestand release branches-
The
latestbranch points to the latest release tag to keep the main website subdomain up-to-date. Run the following commands to do so:-
git checkout latest git reset --hard refs/tags/$RELEASE_VERSION git push -f upstream latest
-
-
Similarly, to update the release branch, run:
-
git checkout v1.3.x git reset --hard refs/tags/$RELEASE_VERSION git push -f upstream v1.3.x
-
-
-
Post release steps
-
Publish the new Netlify subdomain for version-specific docs.
- Assuming that the Netlify prestep was done before the new branch was created, a new branch option should be visible to Netlify Admins under Domain management > Branch subdomains and can be mapped to a subdomain. (Note: you may have to scroll down to the bottom of the Branch subdomains section to find the branch that is ready to be mapped.)
- Please test that this subdomain works by going to the link in a browser. You can use the link in the second column to jump to the docs page for this release.
-
Make an operator-framework Google Group post.
- You can use this post as an example.
-
Post to Kubernetes slack in #kubernetes-operators and #operator-sdk-dev.
- You can use this post as an example.
-
Clean up the GitHub milestone
- In the GitHub milestone, bump any open issues to the following release.
- Close out the milestone.
-
Update the newly unsupported branch documentation (1.1.x in this example)to mark it as archived. (Note that this step does not need to be merged before the release is complete.)
-
Checkout the newly unsupported release branch:
-
git checkout v1.1.x
-
-
Modify the
website/config.tomlfile on lines 88-90 to be the following:
-
version = "v1.1" archived_version = true url_latest_version = "https://sdk.operatorframework.io"
-
-
Patch releases
We will use the v1.3.1 release version in this example.
0. Lock down release branches on GitHub
- Lock down the
v1.3.xbranch to prevent further commits before the release completes:- Go to
Settings -> Branchesin the SDK repo. - Under
Branch protection rules, clickEditon thev*.branch rule. - In section
Protect matching branchesof theRule settingsbox, increase the number of required approving reviewers to6.
- Go to
1. Branch
Create a new branch from the release branch (v1.3.x in this example). This branch should already exist prior to cutting a patch release.
export RELEASE_VERSION=v1.3.1
git checkout v1.3.x
git pull
git checkout -b release-$RELEASE_VERSION
2. Prepare the release commit
Using the version for your release as the IMAGE_VERSION, execute the following commands from the root of the project.
# Update the IMAGE_VERSION in the Makefile
sed -i -E 's/(IMAGE_VERSION = ).+/\1v1\.3\.1/g' Makefile
# Run the pre-release `make` target:
make prerelease
All of the following changes should be present (and no others).
- Makefile: IMAGE_VERSION should be modified to the upcoming release tag. (This variable ensures sampleprojects have been tagged correctpy priror to the release commit.)
- changelog/: all fragments should be deleted and consolidated into the new file
changelog/generated/v1.3.1.md - docs: If there are migration steps, a new migration doc will be created. The installation docs should also contain a link update.
- testdata/: Generated samples and tests should have version bumps
Commit these changes and push these changes to your fork:
git add Makefile changelog website testdata
git commit -sm "Release $RELEASE_VERSION"
git push -u origin release-$RELEASE_VERSION
3. Create and merge Pull Request
- Create a pull request against the
v1.3.xbranch. - Once approving review is given, merge. You may have to unlock the branch by setting
“required approving reviewers” to back to
1. (See step 0).
4. Create a release tag
Pull down v1.3.x and tag it.
git checkout v1.3.x
git pull upstream v1.3.x
make tag
git push upstream refs/tags/$RELEASE_VERSION
5. Fast-forward the latest branch
If the patch release is on the latest y-stream (in the example you would
not ff latest if there was a y-stream for v1.4.x), you will need to
fast-forward the latest git branch.
(The latest branch points to the latest release tag to keep the main website subdomain up-to-date.)
git checkout latest
git reset --hard tags/$RELEASE_VERSION
git push -f upstream latest
6. Post release steps
- Make an operator-framework Google Group post.
- Post to Kubernetes slack in #kubernetes-operators and #operator-sdk-dev.
- In the GitHub milestone, bump any open issues to the following release.
Note In case there are non-transient errors while building the release job, you must:
- Revert the release PR. To do so, create a PR which reverts the patch release PR created in step 3.
- Fix what broke in the release branch.
- Re-run the release with an incremented minor version to avoid Go module errors (ex. if v1.3.1 broke, then re-run the release as v1.3.2). Patch versions are cheap so this is not a big deal.
scorecard-test-kuttl image releases
The quay.io/operator-framework/scorecard-test-kuttl image is released separately from other images because it
contains the kudobuilder/kuttl image, which is subject to breaking changes.
Release tags of this image are of the form: scorecard-kuttl/vX.Y.Z, where X.Y.Z is not the current operator-sdk version.
For the latest version, query the operator-sdk repo tags for scorecard-kuttl/v.
The only step required is to create and push a tag.
This example uses version v2.0.0, the first independent release version of this image:
export RELEASE_VERSION=scorecard-kuttl/v2.0.0
make tag
git push upstream refs/tags/$RELEASE_VERSION
The deploy/image-scorecard-test-kuttl
Action workflow will build and push this image.
Helpful Tips and Information
Binaries and Signatures
Binaries will be signed using our CI system’s GPG key. Both binary and signature will be uploaded to the release.
Release Branches
Each minor release has a corresponding release branch of the form vX.Y.x, where X and Y are the major and minor
release version numbers and the x is literal. This branch accepts bug fixes according to our backport policy.
Cherry-picking
Once a minor release is complete, bug fixes can be merged into the release branch for the next patch release.
Fixes can be added automatically by posting a /cherry-pick v1.3.x comment in the master PR, or manually by running:
git checkout v1.3.x
git checkout -b cherrypick/some-bug
git cherry-pick <commit>
git push upstream cherrypick/some-bug
Create and merge a PR from your branch to v1.3.x.
GitHub Release Information
GitHub releases live under the Releases tab in the operator-sdk repo.
Updating OLM Bindata
Prior to an Operator SDK release, add bindata (if required) for a new OLM version by following these steps:
-
Add the new version to the
OLM_VERSIONSvariable in the Makefile. -
Remove the lowest version from that variable, as
operator-sdkonly supports 3 versions at a time. -
Run
make bindata. -
Check that all files were correctly updated by running this script from the root directory of the repository:
-
./hack/check-olm.shIf the check shows that files were missed by the make target, manually edit them to add the new version and remove the obsolete version.
-
-
Check that the list of supported OLM versions stated in the
Overviewsection of SDK documentation is updated. -
Add the changed files to ensure that they will be committed as part of the release commit:
-
git add -u
-
Patch Releases in Parallel
The following should be considered when doing parallel patch releases:
- Releasing in order is nice but not worth the inconvenience. Release order affects the order on GitHub releases, and which is labeled “latest release”.
- Do not unlock v.* branches while other releases are in progress. Instead, have an admin do the merges.
- Release announcements should be consolidated.