Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Kubernetes objects to be reported just once in a cluster #3274

Merged
merged 8 commits into from
Oct 19, 2018
Merged

Enable Kubernetes objects to be reported just once in a cluster #3274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd21a55
Refactor: implement kubernetes tagger in separate struct
bboreham Jul 20, 2018
88049b0
Add option for Kubernetes tagging when kubernetes probing disabled
bboreham Jul 20, 2018
38ea862
Check if dockerBridge is nonblank before using it
bboreham Jul 20, 2018
98d52bd
Allow kubelet port to be disabled
bboreham Jul 22, 2018
1279a02
Stop tagging pods with host ID
bboreham Jul 22, 2018
78eaf93
Make flag names easier to understand
bboreham Oct 11, 2018
fb96fe0
Turn everything else off in Kubernetes cluster probe
bboreham Oct 12, 2018
0c394e6
Fix pod host propagation
bboreham Oct 12, 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
Prev Previous commit
Next Next commit
Allow kubelet port to be disabled
  • Loading branch information
@bboreham
bboreham committed Oct 11, 2018
commit 98d52bd48006d8b2b9df21896dd772ec4a98f0d2
2 changes: 1 addition & 1 deletion probe/kubernetes/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ func (r *Reporter) podTopology(services []Service, deployments []Deployment, dae
}

var localPodUIDs map[string]struct{}
if r.nodeName == "" {
if r.nodeName == "" && r.kubeletPort != 0 {
// We don't know the node name: fall back to obtaining the local pods from kubelet
var err error
localPodUIDs, err = GetLocalPodUIDs(fmt.Sprintf("127.0.0.1:%d", r.kubeletPort))

This comment was marked as abuse.

Sign in to view

Expand Down
2 changes: 1 addition & 1 deletion prog/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ func setupFlags(flags *flags) {
flag.StringVar(&flags.probe.kubernetesClientConfig.User, "probe.kubernetes.user", "", "The name of the kubeconfig user to use")
flag.StringVar(&flags.probe.kubernetesClientConfig.Username, "probe.kubernetes.username", "", "Username for basic authentication to the API server")
flag.StringVar(&flags.probe.kubernetesNodeName, "probe.kubernetes.node-name", "", "Name of this node, for filtering pods")
flag.UintVar(&flags.probe.kubernetesKubeletPort, "probe.kubernetes.kubelet-port", 10255, "Node-local TCP port for contacting kubelet")
flag.UintVar(&flags.probe.kubernetesKubeletPort, "probe.kubernetes.kubelet-port", 10255, "Node-local TCP port for contacting kubelet (zero to disable)")

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view


// AWS ECS
flag.BoolVar(&flags.probe.ecsEnabled, "probe.ecs", false, "Collect ecs-related attributes for containers on this node")
Expand Down