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.

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

Sorted the container arguments inside deployments #337

Merged

Conversation

jpkrohling
Copy link
Contributor

Fixes #334

Signed-off-by: Juraci Paixão Kröhling [email protected]

@jpkrohling jpkrohling requested a review from objectiser March 20, 2019 10:41
@jpkrohling
Copy link
Contributor Author

This change is Reviewable

@jpkrohling
Copy link
Contributor Author

With this PR, the collector deployment looks stable:

$ kubectl get pods
NAME                                  READY     STATUS    RESTARTS   AGE
elasticsearch-0                       1/1       Running   0          48m
jaegerqe-collector-58bd8db845-94x9b   1/1       Running   0          4m
jaegerqe-collector-58bd8db845-9px2r   1/1       Running   0          4m
jaegerqe-collector-58bd8db845-gl9dl   1/1       Running   0          4m
jaegerqe-collector-58bd8db845-jrn67   1/1       Running   0          4m
jaegerqe-query-7b9d5975bf-v4cr9       2/2       Running   0          4m

$ kubectl get deployments -o yaml jaegerqe-collector | grep deployment.kubernetes.io/revision
    deployment.kubernetes.io/revision: "1"

@jpkrohling jpkrohling changed the title Sorted the container arguments inside deployments WIP - Sorted the container arguments inside deployments Mar 20, 2019
@objectiser
Copy link
Contributor

@jpkrohling Looks like it has affected some other tests

@objectiser
Copy link
Contributor

@jpkrohling Did you test on openshift aswell? Or was the instability also on k8s?

@jpkrohling jpkrohling force-pushed the 334-Sort-deployment-arguments branch from 30226cb to 16fa0d3 Compare March 20, 2019 11:02
@jpkrohling
Copy link
Contributor Author

I tested this on OpenShift only, I did not notice any instability in Kubernetes. I just amended the commit, to include the containers in the inject package.

@codecov
Copy link

codecov bot commented Mar 20, 2019

Codecov Report

Merging #337 into master will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #337      +/-   ##
==========================================
+ Coverage   89.71%   89.73%   +0.02%     
==========================================
  Files          64       64              
  Lines        2985     2991       +6     
==========================================
+ Hits         2678     2684       +6     
  Misses        207      207              
  Partials      100      100
Impacted Files Coverage Δ
pkg/deployment/query.go 100% <100%> (ø) ⬆️
pkg/inject/sidecar.go 100% <100%> (ø) ⬆️
pkg/deployment/all-in-one.go 100% <100%> (ø) ⬆️
pkg/inject/oauth-proxy.go 100% <100%> (ø) ⬆️
pkg/deployment/collector.go 100% <100%> (ø) ⬆️
pkg/deployment/ingester.go 100% <100%> (ø) ⬆️
pkg/deployment/agent.go 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1e8337...16fa0d3. Read the comment docs.

@jpkrohling jpkrohling changed the title WIP - Sorted the container arguments inside deployments Sorted the container arguments inside deployments Mar 20, 2019
"--tls-key=/etc/tls/private/tls.key",
"--upstream=http://localhost:16686",
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Would it be better to add the sort, so not relying on users to read the comment?

Copy link
Contributor

Choose a reason for hiding this comment

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

Although I've just seen the test, so that should pick it up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thought about it, but as this is a static list, it might be better to enforce via test and spare a couple of CPU cycles :-)

@jpkrohling jpkrohling merged commit ed25b64 into jaegertracing:master Mar 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants