diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index 13203d1149..893d7a6eac 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.13.1 description: A Jaeger Helm chart for Kubernetes name: jaeger -version: 0.13.0 +version: 0.13.1 keywords: - jaeger - opentracing diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md index da9472ca16..ddbad18aee 100644 --- a/incubator/jaeger/README.md +++ b/incubator/jaeger/README.md @@ -249,6 +249,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `schema.image` | Image to setup cassandra schema | `jaegertracing/jaeger-cassandra-schema` | | `schema.mode` | Schema mode (prod or test) | `prod` | | `schema.pullPolicy` | Schema image pullPolicy | `IfNotPresent` | +| `schema.activeDeadlineSeconds` | Deadline in seconds for cassandra schema creation job to complete | `120` | | `serviceAccounts.agent.create` | Create service account | `true` | | `serviceAccounts.agent.name` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | `` | | `serviceAccounts.cassandraSchema.create` | Create service account | `true` | diff --git a/incubator/jaeger/templates/cassandra-schema-job.yaml b/incubator/jaeger/templates/cassandra-schema-job.yaml index add50983ed..89e3b8ddb0 100644 --- a/incubator/jaeger/templates/cassandra-schema-job.yaml +++ b/incubator/jaeger/templates/cassandra-schema-job.yaml @@ -15,7 +15,7 @@ metadata: {{ toYaml .Values.schema.annotations | indent 4 }} {{- end }} spec: - activeDeadlineSeconds: 120 + activeDeadlineSeconds: {{ .Values.schema.activeDeadlineSeconds }} template: metadata: name: {{ include "jaeger.fullname" . }}-cassandra-schema diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index 44dc35e5f2..7e95eacf95 100644 --- a/incubator/jaeger/values.yaml +++ b/incubator/jaeger/values.yaml @@ -88,6 +88,8 @@ schema: ## Additional pod labels ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ podLabels: {} + # Deadline for cassandra schema creation job + activeDeadlineSeconds: 120 # Begin: Override values on the Elasticsearch subchart to customize for Jaeger elasticsearch: