From 78929bb7dd0ed2bcfaee4cf284352125991f2a98 Mon Sep 17 00:00:00 2001 From: Gary Brown Date: Tue, 22 May 2018 22:57:25 +0100 Subject: [PATCH] =?UTF-8?q?Update=20jaeger=20version=20to=201.4.1,=20but?= =?UTF-8?q?=20use=20a=20single=20value=20for=20all=204=20imag=E2=80=A6=20(?= =?UTF-8?q?#5645)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update jaeger version to 1.4.1, but use a single value for all 4 images as they all need to use a single consistent version * Update chart version * Update chart version to 0.5.0 --- incubator/jaeger/Chart.yaml | 6 +++--- incubator/jaeger/README.md | 5 +---- incubator/jaeger/templates/agent-ds.yaml | 2 +- incubator/jaeger/templates/cassandra-schema-job.yaml | 2 +- incubator/jaeger/templates/collector-deploy.yaml | 2 +- incubator/jaeger/templates/query-deploy.yaml | 2 +- incubator/jaeger/values.yaml | 6 ++---- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml index 44cf5ceca9..6059205a81 100644 --- a/incubator/jaeger/Chart.yaml +++ b/incubator/jaeger/Chart.yaml @@ -1,14 +1,14 @@ apiVersion: v1 -appVersion: 1.2.0 +appVersion: 1.4.1 description: A Jaeger Helm chart for Kubernetes name: jaeger -version: 0.4.1 +version: 0.5.0 keywords: - jaeger - opentracing - tracing - instrumentation -home: https://github.com/uber/jaeger +home: https://jaegertracing.io icon: https://camo.githubusercontent.com/afa87494e0753b4b1f5719a2f35aa5263859dffb/687474703a2f2f6a61656765722e72656164746865646f63732e696f2f656e2f6c61746573742f696d616765732f6a61656765722d766563746f722e737667 sources: - https://hub.docker.com/u/jaegertracing/ diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md index 0d1b3dd4be..b10b4393ed 100644 --- a/incubator/jaeger/README.md +++ b/incubator/jaeger/README.md @@ -144,7 +144,6 @@ The following table lists the configurable parameters of the Jaeger chart and th | `agent.image` | Image for Jaeger Agent | jaegertracing/jaeger-agent | | `agent.pullPolicy` | Agent image pullPolicy | IfNotPresent | | `agent.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` | -| `agent.tag` | Image tag/version | 0.6 | | `agent.service.annotations` | Annotations for Agent SVC | nil | | `agent.service.binaryPort` | jaeger.thrift over binary thrift | 6832 | | `agent.service.compactPort` | jaeger.thrift over compact thrift | 6831 | @@ -169,7 +168,6 @@ The following table lists the configurable parameters of the Jaeger chart and th | `collector.service.tchannelPort` | Jaeger Agent port for thrift | 14267 | | `collector.service.type` | Service type | ClusterIP | | `collector.service.zipkinPort` | Zipkin port for JSON/thrift HTTP | 9411 | -| `collector.tag` | Image tag/version | 0.6 | | `elasticsearch.cluster.name` | Elasticsearch cluster name | "tracing" | | `elasticsearch.data.persistence.enabled` | To enable storage persistence | false (Highly recommended to enable) | | `elasticsearch.image.tag` | Elasticsearch image tag | "5.4" | @@ -188,12 +186,10 @@ The following table lists the configurable parameters of the Jaeger chart and th | `query.service.queryPort` | External accessible port | 80 | | `query.service.targetPort` | Internal Query UI port | 16686 | | `query.service.type` | Service type | ClusterIP | -| `query.tag` | Image tag/version | 0.6 | | `schema.annotations` | Annotations for the schema job | nil | | `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.tag` | Image tag/version | 0.6 | | `spark.enabled` | Enables the dependencies job | false | | `spark.image` | Image for the dependencies job | jaegertracing/spark-dependencies | | `spark.pullPolicy` | Image pull policy of the deps image | Always | @@ -212,6 +208,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `storage.elasticsearch.user` | Provisioned elasticsearch user | elastic | | `storage.elasticsearch.nodesWanOnly` | Only access specified es host | false | | `storage.type` | Storage type (ES or Cassandra) | cassandra | +| `tag` | Image tag/version | 1.4.1 | For more information about some of the tunable parameters that Cassandra provides, please visit the helm chart for [cassandra](https://github.com/kubernetes/charts/tree/master/incubator/cassandra) and the official [website](http://cassandra.apache.org/) at apache.org. diff --git a/incubator/jaeger/templates/agent-ds.yaml b/incubator/jaeger/templates/agent-ds.yaml index b719c4fc4b..ad51659e8d 100644 --- a/incubator/jaeger/templates/agent-ds.yaml +++ b/incubator/jaeger/templates/agent-ds.yaml @@ -34,7 +34,7 @@ spec: {{ toYaml .Values.agent.nodeSelector | indent 8 }} containers: - name: {{ template "jaeger.agent.name" . }} - image: {{ .Values.agent.image }}:{{ .Values.agent.tag }} + image: {{ .Values.agent.image }}:{{ .Values.tag }} imagePullPolicy: {{ .Values.agent.pullPolicy }} env: - name: COLLECTOR_HOST_PORT diff --git a/incubator/jaeger/templates/cassandra-schema-job.yaml b/incubator/jaeger/templates/cassandra-schema-job.yaml index 20bb3aa9bf..8f2d8afb77 100644 --- a/incubator/jaeger/templates/cassandra-schema-job.yaml +++ b/incubator/jaeger/templates/cassandra-schema-job.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: {{ template "jaeger.fullname" . }}-cassandra-schema - image: {{ .Values.schema.image }}:{{ .Values.schema.tag }} + image: {{ .Values.schema.image }}:{{ .Values.tag }} imagePullPolicy: {{ .Values.schema.pullPolicy }} env: - name: CQLSH_HOST diff --git a/incubator/jaeger/templates/collector-deploy.yaml b/incubator/jaeger/templates/collector-deploy.yaml index 82674986aa..34d0f7be3d 100644 --- a/incubator/jaeger/templates/collector-deploy.yaml +++ b/incubator/jaeger/templates/collector-deploy.yaml @@ -33,7 +33,7 @@ spec: {{ toYaml .Values.collector.nodeSelector | indent 8 }} containers: - name: {{ template "jaeger.collector.name" . }} - image: {{ .Values.collector.image }}:{{ .Values.collector.tag }} + image: {{ .Values.collector.image }}:{{ .Values.tag }} imagePullPolicy: {{ .Values.collector.pullPolicy }} env: - name: SPAN_STORAGE_TYPE diff --git a/incubator/jaeger/templates/query-deploy.yaml b/incubator/jaeger/templates/query-deploy.yaml index c97a45b6b4..a3b7d1fd97 100644 --- a/incubator/jaeger/templates/query-deploy.yaml +++ b/incubator/jaeger/templates/query-deploy.yaml @@ -33,7 +33,7 @@ spec: {{ toYaml .Values.query.nodeSelector | indent 8 }} containers: - name: {{ template "jaeger.query.name" . }} - image: {{ .Values.query.image }}:{{ .Values.query.tag }} + image: {{ .Values.query.image }}:{{ .Values.tag }} imagePullPolicy: {{ .Values.query.pullPolicy }} env: - name: SPAN_STORAGE_TYPE diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml index a58d277b0a..56af1cb701 100644 --- a/incubator/jaeger/values.yaml +++ b/incubator/jaeger/values.yaml @@ -6,6 +6,8 @@ provisionDataStore: cassandra: true elasticsearch: false +tag: 1.4.1 + storage: # allowed values (cassandra, elasticsearch) type: cassandra @@ -46,7 +48,6 @@ cassandra: schema: annotations: {} image: jaegertracing/jaeger-cassandra-schema - tag: 1.2.0 pullPolicy: IfNotPresent # Acceptable values are test and prod. Default is for production use. mode: prod @@ -77,7 +78,6 @@ agent: enabled: true annotations: {} image: jaegertracing/jaeger-agent - tag: 1.2.0 pullPolicy: IfNotPresent collector: host: null @@ -116,7 +116,6 @@ collector: enabled: true annotations: {} image: jaegertracing/jaeger-collector - tag: 1.2.0 pullPolicy: IfNotPresent dnsPolicy: ClusterFirst cmdlineParams: {} @@ -149,7 +148,6 @@ query: enabled: true annotations: {} image: jaegertracing/jaeger-query - tag: 1.2.0 pullPolicy: IfNotPresent dnsPolicy: ClusterFirst cmdlineParams: {}