-
Notifications
You must be signed in to change notification settings - Fork 140
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
WIP Call otelc reconciler if telemetryService is enabled #4421
base: main
Are you sure you want to change the base?
Conversation
2ead5ed
to
18613b7
Compare
33592ce
to
9af89d8
Compare
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #4421 +/- ##
==========================================
+ Coverage 64.92% 65.00% +0.08%
==========================================
Files 413 413
Lines 27199 27276 +77
==========================================
+ Hits 17658 17730 +72
- Misses 8216 8220 +4
- Partials 1325 1326 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
17ba726
to
2a94cc6
Compare
2a94cc6
to
26b6386
Compare
return corev1.Container{ | ||
Name: containerName, | ||
Image: imageRepo + ":" + imageTag, | ||
ImagePullPolicy: corev1.PullAlways, | ||
SecurityContext: buildSecurityContext(), | ||
Env: getEnvs(dk), | ||
Resources: dk.Spec.Templates.OpenTelemetryCollector.Resources, | ||
Args: []string{fmt.Sprintf("--config=eec://%s:%d/otcconfig/prometheusMetrics#refresh-interval=5s&auth-file=%s", dk.ExtensionsServiceNameFQDN(), consts.OtelCollectorComPort, otelcSecretTokenFilePath)}, | ||
Args: []string{arg}, |
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.
if I'm not mistaken we need to append not replace, so it's 1 or another or both.
MountPath: customEecTLSCertificatePath, | ||
ReadOnly: true, | ||
}) | ||
if dk.IsExtensionsEnabled() { |
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.
can we combine this if with negative one, and put to else block?
@@ -121,5 +156,13 @@ func buildContainerVolumeMounts(dk *dynakube.DynaKube) []corev1.VolumeMount { | |||
}) | |||
} | |||
|
|||
if !dk.IsExtensionsEnabled() { |
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.
see comment on line 143
SecretName: "os", | ||
Items: []corev1.KeyToPath{ | ||
{ | ||
Key: "config.yaml", |
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.
use constatnts
@@ -91,12 +101,35 @@ func setVolumes(dk *dynakube.DynaKube) func(o *appsv1.StatefulSet) { | |||
}, | |||
}) | |||
} | |||
|
|||
if !dk.IsExtensionsEnabled() { |
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.
same idea as before combine with line 67
JIRA
Description
How can this be tested?
unittests