From dde332335f263e198b61c4ef338f3c720cf61129 Mon Sep 17 00:00:00 2001 From: Spellchaser Date: Tue, 22 May 2018 11:11:24 -0400 Subject: [PATCH 1/5] Jaeger Version++ && Version documentation Similar to #70, addresses #88 Signed-off-by: Victor Lei --- README.md | 4 ++++ jaeger-production-template.yml | 10 +++++++--- production/cassandra.yml | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cf3efb3..a92fedc 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,10 @@ kubectl run jaeger-spark-dependencies --schedule="55 23 * * *" --env="STORAGE=ca If you want to run the job only once and immediately then remove scheduled flag. +## Docker Versions +The jaeger project automatically creates new docker images with versions that mirror the release number. Feel free to pick the latest release. +> A general k8 tip; it's recommended that you do not use `:latest` in production but rather pin the latest version. + ## Helm support A curated [Chart for Kubernetes Helm](https://github.com/kubernetes/charts/tree/master/incubator/jaeger) that adds all components required to run Jaeger. diff --git a/jaeger-production-template.yml b/jaeger-production-template.yml index 0a13ae0..773998a 100644 --- a/jaeger-production-template.yml +++ b/jaeger-production-template.yml @@ -12,6 +12,10 @@ # the License. # +# +# Check https://github.com/jaegertracing/jaeger/releases for the latest version to use +# + apiVersion: v1 kind: List items: @@ -33,7 +37,7 @@ items: jaeger-infra: collector-pod spec: containers: - - image: jaegertracing/jaeger-collector:1.2 + - image: jaegertracing/jaeger-collector:1.4.1 name: jaeger-collector command: - "/go/bin/collector-linux" @@ -119,7 +123,7 @@ items: jaeger-infra: query-pod spec: containers: - - image: jaegertracing/jaeger-query:1.2 + - image: jaegertracing/jaeger-query:1.4.1 name: jaeger-query command: - "/go/bin/query-linux" @@ -179,7 +183,7 @@ items: spec: containers: - name: agent-instance - image: jaegertracing/jaeger-agent:1.2 + image: jaegertracing/jaeger-agent:1.4.1 command: - "/go/bin/agent-linux" - "--config-file=/conf/agent.yaml" diff --git a/production/cassandra.yml b/production/cassandra.yml index a4b265e..3d491fd 100644 --- a/production/cassandra.yml +++ b/production/cassandra.yml @@ -120,7 +120,8 @@ items: spec: containers: - name: jaeger-cassandra-schema - image: jaegertracing/jaeger-cassandra-schema:1.2 + image: jaegertracing/jaeger-cassandra-schema:1.4.1 + # Check https://github.com/jaegertracing/jaeger/releases for the latest version env: - name: MODE value: "prod" From 66879190562b805cd6a2890a6060a7feeaaf1be0 Mon Sep 17 00:00:00 2001 From: Spellchaser Date: Wed, 30 May 2018 12:50:51 -0400 Subject: [PATCH 2/5] Clean up Docker Tag Advice Address PR comments and run CI tests again Signed-off-by: Victor Lei --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a92fedc..39fd630 100644 --- a/README.md +++ b/README.md @@ -147,9 +147,9 @@ kubectl run jaeger-spark-dependencies --schedule="55 23 * * *" --env="STORAGE=ca If you want to run the job only once and immediately then remove scheduled flag. -## Docker Versions -The jaeger project automatically creates new docker images with versions that mirror the release number. Feel free to pick the latest release. -> A general k8 tip; it's recommended that you do not use `:latest` in production but rather pin the latest version. +## Deploying Docker Tags +The Jaeger project automatically creates new Docker images with tags that mirror the release number. Feel free to pick the latest release. +> A general tip for deploying docker images (i.e. on kubernetes): it's recommended that you do not use the tag `:latest` in production but rather pin the latest version. See the [kubernetes best practices](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) for more details. ## Helm support A curated [Chart for Kubernetes Helm](https://github.com/kubernetes/charts/tree/master/incubator/jaeger) that adds all components required to run Jaeger. From 57ec89fd79c3e5794c28936d684b656024f6fbc8 Mon Sep 17 00:00:00 2001 From: Victor Lei Date: Mon, 18 Jun 2018 17:00:00 -0400 Subject: [PATCH 3/5] (version++)++ Signed-off-by: Victor Lei --- jaeger-production-template.yml | 6 +++--- production/cassandra.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jaeger-production-template.yml b/jaeger-production-template.yml index 773998a..3b46726 100644 --- a/jaeger-production-template.yml +++ b/jaeger-production-template.yml @@ -37,7 +37,7 @@ items: jaeger-infra: collector-pod spec: containers: - - image: jaegertracing/jaeger-collector:1.4.1 + - image: jaegertracing/jaeger-collector:1.5.0 name: jaeger-collector command: - "/go/bin/collector-linux" @@ -123,7 +123,7 @@ items: jaeger-infra: query-pod spec: containers: - - image: jaegertracing/jaeger-query:1.4.1 + - image: jaegertracing/jaeger-query:1.5.0 name: jaeger-query command: - "/go/bin/query-linux" @@ -183,7 +183,7 @@ items: spec: containers: - name: agent-instance - image: jaegertracing/jaeger-agent:1.4.1 + image: jaegertracing/jaeger-agent:1.5.0 command: - "/go/bin/agent-linux" - "--config-file=/conf/agent.yaml" diff --git a/production/cassandra.yml b/production/cassandra.yml index 3d491fd..9d88a43 100644 --- a/production/cassandra.yml +++ b/production/cassandra.yml @@ -120,7 +120,7 @@ items: spec: containers: - name: jaeger-cassandra-schema - image: jaegertracing/jaeger-cassandra-schema:1.4.1 + image: jaegertracing/jaeger-cassandra-schema:1.5.0 # Check https://github.com/jaegertracing/jaeger/releases for the latest version env: - name: MODE From b1053841d16aa49d28a962af4f50e557e637aaab Mon Sep 17 00:00:00 2001 From: Victor Lei Date: Mon, 18 Jun 2018 17:30:49 -0400 Subject: [PATCH 4/5] Move image versions to README Signed-off-by: Victor Lei --- README.md | 7 +++++-- jaeger-production-template.yml | 4 ---- production/cassandra.yml | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 39fd630..6571144 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ Please see [CONTRIBUTING.md](https://github.com/jaegertracing/jaeger-kubernetes/blob/master/CONTRIBUTING.md) ## Development setup -This template uses an in-memory storage with a limited functionality for local testing and development. -Do not use this template in production environments. +This template uses an in-memory storage with a limited functionality for local testing and development. The image used defaults to the latest version (released)[https://github.com/jaegertracing/jaeger/releases]. +Do not use this template in production environments. Note that functionality may differ from the pinned docker versions for production. Install everything in the current namespace: ```bash @@ -21,6 +21,9 @@ can be used instead. ## Production setup +### Pinned Production Version +The docker image tags are manually pinned and manually updated. You should use the current pinned version for production. + ### Backing storage The Jaeger Collector and Query require a backing storage to exist before being started up. As a starting point for your own diff --git a/jaeger-production-template.yml b/jaeger-production-template.yml index 3b46726..9382d91 100644 --- a/jaeger-production-template.yml +++ b/jaeger-production-template.yml @@ -12,10 +12,6 @@ # the License. # -# -# Check https://github.com/jaegertracing/jaeger/releases for the latest version to use -# - apiVersion: v1 kind: List items: diff --git a/production/cassandra.yml b/production/cassandra.yml index 9d88a43..93cf853 100644 --- a/production/cassandra.yml +++ b/production/cassandra.yml @@ -121,7 +121,6 @@ items: containers: - name: jaeger-cassandra-schema image: jaegertracing/jaeger-cassandra-schema:1.5.0 - # Check https://github.com/jaegertracing/jaeger/releases for the latest version env: - name: MODE value: "prod" From e66bbbac2a36e959301605f220104c1b63583c45 Mon Sep 17 00:00:00 2001 From: Victor Lei Date: Mon, 18 Jun 2018 17:53:14 -0400 Subject: [PATCH 5/5] Update docker image advice Don't tell people "Feel free to use the latest version" Signed-off-by: Victor Lei --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6571144..112c205 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ kubectl run jaeger-spark-dependencies --schedule="55 23 * * *" --env="STORAGE=ca If you want to run the job only once and immediately then remove scheduled flag. ## Deploying Docker Tags -The Jaeger project automatically creates new Docker images with tags that mirror the release number. Feel free to pick the latest release. +The Jaeger project automatically creates new Docker images with tags that mirror the release number. The production manifests uses pinned versions as to not accidentally break people on new releases. > A general tip for deploying docker images (i.e. on kubernetes): it's recommended that you do not use the tag `:latest` in production but rather pin the latest version. See the [kubernetes best practices](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) for more details. ## Helm support