Stop fetching ReplicaSets and ReplicationControllers #3014
Merged
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
rbruggem
force-pushed
the
stop-fetching-replicasets
branch
from
2e0e111 to
3e5f920
Compare
rade
approved these changes
Jan 3, 2018
probe/kubernetes/client.go
Outdated
| result.nodeStore = result.setupStore(c.CoreV1Client.RESTClient(), "nodes", &apiv1.Node{}, nil) | ||
| result.namespaceStore = result.setupStore(c.CoreV1Client.RESTClient(), "namespaces", &apiv1.Namespace{}, nil) | ||
|
|
||
| // We list deployments here to check if this version of kubernetes is >= 1.2. | ||
| // We would use NegotiateVersion, but Kubernetes 1.1 "supports" | ||
| // extensions/v1beta1, but not deployments, replicasets or daemonsets. | ||
| // extensions/v1beta1, but not deployments or daemonsets. | ||
| if _, err := c.Extensions().Deployments(metav1.NamespaceAll).List(metav1.ListOptions{}); err != nil { | ||
| log.Infof("Deployments, ReplicaSets and DaemonSets are not supported by this Kubernetes version: %v", err) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
probe/kubernetes/controls.go
Outdated
| @@ -83,7 +83,6 @@ func (r *Reporter) CaptureResource(f func(xfer.Request, string, string, string) | |||
| f func(string) (string, bool) | |||
| }{ | |||
| {report.Deployment, report.ParseDeploymentNodeID}, | |||
| {report.ReplicaSet, report.ParseReplicaSetNodeID}, | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
They are not reported back to the scope app.
rbruggem
force-pushed
the
stop-fetching-replicasets
branch
from
3e5f920 to
9f42e1c
Compare
rade
suggested changes
Jan 7, 2018
probe/kubernetes/controls.go
Outdated
| @@ -78,33 +78,21 @@ func (r *Reporter) CapturePod(f func(xfer.Request, string, string) xfer.Response | |||
| func (r *Reporter) CaptureResource(f func(xfer.Request, string, string, string) xfer.Response) func(xfer.Request) xfer.Response { | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
probe/kubernetes/controls.go
Outdated
| break | ||
| } | ||
| if u, ok := report.ParseDeploymentNodeID(req.NodeID); ok { | ||
| resource, uid = report.Deployment, u |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
probe/kubernetes/controls.go
Outdated
| return nil | ||
| }) | ||
| if deployment != nil { | ||
| return f(req, "deployment", deployment.Namespace(), deployment.Name()) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
rbruggem
force-pushed
the
stop-fetching-replicasets
branch
2 times, most recently
from
b14cb95 to
7f95e51
Compare
The function now only takes Deployments into account.
rbruggem
force-pushed
the
stop-fetching-replicasets
branch
from
7f95e51 to
50b182b
Compare
rade
approved these changes
Jan 14, 2018
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.
They are not reported back to the scope app.
Fixes #3010