Skip to content
This repository was archived by the owner on Aug 19, 2019. It is now read-only.

Guard access to containerStatuses by checking if the key exists. #79

Merged
bmoyles0117 merged 3 commits into from
Mar 15, 2018
Merged

Guard access to containerStatuses by checking if the key exists. #79

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e08305
Guard access to containerStatuses by checking if the key exists.
bmoyles0117 Mar 14, 2018
5a8deb5
Fix typo.
bmoyles0117 Mar 14, 2018
f5e5900
Address feedback.
bmoyles0117 Mar 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions src/kubernetes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,18 @@ KubernetesReader::GetPodAndContainerMetadata(
const json::Object* status = pod->Get<json::Object>("status");

const json::Array* container_specs = spec->Get<json::Array>("containers");
const json::Array* container_statuses =
status->Get<json::Array>("containerStatuses");

// Move the container statuses into a map from name to status.
std::map<std::string, const json::Object*> container_status_by_name;
for (const json::value& c_status : *container_statuses) {
const json::Object* container_status = c_status->As<json::Object>();
const std::string name = container_status->Get<json::String>("name");
container_status_by_name.emplace(name, container_status);
if (status->Has("containerStatuses")) {
const json::Array* container_statuses =
status->Get<json::Array>("containerStatuses");

for (const json::value& c_status : *container_statuses) {
const json::Object* container_status = c_status->As<json::Object>();
const std::string name = container_status->Get<json::String>("name");
container_status_by_name.emplace(name, container_status);
}
}

for (const json::value& c_spec : *container_specs) {
Expand Down Expand Up @@ -507,14 +510,19 @@ std::vector<MetadataUpdater::ResourceMetadata>
const json::Object* status = pod->Get<json::Object>("status");

const json::Array* container_specs = spec->Get<json::Array>("containers");
const json::Array* container_statuses =
status->Get<json::Array>("containerStatuses");
if (container_specs->size() != container_statuses->size()) {
LOG(ERROR) << "Container specs and statuses arrays "
<< "have different sizes: "
<< container_specs->size() << " vs "
<< container_statuses->size() << " for pod "
<< pod_id << "(" << pod_name << ")";
if (status->Has("containerStatuses")) {
const json::Array* container_statuses =
status->Get<json::Array>("containerStatuses");
if (container_specs->size() != container_statuses->size()) {
LOG(ERROR) << "Container specs and statuses arrays "
<< "have different sizes: "
<< container_specs->size() << " vs "
<< container_statuses->size() << " for pod "
<< pod_id << "(" << pod_name << ")";
}
} else {
LOG(INFO) << "Container statuses do not exist in status for pod "
<< pod_id << "(" << pod_name << ")";
}

// TODO: find is_deleted.
Expand Down