-
Notifications
You must be signed in to change notification settings - Fork 349
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.
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
Deploy trusted CA config map in OpenShift when agent injected into a … #1110
Conversation
…different namespace than the jaeger instance Signed-off-by: Gary Brown <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #1110 +/- ##
==========================================
+ Coverage 88.00% 88.02% +0.02%
==========================================
Files 86 86
Lines 5254 5263 +9
==========================================
+ Hits 4624 4633 +9
Misses 466 466
Partials 164 164
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just need a confirmation that the reconciliation logic should really be prematurely finished when the bundle CA can't get created.
@@ -124,6 +125,25 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re | |||
|
|||
jaeger := inject.Select(dep, ns, jaegers) | |||
if jaeger != nil && jaeger.GetDeletionTimestamp() == nil { | |||
if jaeger.Namespace != request.Namespace { | |||
log.WithFields(log.Fields{ | |||
"jaeger namespace": jaeger.Namespace, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For someone grepping the logs, it might be better to have jaeger-namespace
or jaeger.namespace
than jaeger namespace
.
log.WithFields(log.Fields{ | ||
"jaeger namespace": jaeger.Namespace, | ||
"app namespace": request.Namespace, | ||
}).Info("different namespaces, so check whether trusted CA bundle configmap should be created") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/Info/Debug/
?
Signed-off-by: Gary Brown <[email protected]>
Signed-off-by: Gary Brown <[email protected]>
@jpkrohling Updated - don't think the otel-es test TestElasticSearchSuite/TestSparkDependenciesES is anything related to this PR. |
…gertracing#1110) Deploy trusted CA config map in OpenShift when agent injected into a different namespace than the jaeger instance Signed-off-by: Gary Brown <[email protected]>
…different namespace than the jaeger instance
Resolves #1092
Signed-off-by: Gary Brown [email protected]