v1.9 backports 2021-11-30 #18070
Merged
v1.9 backports 2021-11-30 #18070
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 4758bef ] in doc, it recommends docker pull image, but the command is : docker pull cilium/cilium:|IMAGE_TAG| this will download from docker.io However, in operator, it loads images from quay.io we should keep them the same, otherwise, we download for nothing. [ Backport note: Skip files - test/provision/manifest/1.20/coredns_deployment.yaml - test/provision/manifest/1.20/eks/coredns_deployment.yaml - test/provision/manifest/1.21/coredns_deployment.yaml - test/provision/manifest/1.21/eks/coredns_deployment.yaml - test/provision/manifest/1.22/coredns_deployment.yaml - test/provision/manifest/1.22/eks/coredns_deployment.yaml as none of them are present on v1.9. ] Signed-off-by: adamzhoul <adamzhoul186@gmail.com> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
maintainer-s-little-helper
bot
added
backport/1.9
kind/backports
|
/test-backport-1.9 Job 'Cilium-PR-K8s-1.18-kernel-4.19' hit: #17617 (94.19% similarity) |
[ upstream commit e38e3c4 ] Commit 8bcc4e5 ("bugtool: avoid allocation on conversion of execCommand result to string") broke the `ip route show` commands because the change from `[]byte` to `string` causes the `%v` formatting verb to emit the raw byte slice, not the string. Fix this by using the `%s` formatting verb to make sure the argument gets interpreted as a string. Also fix another instance in `writeCmdToFile` where `fmt.Fprint` is now invoked with a byte slice. Grepping for `%v` in bugtool sources and manually inspecting all changes from commit 8bcc4e5 showed no other instances where a byte slice could potentially end up being formatted in a wrong way. Fixes: 8bcc4e5 ("bugtool: avoid allocation on conversion of execCommand result to string") Signed-off-by: Tobias Klauser <tobias@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
qmonnet
force-pushed
the
pr/v1.9-backport-2021-11-30
branch
from
4a712c7
to
6b89cc7
Compare
|
I removed the related backport from the current PR. |
|
/test-backport-1.9 |
|
/test-1.12-netnext |
|
/test-1.17-5.4 |
|
/test-gke |
|
Currently gke is blocked by #17797 not being merged. Going to merge. |
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.
test/contrib: Bump CoreDNS version to 1.8.3 #18018 (@brb)(Skipping
test/provision/manifest/1.2[0-2]{,/eks}/coredns_deployment.yaml, missing on v1.9)Removed because of CI: k8s v1.19 or older: Kubernetes DNS did not become ready in time (all tests) #18086.
Once this PR is merged, you can update the PR labels via: