v1.7 backports 2020-09-03 #13065
Merged
v1.7 backports 2020-09-03 #13065
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
borkmann
added
release-note/misc
maintainer-s-little-helper
bot
added
the
kind/backports
|
test-backport-1.7 |
pchaigno
requested changes
Sep 3, 2020
| role: slave | ||
| app: redis | ||
| role: follower | ||
| tier: backend |
There was a problem hiding this comment.
Same as for the v1.8 backport: the frontend image below will need to be updated to match the Docker image version used in master:
- image: gcr.io/google-samples/gb-frontend:v4
+ image: gcr.io/google-samples/gb-frontend:v6There was a problem hiding this comment.
Thanks a lot for the hint, I just repushed
borkmann
force-pushed
the
pr/v1.7-backports-2020-09-03
branch
from
ae51436
to
26acbe2
Compare
|
test-backport-1.7 |
|
https://jenkins.cilium.io/job/Cilium-PR-Doc-Tests/2407/console: |
[ upstream commit 8aba1c1 ] ae9e4be updated the GuestBook images and labels, but failed to make the same label update in the test itself. Thus, since then, we have not been running any connectivity check in the GuestBook test. That went unnoticed because we didn't check that the set of pods returned (from which we run connectivity checks) was not empty. This commit fixes it by: 1. Updating the label in the test itself to app=guestbook. 2. Adding a check that the set of pods selected isn't empty. However, the nc utility we were using to check connectivity from the frontend pods to the Redis backend isn't available in the new images. Therefore, we also need to: 3. Use curl instead inside the frontend pods to check that the PHP frontend works as expected and is able to contact the Redis backend. That's it? No. Turns out some of the pod labels and names have also been hardcoded in the Docker images and have been updated (mostly to use more neutral terms). 4. Update the YAML file to better match [1]. We however can't update the 'redis-master' name because our v6 frontend image has it hardcoded. The v5 frontend image at [1] has 'redis-leader' as the name, but somehow not the v6. We want to use the v6 image because it is a lot bigger (cf. dffb450). 5. And finally, Bob's our uncle! 1 - https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook Fixes: #12994 Fixes: ae9e4be ("test: replace guestbook test docker image") Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
[ upstream commit e166ae0 ] Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
[ upstream commit 5d9139f ] Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com> Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit beb401b ] Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
[ upstream commit 06dbc52 ] Removes references to things like CoreOS and old etcd versions. Also added some further reading links for those who want to configure cilium on kops further. Signed-off-by: Ole Markus With <o.with@sportradar.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
pchaigno
force-pushed
the
pr/v1.7-backports-2020-09-03
branch
from
eeac54b
to
93141dd
Compare
|
test-backport-1.7 |
errordeveloper
approved these changes
Sep 4, 2020
|
test-backport-1.7 |
pchaigno
added
the
ready-to-merge
nathanjsweet
approved these changes
Sep 4, 2020
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.7 backports 2020-09-03
Once this PR is merged, you can update the PR labels via: