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

Retrieve cluster location from metadata attributes, rather than using the instance zone. #57

Merged
igorpeshansky merged 4 commits into from
Feb 26, 2018
Merged

Retrieve cluster location from metadata attributes, rather than using the instance zone. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2340968
Retrieve cluster location from kube-env, rather than using the instan…
igorpeshansky Feb 23, 2018
752ab62
Use the cluster-location instance attribute instead.
igorpeshansky Feb 24, 2018
8bf0238
Remove unneeded header.
igorpeshansky Feb 24, 2018
f30ec5c
Fall back on kube-env if the newer attribute is not available.
igorpeshansky Feb 25, 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
5 changes: 5 additions & 0 deletions src/configuration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ constexpr const char kKubernetesDefaultEndpointHost[] =
"https://kubernetes.default.svc";
constexpr const char kKubernetesDefaultPodLabelSelector[] = "";
constexpr const char kKubernetesDefaultClusterName[] = "";
constexpr const char kKubernetesDefaultClusterLocation[] = "";
constexpr const char kKubernetesDefaultNodeName[] = "";
constexpr const bool kKubernetesDefaultUseWatch = true;
constexpr const char kDefaultInstanceId[] = "";
Expand Down Expand Up @@ -87,6 +88,7 @@ MetadataAgentConfiguration::MetadataAgentConfiguration()
kubernetes_endpoint_host_(kKubernetesDefaultEndpointHost),
kubernetes_pod_label_selector_(kKubernetesDefaultPodLabelSelector),
kubernetes_cluster_name_(kKubernetesDefaultClusterName),
kubernetes_cluster_location_(kKubernetesDefaultClusterLocation),
kubernetes_node_name_(kKubernetesDefaultNodeName),
kubernetes_use_watch_(kKubernetesDefaultUseWatch),
instance_id_(kDefaultInstanceId),
Expand Down Expand Up @@ -183,6 +185,9 @@ void MetadataAgentConfiguration::ParseConfigFile(const std::string& filename) {
kubernetes_cluster_name_ =
config["KubernetesClusterName"].as<std::string>(
kKubernetesDefaultClusterName);
kubernetes_cluster_location_ =
config["KubernetesClusterLocation"].as<std::string>(
kKubernetesDefaultClusterLocation);
kubernetes_node_name_ =
config["KubernetesNodeName"].as<std::string>(kKubernetesDefaultNodeName);
kubernetes_use_watch_ =
Expand Down
5 changes: 5 additions & 0 deletions src/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ class MetadataAgentConfiguration {
std::lock_guard<std::mutex> lock(mutex_);
return kubernetes_cluster_name_;
}
const std::string& KubernetesClusterLocation() const {
std::lock_guard<std::mutex> lock(mutex_);
return kubernetes_cluster_location_;
}
const std::string& KubernetesNodeName() const {
std::lock_guard<std::mutex> lock(mutex_);
return kubernetes_node_name_;
Expand Down Expand Up @@ -154,6 +158,7 @@ class MetadataAgentConfiguration {
std::string kubernetes_endpoint_host_;
std::string kubernetes_pod_label_selector_;
std::string kubernetes_cluster_name_;
std::string kubernetes_cluster_location_;
std::string kubernetes_node_name_;
bool kubernetes_use_watch_;
std::string instance_id_;
Expand Down
31 changes: 31 additions & 0 deletions src/environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <boost/network/protocol/http/client.hpp>
#include <fstream>
#include <sstream>
Copy link
Contributor

@bmoyles0117 bmoyles0117 Feb 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naive c++ question, where is this actually being used? Is this in the std namespace when you use std::istringstream in(kube_env);?

Copy link
Contributor Author

@igorpeshansky igorpeshansky Feb 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this is the header for std::istringstream.

Copy link
Contributor

@supriyagarg supriyagarg Feb 24, 2018 •
edited by igorpeshansky
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this import now that std::istringstream is no longer used.

Copy link
Contributor Author

@igorpeshansky igorpeshansky Feb 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Done.


#include "format.h"
#include "logging.h"
Expand Down Expand Up @@ -205,6 +206,36 @@ const std::string& Environment::KubernetesClusterName() const {
return kubernetes_cluster_name_;
}

const std::string& Environment::KubernetesClusterLocation() const {
std::lock_guard<std::mutex> lock(mutex_);
if (kubernetes_cluster_location_.empty()) {
if (!config_.KubernetesClusterLocation().empty()) {
kubernetes_cluster_location_ = config_.KubernetesClusterLocation();
} else {
// Query the metadata server.
kubernetes_cluster_location_ =
GetMetadataString("instance/attributes/cluster-location");
// Fall back on kube-env for older clusters.
if (kubernetes_cluster_location_.empty()) {
// Get the kube-env.
const std::string kube_env =
GetMetadataString("instance/attributes/kube-env");
// kube-env is a list of NAME: VALUE pairs, one per line, unsorted.
// The actual location is in the ZONE variable.
// TODO: Refactor this into GetKubeEnv("ZONE") in kubernetes.cc.
std::istringstream in(kube_env);
for (std::string line; std::getline(in, line); ) {
if (line.find("ZONE: ") == 0) {
kubernetes_cluster_location_ = line.substr(line.find(':') + 2);
break;
}
}
}
}
}
return kubernetes_cluster_location_;
}

const std::string& Environment::CredentialsClientEmail() const {
std::lock_guard<std::mutex> lock(mutex_);
ReadApplicationDefaultCredentials();
Expand Down
2 changes: 2 additions & 0 deletions src/environment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class Environment {
const std::string& InstanceId() const;
const std::string& InstanceZone() const;
const std::string& KubernetesClusterName() const;
const std::string& KubernetesClusterLocation() const;
const std::string& CredentialsClientEmail() const;
const std::string& CredentialsPrivateKey() const;

Expand All @@ -54,6 +55,7 @@ class Environment {
mutable std::string instance_id_;
mutable std::string instance_resource_type_;
mutable std::string kubernetes_cluster_name_;
mutable std::string kubernetes_cluster_location_;
mutable std::string client_email_;
mutable std::string private_key_;
mutable bool application_default_credentials_read_;
Expand Down
12 changes: 6 additions & 6 deletions src/kubernetes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ KubernetesReader::KubernetesReader(const MetadataAgentConfiguration& config)

MetadataUpdater::ResourceMetadata KubernetesReader::GetNodeMetadata(
json::value raw_node, Timestamp collected_at) const throw(json::Exception) {
const std::string zone = environment_.InstanceZone();
const std::string cluster_name = environment_.KubernetesClusterName();
const std::string location = environment_.KubernetesClusterLocation();

const json::Object* node = raw_node->As<json::Object>();
const json::Object* metadata = node->Get<json::Object>("metadata");
Expand All @@ -99,7 +99,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetNodeMetadata(
const MonitoredResource k8s_node("k8s_node", {
{"cluster_name", cluster_name},
{"node_name", node_name},
{"location", zone},
{"location", location},
});

json::value instance_resource =
Expand Down Expand Up @@ -185,8 +185,8 @@ json::value KubernetesReader::ComputePodAssociations(const json::Object* pod)
MetadataUpdater::ResourceMetadata KubernetesReader::GetPodMetadata(
json::value raw_pod, json::value associations, Timestamp collected_at) const
throw(json::Exception) {
const std::string zone = environment_.InstanceZone();
const std::string cluster_name = environment_.KubernetesClusterName();
const std::string location = environment_.KubernetesClusterLocation();

const json::Object* pod = raw_pod->As<json::Object>();

Expand All @@ -206,7 +206,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetPodMetadata(
{"cluster_name", cluster_name},
{"namespace_name", namespace_name},
{"pod_name", pod_name},
{"location", zone},
{"location", location},
});

// TODO: find is_deleted.
Expand Down Expand Up @@ -249,8 +249,8 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetContainerMetadata(
const json::Object* pod, const json::Object* container_spec,
const json::Object* container_status, json::value associations,
Timestamp collected_at) const throw(json::Exception) {
const std::string zone = environment_.InstanceZone();
const std::string cluster_name = environment_.KubernetesClusterName();
const std::string location = environment_.KubernetesClusterLocation();

const json::Object* metadata = pod->Get<json::Object>("metadata");
const std::string namespace_name = metadata->Get<json::String>("namespace");
Expand All @@ -276,7 +276,7 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetContainerMetadata(
{"namespace_name", namespace_name},
{"pod_name", pod_name},
{"container_name", container_name},
{"location", zone},
{"location", location},
});

std::unique_ptr<json::Object> blobs(new json::Object({
Expand Down