Skip to content

Latest commit

 

History

History
87 lines (59 loc) · 4.44 KB

process.md

File metadata and controls

87 lines (59 loc) · 4.44 KB
Raw

Features, Hotfixes, and Releases

This document describes how to contribute features or hotfixes, and how new Gardener releases are usually scheduled, validated, etc.

Contributing new Features or Fixes

Please refer to the Gardener contributor guide. Besides a lot of a general information, it also provides a checklist for newly created pull requests that may help you to prepare your changes for an efficient review process.

⚠️ Please ensure that your modifications pass the verification checks (linting, formatting, static code checks, tests, etc.) by executing

make verify

before filing your pull request.

The guide applies for both changes to the master and to any release-* branch. All changes must be submitted via a pull request and be reviewed and approved by at least one code owner.

Releases

There is no fixed schedule for new releases of the gardener/gardener component. The @gardener-maintainers are trying to provide a new release roughly every other week (depending on their capacity and the stability/robustness of the master branch).

Hotfixes are usually only maintained for the latest minor release as well as the minor release before that.

The validation process for new releases usually takes a couple of days and includes the following steps:

  1. master (or latest release-* branch) is deployed to a development landscape that already hosts some existing seed and shoot clusters.
  2. An extended test suite is triggered by the "release responsible" which
    1. executes the Gardener integration tests for different Kubernetes versions, infrastructures, and Shoot settings.
    2. executes the Kubernetes conformance tests.
    3. executes further tests like Kubernetes/OS patch/minor version upgrades.
  3. Additionally, every four hours (or on demand) more tests (e.g., including the Kubernetes e2e test suite) are executed for different infrastructures.
  4. The "release responsible" is verifying new features or other notable changes (derived of the draft release notes) in this development system.

If all tests are green, all checks were successful, and the release responsible has performed all of the planned verifications then the release is triggered.

Cherry Picks

This section explains how to initiate cherry picks on release branches within the gardener/gardener repository.

Prerequisites

Before you initiate a cherry pick, make sure that the following prerequisites are accomplished.

  • A pull request merged against the master branch.
  • The release branch exists (example: release-v1.18)
  • Have the gardener/gardener repository cloned as follows:
    • the origin remote should point to your fork (alternatively this can be overwritten by passing FORK_REMOTE=<fork-remote>)
    • the upstream remote should point to the Gardener github org (alternatively this can be overwritten by passing UPSTREAM_REMOTE=<upstream-remote>)
  • Have hub installed, which is most easily installed via go get github.com/github/hub assuming you have a standard golang development environment.
  • A github token which has permissions to create a PR in an upstream branch.

Initiate a Cherry Pick

  • Run the cherry pick script

    This example applies a master branch PR #3632 to the remote branch upstream/release-v3.14:

    GITHUB_USER=<your-user> hack/cherry-pick-pull.sh upstream/release-v3.14 3632

    • Be aware the cherry pick script assumes you have a git remote called upstream that points at the Gardener github org.

    • You will need to run the cherry pick script separately for each patch release you want to cherry pick to. Cherry picks should be applied to all active release branches where the fix is applicable.

    • When asked for your github password, provide the created github token rather than your actual github password. Refer mislav/hub#2655 (comment)