diff --git a/examples/hotrod/kubernetes/base/hotrod/deployment.yaml b/examples/hotrod/kubernetes/base/hotrod/deployment.yaml index 840324afc596..420f531816e5 100644 --- a/examples/hotrod/kubernetes/base/hotrod/deployment.yaml +++ b/examples/hotrod/kubernetes/base/hotrod/deployment.yaml @@ -21,7 +21,7 @@ spec: args: ["all"] env: - name: JAEGER_AGENT_HOST - value: jaeger.example-hotrod.svc.cluster.local + value: localhost - name: JAEGER_AGENT_PORT value: "6831" ports: diff --git a/examples/hotrod/kubernetes/base/jaeger-all-in-one/kustomization.yaml b/examples/hotrod/kubernetes/base/jaeger-all-in-one/kustomization.yaml new file mode 100644 index 000000000000..e64e7bb96d38 --- /dev/null +++ b/examples/hotrod/kubernetes/base/jaeger-all-in-one/kustomization.yaml @@ -0,0 +1,33 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: + - ../hotrod + +resources: + - service.yaml + +patches: + - target: + group: apps + version: v1 + kind: Deployment + name: example-hotrod + patch: |- + - op: add + path: /spec/template/spec/containers/- + value: + image: jaegertracing/all-in-one:latest + name: jaeger + ports: + - containerPort: 6831 + name: tracing-jaeger + - containerPort: 16686 + name: frontend-jaeger + resources: + limits: + cpu: 100m + memory: 100M + requests: + cpu: 100m + memory: 100M diff --git a/examples/hotrod/kubernetes/base/jaeger/service.yaml b/examples/hotrod/kubernetes/base/jaeger-all-in-one/service.yaml similarity index 68% rename from examples/hotrod/kubernetes/base/jaeger/service.yaml rename to examples/hotrod/kubernetes/base/jaeger-all-in-one/service.yaml index 9c30260dd3c6..e893304eb173 100644 --- a/examples/hotrod/kubernetes/base/jaeger/service.yaml +++ b/examples/hotrod/kubernetes/base/jaeger-all-in-one/service.yaml @@ -4,13 +4,13 @@ metadata: name: jaeger spec: selector: - app: jaeger + app: example-hotrod ports: - name: tracing protocol: UDP port: 6831 - targetPort: tracing + targetPort: tracing-jaeger - name: frontend protocol: TCP port: 16686 - targetPort: frontend + targetPort: frontend-jaeger diff --git a/examples/hotrod/kubernetes/base/jaeger/deployment.yaml b/examples/hotrod/kubernetes/base/jaeger/deployment.yaml deleted file mode 100644 index 848c0aa3d736..000000000000 --- a/examples/hotrod/kubernetes/base/jaeger/deployment.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: jaeger - name: jaeger -spec: - replicas: 1 - selector: - matchLabels: - app: jaeger - strategy: {} - template: - metadata: - labels: - app: jaeger - spec: - containers: - - image: jaegertracing/all-in-one:latest - name: jaeger - ports: - - containerPort: 6831 - name: tracing - - containerPort: 16686 - name: frontend - resources: - limits: - cpu: 100m - memory: 100M - requests: - cpu: 100m - memory: 100M diff --git a/examples/hotrod/kubernetes/base/jaeger/kustomization.yaml b/examples/hotrod/kubernetes/base/jaeger/kustomization.yaml deleted file mode 100644 index 5b98e9449232..000000000000 --- a/examples/hotrod/kubernetes/base/jaeger/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - deployment.yaml - - service.yaml diff --git a/examples/hotrod/kubernetes/kustomization.yaml b/examples/hotrod/kubernetes/kustomization.yaml index c9ab8136a6eb..84859ec27722 100644 --- a/examples/hotrod/kubernetes/kustomization.yaml +++ b/examples/hotrod/kubernetes/kustomization.yaml @@ -2,7 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - - base/hotrod +# If you only want the hotrod application, uncomment this line and comment out jaeger-all-in-one +# - base/hotrod - base/jaeger namespace: example-hotrod