This repository was archived by the owner on Aug 19, 2019. It is now read-only.
Fix container spec/status order mismatch.#47
Merged
igorpeshansky merged 2 commits intomasterfrom Jan 2, 2018
Merged
Conversation
…er, look up containers by name, rather than by index.
igorpeshansky
requested review from
bmoyles0117,
qingling128 and
supriyagarg
bmoyles0117
approved these changes
Dec 21, 2017
Contributor
bmoyles0117
left a comment
bmoyles0117
left a comment
There was a problem hiding this comment.
LGTM 🦑 Only one minor comment.
| result.emplace_back(GetLegacyResource(pod, name)); | ||
| result.emplace_back( | ||
| GetContainerMetadata(pod, i, associations->Clone(), collected_at)); | ||
| GetContainerMetadata(pod, container, container_spec, |
Contributor
There was a problem hiding this comment.
Can we use container_status instead of container?
qingling128
approved these changes
Dec 21, 2017
| result.emplace_back(GetLegacyResource(pod, name)); | ||
| result.emplace_back( | ||
| GetContainerMetadata(pod, i, associations->Clone(), collected_at)); | ||
| GetContainerMetadata(pod, container, container_spec, |
supriyagarg
reviewed
Dec 21, 2017
| @@ -89,12 +89,13 @@ class KubernetesReader { | |||
| const throw(json::Exception); | |||
| // Given a pod object and container index, return the container metadata. | |||
Contributor
There was a problem hiding this comment.
Please update the comment here. There is no more container index being passed in.
Contributor
Author
There was a problem hiding this comment.
Good catch. Done.
| const json::Object* container_spec, json::value associations, | ||
| Timestamp collected_at) const throw(json::Exception); | ||
| // Given a pod object and container index, return the legacy resource. | ||
| // The returned "metadata" field will be Metadata::IGNORED. |
| const std::string container_id = | ||
| container->Get<json::String>("containerID").substr( | ||
| docker_prefix_end); | ||
| const std::string container_id = docker_id.substr(docker_prefix_end); |
Contributor
There was a problem hiding this comment.
the container ID is not used anywhere.
Contributor
Author
There was a problem hiding this comment.
It's used in line 318 (hidden by the diff).
| {"status", json::object({ | ||
| {"version", json::string(kKubernetesApiVersion)}, | ||
| {"raw", container->Clone()}, | ||
| {"raw", container_status->Clone()}, |
Contributor
There was a problem hiding this comment.
why not add the spec to the "raw" metadata as well?
Contributor
There was a problem hiding this comment.
It is, the lines are right above hidden in the diff.
- Rename variable. - Update method comments.
igorpeshansky
commented
Dec 29, 2017
Contributor
Author
igorpeshansky
left a comment
igorpeshansky
left a comment
There was a problem hiding this comment.
Addressed feedback. PTAL.
| const std::string container_id = | ||
| container->Get<json::String>("containerID").substr( | ||
| docker_prefix_end); | ||
| const std::string container_id = docker_id.substr(docker_prefix_end); |
Contributor
Author
There was a problem hiding this comment.
It's used in line 318 (hidden by the diff).
| result.emplace_back(GetLegacyResource(pod, name)); | ||
| result.emplace_back( | ||
| GetContainerMetadata(pod, i, associations->Clone(), collected_at)); | ||
| GetContainerMetadata(pod, container, container_spec, |
| @@ -89,12 +89,13 @@ class KubernetesReader { | |||
| const throw(json::Exception); | |||
| // Given a pod object and container index, return the container metadata. | |||
Contributor
Author
There was a problem hiding this comment.
Good catch. Done.
| const json::Object* container_spec, json::value associations, | ||
| Timestamp collected_at) const throw(json::Exception); | ||
| // Given a pod object and container index, return the legacy resource. | ||
| // The returned "metadata" field will be Metadata::IGNORED. |
supriyagarg
approved these changes
Jan 2, 2018
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
No description provided.