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

Split backing storage from the main templates. #53

Merged
merged 1 commit into from
Oct 26, 2017
Merged

Split backing storage from the main templates. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 29 additions & 84 deletions ...roduction-template-with-elasticsearch.yml → jaeger-production-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,67 +15,6 @@
apiVersion: v1
kind: List
items:
- apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
name: elasticsearch
labels:
app: jaeger
jaeger-infra: elasticsearch-statefulset
spec:
serviceName: elasticsearch
replicas: 1
template:
metadata:
labels:
app: jaeger-elasticsearch
jaeger-infra: elasticsearch-replica
spec:
containers:
- name: elasticsearch
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.0
imagePullPolicy: Always
command:
- bin/elasticsearch
args:
- "-Ehttp.host=0.0.0.0"
- "-Etransport.host=127.0.0.1"
volumeMounts:
- name: data
mountPath: /data
readinessProbe:
exec:
command:
- curl
- --fail
- --silent
- --output
- /dev/null
- --user
- elastic:changeme
- localhost:9200
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 4
volumes:
- name: data
emptyDir: {}
- apiVersion: v1
kind: Service
metadata:
name: elasticsearch
labels:
app: jaeger
jaeger-infra: elasticsearch-service
spec:
clusterIP: None
selector:
app: jaeger-elasticsearch
ports:
- port: 9200
name: elasticsearch
- port: 9300
name: transport
- apiVersion: extensions/v1beta1
kind: Deployment
metadata:
Expand All @@ -94,26 +33,28 @@ items:
jaeger-infra: collector-pod
spec:
containers:
- env:
- name: COLLECTOR_ZIPKIN_HTTP_PORT
value: "9411"
image: jaegertracing/jaeger-collector:0.8
- image: jaegertracing/jaeger-collector:0.9
name: jaeger-collector
command:
- "/go/bin/collector-linux"
- "--config-file=/conf/collector.yaml"
ports:
- containerPort: 14267
protocol: TCP
- containerPort: 14268
protocol: TCP
- containerPort: 9411
protocol: TCP
command:
- "/go/bin/collector-linux"
- "--span-storage.type=elasticsearch"
- "--es.server-urls=http://elasticsearch:9200"
- "--es.username=elastic"
- "--es.password=changeme"
dnsPolicy: ClusterFirst
restartPolicy: Always
volumeMounts:
- name: jaeger-configuration-volume
mountPath: /conf
volumes:
- configMap:
name: jaeger-configuration
items:
- key: collector
path: collector.yaml
name: jaeger-configuration-volume
- apiVersion: v1
kind: Service
metadata:
Expand Down Expand Up @@ -172,24 +113,28 @@ items:
jaeger-infra: query-pod
spec:
containers:
- image: jaegertracing/jaeger-query:0.8
- image: jaegertracing/jaeger-query:0.9
name: jaeger-query
command:
- "/go/bin/query-linux"
- "--config-file=/conf/query.yaml"
ports:
- containerPort: 16686
protocol: TCP
command:
- "/go/bin/query-linux"
- "--span-storage.type=elasticsearch"
- "--es.server-urls=http://elasticsearch:9200"
- "--es.username=elastic"
- "--es.password=changeme"
- "--query.static-files=/go/jaeger-ui/"
readinessProbe:
httpGet:
path: "/"
port: 16686
dnsPolicy: ClusterFirst
restartPolicy: Always
volumeMounts:
- name: jaeger-configuration-volume
mountPath: /conf
volumes:
- configMap:
name: jaeger-configuration
items:
- key: query
path: query.yaml
name: jaeger-configuration-volume
- apiVersion: v1
kind: Service
metadata:
Expand All @@ -205,4 +150,4 @@ items:
targetPort: 16686
selector:
jaeger-infra: query-pod
type: LoadBalancer
type: LoadBalancer
105 changes: 105 additions & 0 deletions production-elasticsearch/elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#
# Copyright 2017 The Jaeger Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
#

apiVersion: v1
kind: List
items:
- apiVersion: v1
kind: ConfigMap
metadata:
name: jaeger-configuration
labels:
app: jaeger
jaeger-infra: configuration
data:
collector: |
span-storage:
type: elasticsearch
es:
server-urls: http://elasticsearch:9200
username: elastic
password: changeme
collector:
zipkin:
http-port: 9411
query: |
span-storage:
type: elasticsearch
es:
server-urls: http://elasticsearch:9200
username: elastic
password: changeme
query:
static-files: /go/jaeger-ui/
- apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
name: elasticsearch
labels:
app: jaeger
jaeger-infra: elasticsearch-statefulset
spec:
serviceName: elasticsearch
replicas: 1
template:
metadata:
labels:
app: jaeger-elasticsearch
jaeger-infra: elasticsearch-replica
spec:
containers:
- name: elasticsearch
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.0
imagePullPolicy: Always
command:
- bin/elasticsearch
args:
- "-Ehttp.host=0.0.0.0"
- "-Etransport.host=127.0.0.1"
volumeMounts:
- name: data
mountPath: /data
readinessProbe:
exec:
command:
- curl
- --fail
- --silent
- --output
- /dev/null
- --user
- elastic:changeme
- localhost:9200
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 4
volumes:
- name: data
emptyDir: {}
- apiVersion: v1
kind: Service
metadata:
name: elasticsearch
labels:
app: jaeger
jaeger-infra: elasticsearch-service
spec:
clusterIP: None
selector:
app: jaeger-elasticsearch
ports:
- port: 9200
name: elasticsearch
- port: 9300
name: transport
4 changes: 2 additions & 2 deletions production-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<artifactId>jaegertracing-kubernetes-production-elasticsearch</artifactId>

<properties>
<template.name>jaeger-production-template-with-elasticsearch.yml</template.name>
<template.name>jaeger-production-template.yml</template.name>
<rootProject.basedir>${project.basedir}/..</rootProject.basedir>
</properties>

Expand All @@ -42,7 +42,7 @@
<!-- Copy template to test resources -->
<resources>
<resource>
<directory>${project.basedir}</directory>
<directory>${rootProject.basedir}</directory>
<includes>
<include>${template.name}</include>
</includes>
Expand Down
3 changes: 2 additions & 1 deletion production-elasticsearch/src/test/resources/arquillian.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<extension qualifier="kubernetes">
<property name="env.config.resource.name">jaeger-production-template-with-elasticsearch.yml</property>
<property name="env.dependencies">file://${basedir}/elasticsearch.yml</property>
<property name="env.config.resource.name">jaeger-production-template.yml</property>
<property name="wait.timeout">600000</property>
<!--<property name="namespace.destroy.enabled">false</property>-->
<!--<property name="namespace.cleanup.enabled">false</property>-->
Expand Down
Loading