Skip to content

Commit a3a7d07

Browse files
authored
Merge pull request #2 from scottrigby/jaeger-readme
Update Readme for jaeger chart
2 parents ed8fbe0 + 1ca9ae4 commit a3a7d07

5 files changed

Lines changed: 34 additions & 15 deletions

File tree

.github/workflows/release.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ jobs:
1414

1515
- name: Configure Git
1616
run: |
17-
git config user.name "GitHub Actions"
18-
git config user.email noreply@github.com
17+
git config user.name "$GITHUB_ACTOR"
18+
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
1919
2020
# See https://github.com/helm/chart-releaser-action/issues/6
21-
- name: Initialize Helm
22-
run: helm init --client-only
21+
# For now, install the same version of Tiller as the chart-testing Helm
22+
# client version: v2.15.2.
23+
- name: Install Helm
24+
run: |
25+
curl -sSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get
26+
chmod 700 get_helm.sh
27+
DESIRED_VERSION=v2.15.2 ./get_helm.sh
28+
helm init --client-only
2329
2430
- name: Add dependency chart repos
2531
run: |

charts/jaeger/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: 1.15.1
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
5-
version: 0.17.3
5+
version: 0.17.4
66
keywords:
77
- jaeger
88
- opentracing

charts/jaeger/README.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Jaeger
22

3-
[Jaeger](http://jaeger.readthedocs.io/en/latest/) is a distributed tracing system.
3+
[Jaeger](https://www.jaegertracing.io/) is a distributed tracing system.
44

55
## Introduction
66

@@ -68,18 +68,24 @@ data:
6868

6969
## Installing the Chart
7070

71+
Add the Jaeger Tracing Helm repository:
72+
73+
```console
74+
$ helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
75+
```
76+
7177
To install the chart with the release name `myrel`, run the following command:
7278

7379
```bash
74-
$ helm install incubator/jaeger --name myrel
80+
$ helm install jaegertracing/jaeger --name myrel
7581
```
7682

7783
After a few minutes, you should see a 3 node Cassandra instance, a Jaeger DaemonSet, a Jaeger Collector, and a Jaeger Query (UI) pod deployed into your Kubernetes cluster.
7884

7985
IMPORTANT NOTE: For testing purposes, the footprint for Cassandra can be reduced significantly in the event resources become constrained (such as running on your local laptop or in a Vagrant environment). You can override the resources required run running this command:
8086

8187
```bash
82-
helm install incubator/jaeger --name myrel --set cassandra.config.max_heap_size=1024M --set cassandra.config.heap_new_size=256M --set cassandra.resources.requests.memory=2048Mi --set cassandra.resources.requests.cpu=0.4 --set cassandra.resources.limits.memory=2048Mi --set cassandra.resources.limits.cpu=0.4
88+
helm install jaegertracing/jaeger --name myrel --set cassandra.config.max_heap_size=1024M --set cassandra.config.heap_new_size=256M --set cassandra.resources.requests.memory=2048Mi --set cassandra.resources.requests.cpu=0.4 --set cassandra.resources.limits.memory=2048Mi --set cassandra.resources.limits.cpu=0.4
8389
```
8490

8591
> **Tip**: List all releases using `helm list`
@@ -89,7 +95,7 @@ helm install incubator/jaeger --name myrel --set cassandra.config.max_heap_size=
8995
If you already have an existing running Cassandra cluster, you can configure the chart as follows to use it as your backing store (make sure you replace `<HOST>`, `<PORT>`, etc with your values):
9096

9197
```bash
92-
helm install incubator/jaeger --name myrel --set provisionDataStore.cassandra=false --set storage.cassandra.host=<HOST> --set storage.cassandra.port=<PORT> --set storage.cassandra.user=<USER> --set storage.cassandra.password=<PASSWORD>
98+
helm install jaegertracing/jaeger --name myrel --set provisionDataStore.cassandra=false --set storage.cassandra.host=<HOST> --set storage.cassandra.port=<PORT> --set storage.cassandra.user=<USER> --set storage.cassandra.password=<PASSWORD>
9399
```
94100

95101
> **Tip**: It is highly encouraged to run the Cassandra cluster with storage persistence.
@@ -146,15 +152,15 @@ data:
146152

147153
```bash
148154
kubectl apply -f jaeger-tls-cassandra-secret.yaml
149-
helm install incubator/jaeger --name myrel --values values.yaml
155+
helm install jaegertracing/jaeger --name myrel --values values.yaml
150156
```
151157

152158
## Installing the Chart using a New ElasticSearch Cluster
153159

154160
To install the chart with the release name `myrel` using a new ElasticSearch cluster instead of Cassandra (default), run the following command:
155161

156162
```bash
157-
$ helm install incubator/jaeger --name myrel --set provisionDataStore.cassandra=false --set provisionDataStore.elasticsearch=true --set storage.type=elasticsearch
163+
$ helm install jaegertracing/jaeger --name myrel --set provisionDataStore.cassandra=false --set provisionDataStore.elasticsearch=true --set storage.type=elasticsearch
158164
```
159165

160166
After a few minutes, you should see 2 ElasticSearch client nodes, 2 ElasticSearch data nodes, 3 ElasticSearch master nodes, a Jaeger DaemonSet, a Jaeger Collector, and a Jaeger Query (UI) pod deployed into your Kubernetes cluster.
@@ -166,7 +172,7 @@ After a few minutes, you should see 2 ElasticSearch client nodes, 2 ElasticSearc
166172
If you already have an existing running ElasticSearch cluster, you can configure the chart as follows to use it as your backing store:
167173

168174
```bash
169-
helm install incubator/jaeger --name myrel --set provisionDataStore.cassandra=false --set provisionDataStore.elasticsearch=false --set storage.type=elasticsearch --set storage.elasticsearch.host=<HOST> --set storage.elasticsearch.port=<PORT> --set storage.elasticsearch.user=<USER> --set storage.elasticsearch.password=<password>
175+
helm install jaegertracing/jaeger --name myrel --set provisionDataStore.cassandra=false --set provisionDataStore.elasticsearch=false --set storage.type=elasticsearch --set storage.elasticsearch.host=<HOST> --set storage.elasticsearch.port=<PORT> --set storage.elasticsearch.user=<USER> --set storage.elasticsearch.password=<password>
170176
```
171177

172178
> **Tip**: It is highly encouraged to run the ElasticSearch cluster with storage persistence.
@@ -226,7 +232,7 @@ data:
226232

227233
```bash
228234
kubectl apply -f jaeger-tls-cfgmap.yaml
229-
helm install incubator/jaeger --name myrel --values jaeger-values.yaml
235+
helm install jaegertracing/jaeger --name myrel --values jaeger-values.yaml
230236
```
231237

232238
## Uninstalling the Chart
@@ -363,7 +369,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
363369
```bash
364370
$ helm install --name myrel \
365371
--set cassandra.config.rack_name=rack2 \
366-
incubator/jaeger
372+
jaegertracing/jaeger
367373
```
368374

369375
Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart.

charts/jaeger/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ schema:
9292
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
9393
podLabels: {}
9494
## Deadline for cassandra schema creation job
95-
activeDeadlineSeconds: 120
95+
activeDeadlineSeconds: 300
9696
# traceTtl: 172800
9797
# dependenciesTtl: 0
9898

ct.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# See https://github.com/helm/chart-testing#configuration
2+
remote: origin
3+
chart-dirs:
4+
- charts
5+
chart-repos:
6+
- incubator=https://kubernetes-charts-incubator.storage.googleapis.com
7+
helm-extra-args: --timeout=500

0 commit comments

Comments
 (0)