Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed constraint on namespace when obtaining available Jaeger instances #213

Merged
merged 2 commits into from
Feb 22, 2019
Merged

Removed constraint on namespace when obtaining available Jaeger instances #213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c869279
Removed constraint on namespace when obtaining available Jaeger insta…
jpkrohling Feb 21, 2019
892c80b
Linked the sidecar injection example in the readme
jpkrohling Feb 22, 2019
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
20 changes: 20 additions & 0 deletions deploy/examples/business-application-injected-sidecar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: myapp
annotations:
inject-jaeger-agent: "true"
spec:
selector:
matchLabels:
app: myapp
template:
metadata:
labels:
app: myapp
spec:
containers:
- name: myapp
image: jaegertracing/vertx-create-span:operator-e2e-tests


11 changes: 8 additions & 3 deletions pkg/controller/deployment/deployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re
log.WithFields(log.Fields{
"namespace": request.Namespace,
"name": request.Name,
}).Print("Reconciling Deployment")
}).Debug("Reconciling Deployment")

// Fetch the Deployment instance
instance := &appsv1.Deployment{}
Expand All @@ -83,7 +83,7 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re

if inject.Needed(instance) {
pods := &v1alpha1.JaegerList{}
opts := &client.ListOptions{Namespace: instance.Namespace}
opts := &client.ListOptions{}
err := r.client.List(context.Background(), opts, pods)
if err != nil {
log.WithError(err).Error("failed to get the available Jaeger pods")
Expand All @@ -93,7 +93,12 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re
jaeger := inject.Select(instance, pods)
if jaeger != nil {
// a suitable jaeger instance was found! let's inject a sidecar pointing to it then
log.WithFields(log.Fields{"deployment": instance.Name, "jaeger": jaeger.Name}).Info("Injecting Jaeger Agent sidecar")
log.WithFields(log.Fields{
"deployment": instance.Name,
"namespace": instance.Namespace,
"jaeger": jaeger.Name,
"jaeger-namespace": jaeger.Namespace,
}).Info("Injecting Jaeger Agent sidecar")
inject.Sidecar(instance, jaeger)
if err := r.client.Update(context.Background(), instance); err != nil {
log.WithField("deployment", instance).WithError(err).Error("failed to update")
Expand Down
2 changes: 1 addition & 1 deletion pkg/inject/sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func Select(target *appsv1.Deployment, availableJaegerPods *v1alpha1.JaegerList)
}

func container(jaeger *v1alpha1.Jaeger) v1.Container {
args := append(jaeger.Spec.Agent.Options.ToArgs(), fmt.Sprintf("--collector.host-port=%s:14267", service.GetNameForCollectorService(jaeger)))
args := append(jaeger.Spec.Agent.Options.ToArgs(), fmt.Sprintf("--collector.host-port=%s.%s:14267", service.GetNameForCollectorService(jaeger), jaeger.Namespace))
return v1.Container{
Image: jaeger.Spec.Agent.Image,
Name: "jaeger-agent",
Expand Down