Skip to content

Conversation

aanm
Copy link
Member

@aanm aanm commented Mar 31, 2021

Once this PR is merged, you can update the PR labels via:

$ for pr in 15481 15294 15495; do contrib/backporting/set-labels.py $pr done 1.7; done

@brb the PR 15431 -- node-neigh: Query once netlink for neigh discovery device (@brb) was not backported due conflicts.

pchaigno and others added 9 commits March 31, 2021 18:48
[ upstream commit aabc7bf ]

The commands to perform key rotations don't work because of YAML's
indentations. The key keys can be indented:

    $ ks get secrets cilium-ipsec-keys -o yaml | grep -C1 keys:
    data:
      keys: MSByZmM0MTA2KGdjbShhZXMpKSA0NDQzNDI0MTM0MzMzMjMxMjQyMzIyMjExNDEzMTIxMWY0ZjNmMmYxIDEyOA==
    kind: Secret

This commit fixes the regular expression.

Fixes: 458c623 ("Documentation: fix key rotation command in encryption guide")
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit ceb1e07 ]

Make the version handling more flexible by taking in a version number in
either the "vX.Y.Z" or "X.Y.Z" formats, stripping the leading v and
setting the URL up correctly to pull the manifests from the target URL.

Fixes the following error:

    $ contrib/release/pull-docker-manifests.sh joestringer 1.7.15
    https://github.com/cilium/cilium/actions/runs/637686978
    curl: (3) URL using bad/illegal format or missing URL

    Signal ERR caught!

    Traceback (line function script):
    71 main contrib/release/pull-docker-manifests.sh
    85 main contrib/release/pull-docker-manifests.sh

    Exiting...

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit ef6c8a6 ]

This extra step should be carried out to ensure the digests are correct
in the helm charts in the tree following a release.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit 6feafc2 ]

These changes allow running the master version of the script from
another directory and only outputting the changed files into the current
directory (for instance, if you have a dedicated copy of Cilium per
branch).

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit 648fbf0 ]

Commits 14a9087 ("contrib/release: do not require images to be
download locally") and 1a6d10a (".github: Improve digest formatting
in workflow") both attempted to add the title for the digests into the
output format, but this lead to the title being added twice. We only
need one, so remove the other one.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit daeaa9c ]

When we prepare the tag commit for an upcoming Cilium release, we want
that commit to point towards images like "cilium/cilium:vX.Y.Z". Then,
once we have pushed & generated images for that tag, we will have an
image digest that points to this tag. At that point, we will update the
digests again to point to a fully qualified image something like
"cilium/cilium:vX.Y.Z@sha256:abcdef...", which will be injected into the
Helm charts corresponding to this release.

This commit clears the previous image shas (corresponding to a prior
release) when starting a new release.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit b117dae ]

This script previously assumed that you first checkout the branch where
you will make the release, then run the script. By first pulling &
creating the branch in the script, we can detect the "old_version"
correctly with fewer dependencies on the release manager's environment.

Reported-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit 2dc2805 ]

Rearrange the parameters and make version / github username optional
parameters with some sane autodetection.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
[ upstream commit 9ac4d95 ]

Bumps [pygments](https://github.com/pygments/pygments) from 2.4.2 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.4.2...2.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm requested a review from a team as a code owner March 31, 2021 16:49
@aanm aanm added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Mar 31, 2021
@aanm aanm requested review from joestringer and pchaigno March 31, 2021 16:50
@aanm
Copy link
Member Author

aanm commented Mar 31, 2021

no need to run CI since there aren't code changes

@pchaigno pchaigno removed their assignment Mar 31, 2021
@aanm aanm merged commit ccf2b13 into cilium:v1.7 Apr 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants