Skip to content
This repository was archived by the owner on May 18, 2020. It is now read-only.

Commit e49ee50

Browse files
zdicesarejpkrohling
authored andcommitted
Remove executable as an argument to containers (#87)
* Remove executable as an argument to containers Jaeger containers were changed to no longer require the path to the executable as an argument to docker run, so remove all instances of executable path Signed-off-by: Zachary DiCesare <zachary.v.dicesare@gmail.com> * Bump all images to 1.6.0 Signed-off-by: Zachary DiCesare <zachary.v.dicesare@gmail.com> * Move container arguments to args Needed now that Dockerfiles use ENTRYPOINT Signed-off-by: Zachary DiCesare <zachary.v.dicesare@gmail.com> * Stop specifiying static file location These are now packaged in the binary Signed-off-by: Zachary DiCesare <zachary.v.dicesare@gmail.com>
1 parent e19d39b commit e49ee50

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@ Assuming that your application is named `myapp` and the image is for it is `myna
122122
protocol: UDP
123123
- containerPort: 5778
124124
protocol: TCP
125-
command:
126-
- "/go/bin/agent-linux"
127-
- "--collector.host-port=jaeger-collector.jaeger-infra.svc:14267"
125+
args: ["--collector.host-port=jaeger-collector.jaeger-infra.svc:14267"]
128126
```
129127

130128
The Jaeger Agent will then be available to your application at `localhost:5775`/`localhost:6831`/`localhost:6832`/`localhost:5778`.

jaeger-production-template.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ items:
3333
jaeger-infra: collector-pod
3434
spec:
3535
containers:
36-
- image: jaegertracing/jaeger-collector:1.5.0
36+
- image: jaegertracing/jaeger-collector:1.6.0
3737
name: jaeger-collector
38-
command:
39-
- "/go/bin/collector-linux"
40-
- "--config-file=/conf/collector.yaml"
38+
args: ["--config-file=/conf/collector.yaml"]
4139
ports:
4240
- containerPort: 14267
4341
protocol: TCP
@@ -119,11 +117,9 @@ items:
119117
jaeger-infra: query-pod
120118
spec:
121119
containers:
122-
- image: jaegertracing/jaeger-query:1.5.0
120+
- image: jaegertracing/jaeger-query:1.6.0
123121
name: jaeger-query
124-
command:
125-
- "/go/bin/query-linux"
126-
- "--config-file=/conf/query.yaml"
122+
args: ["--config-file=/conf/query.yaml"]
127123
ports:
128124
- containerPort: 16686
129125
protocol: TCP
@@ -179,10 +175,8 @@ items:
179175
spec:
180176
containers:
181177
- name: agent-instance
182-
image: jaegertracing/jaeger-agent:1.5.0
183-
command:
184-
- "/go/bin/agent-linux"
185-
- "--config-file=/conf/agent.yaml"
178+
image: jaegertracing/jaeger-agent:1.6.0
179+
args: ["--config-file=/conf/agent.yaml"]
186180
volumeMounts:
187181
- name: jaeger-configuration-volume
188182
mountPath: /conf

production-elasticsearch/configmap.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ data:
3434
server-urls: http://elasticsearch:9200
3535
username: elastic
3636
password: changeme
37-
query:
38-
static-files: /go/jaeger-ui/
3937
agent: |
4038
collector:
4139
host-port: "jaeger-collector:14267"

production/cassandra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ items:
120120
spec:
121121
containers:
122122
- name: jaeger-cassandra-schema
123-
image: jaegertracing/jaeger-cassandra-schema:1.5.0
123+
image: jaegertracing/jaeger-cassandra-schema:1.6.0
124124
env:
125125
- name: MODE
126126
value: "prod"

production/configmap.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ data:
3232
cassandra:
3333
servers: cassandra
3434
keyspace: jaeger_v1_dc1
35-
query:
36-
static-files: /go/jaeger-ui/
3735
agent: |
3836
collector:
3937
host-port: "jaeger-collector:14267"

0 commit comments

Comments
 (0)