v1.11 backports 2022-01-20 #18569
Merged
v1.11 backports 2022-01-20 #18569
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit 1b42f7a ] On GitHub, one cannot request oneself to review one's own PR. This results in the following problem when submitting a backport PR: $ submit-backport Using GitHub repository joestringer/cilium (git remote: origin) Sending PR for branch v1.10: v1.10 backports 2021-11-23 * #17788 -- Additional FQDN selector identity tracking fixes (@joestringer) Once this PR is merged, you can update the PR labels via: ```upstream-prs $ for pr in 17788; do contrib/backporting/set-labels.py $pr done 1.10; done ``` Sending pull request... remote: remote: Create a pull request for 'pr/v1.10-backport-2021-11-23' on GitHub by visiting: remote: https://github.com/joestringer/cilium/pull/new/pr/v1.10-backport-2021-11-23 remote: Error requesting reviewer: Unprocessable Entity (HTTP 422) Review cannot be requested from pull request author. Signal ERR caught! Traceback (line function script): 58 main /home/joe/git/cilium/contrib/backporting/submit-backport Fix this by excluding ones own username from the reviewers list. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
[ upstream commit eed68f5 ] Build gops on native platform rather than amd64. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
[ upstream commit 2d41a3c ] Add cross-compilation packages for both arm64 and amd64 to cilium-builder regardless of the build target. This allows Cilium image build to succeed also on arm64. Without this builer/cilium/download-hubble.sh failed due to missing 'x86_64-linux-gnu-strip'. Also install 'binutils-x86-64-linux-gnu' whenever installing 'binutils-aarch64-linux-gnu' to fix gops build on arm64. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
maintainer-s-little-helper
bot
added
backport/1.11
nbusseneau
approved these changes
Jan 21, 2022
nbusseneau
previously requested changes
Jan 21, 2022
| @@ -109,7 +109,7 @@ jobs: | |||
| quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:v1.11-race | |||
| quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race | |||
| build-args: | | |||
| BASE_IMAGE=quay.io/cilium/cilium-runtime:3e2ea3c996d8372ba65ee14058a716f797c67496@sha256:f5ea135fce72807158e520d1754e826b138cf9e97adde528fd992b3e79ef6ee8 | |||
| BASE_IMAGE=quay.io/cilium/cilium-runtime:805506ff0dc0a9886fc1a8ce53191275f8baf62e | |||
There was a problem hiding this comment.
Wrong click sorry => I think there might be an issue here with the image reference as we're missing the sha256 pin.
There was a problem hiding this comment.
I'm following steps here: https://docs.cilium.io/en/stable/contributing/development/images/#update-cilium-builder-and-cilium-runtime-images
I think they images are build in the build deployment and running the scripts will add their checksums.
kkourt
force-pushed
the
pr/kkourt/v1.11-backport-2022-01-20
branch
from
f0ba0b9
to
ba84ba5
Compare
kkourt
dismissed
nbusseneau’s stale review
I cannot deploy the branch so that the images can be build. I'm dismissing the review, in case it causes this.
kkourt
force-pushed
the
pr/kkourt/v1.11-backport-2022-01-20
branch
from
ba84ba5
to
ba68d85
Compare
Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
kkourt
force-pushed
the
pr/kkourt/v1.11-backport-2022-01-20
branch
from
ba68d85
to
71315db
Compare
joestringer
approved these changes
Jan 21, 2022
sayboras
approved these changes
Jan 23, 2022
kaworu
approved these changes
Jan 24, 2022
tklauser
approved these changes
Jan 24, 2022
jrajahalme
approved these changes
Jan 25, 2022
kkourt
added
the
ready-to-merge
|
CI is green, and got all approvals from original authors. Marking |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
v1.11 backports 2022-01-20
install-no-conntrack-iptables-ruleswhen masquerading is disabled #18482 -- Allowinstall-no-conntrack-iptables-ruleswhen masquerading is disabled (@pchaigno)MasqueradingEnabled()function.Once this PR is merged, you can update the PR labels via:
Note
Skipped #18483: since it contained a mistake which is fixed by #18582, so they should probably be backported together.