Fix readiness probe #2272
Merged
Fix readiness probe #2272
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
pebrc
reviewed
Dec 16, 2019
| # fail should be called as a last resort to help the user to understand why the probe failed | ||
| function fail { | ||
| timestamp=$(date --iso-8601=seconds) | ||
| echo "{\"timestamp\": \"${timestamp}\", \"message\": \"readiness probe failed\", "$1"}" | tee /proc/1/fd/1 |
There was a problem hiding this comment.
That's clever :-) But should it be /fd/2 for stderr?
Comment on lines
12
to
32
| var downwardApiVolume = corev1.Volume{ | ||
| Name: volume.DownwardApiVolumeName, | ||
| VolumeSource: corev1.VolumeSource{ | ||
| DownwardAPI: &corev1.DownwardAPIVolumeSource{ | ||
| Items: []corev1.DownwardAPIVolumeFile{ | ||
| { | ||
| Path: volume.LabelsFile, | ||
| FieldRef: &corev1.ObjectFieldSelector{ | ||
| FieldPath: "metadata.labels", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| var downwardApiVolumeMount = corev1.VolumeMount{ | ||
| Name: volume.DownwardApiVolumeName, | ||
| MountPath: volume.DownwardApiMountPath, | ||
| ReadOnly: true, | ||
| } |
There was a problem hiding this comment.
Nit: I feel like these don't need to be global variables (even though they're only package-private). Maybe they can be directly returned from the method calls of the DownwardApi object?
There was a problem hiding this comment.
The idea here is to avoid to recreate what must be a constant everytime a Pod spec is created. I understand that it may sound like a very tiny optimization though 😐
There was a problem hiding this comment.
👍 I don't feel strongly about it. Happy to leave it as is.
thbkrkr
reviewed
Dec 16, 2019
| fi | ||
|
|
||
| # get Elasticsearch version from the downward API | ||
| version=$(grep "elasticsearch.k8s.elastic.co/version" ${labels} | cut -d '=' -f 2) |
There was a problem hiding this comment.
Nit: could be safer to use the VersionLabelName constant:
pebrc
approved these changes
Dec 16, 2019
thbkrkr
approved these changes
Dec 16, 2019
mjmbischoff
pushed a commit
to mjmbischoff/cloud-on-k8s
that referenced
this pull request
Jan 13, 2020
* Mount annotations in the Pod * Redirect errors to stderr
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.
Fix #2248
This PR updates the readiness probe by: