Skip to content

Commit

Permalink
Merge pull request #1772 from kube-logging/aslafy-z-patch-2
Browse files Browse the repository at this point in the history
feat: insert configmapreloader imagepullsecrets in fluentbit ds
  • Loading branch information
OverOrion authored Jul 5, 2024
2 parents d385d47 + 69e3d6f commit 83f35fd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/resources/fluentbit/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ func (r *Reconciler) daemonSet() (runtime.Object, reconciler.DesiredState, error
Labels: labels,
Annotations: r.fluentbitSpec.Annotations,
}
imagePullSecrets := r.fluentbitSpec.Image.ImagePullSecrets

if r.fluentbitSpec.ConfigHotReload == nil && r.configs != nil {
for key, config := range r.configs {
Expand All @@ -60,6 +61,7 @@ func (r *Reconciler) daemonSet() (runtime.Object, reconciler.DesiredState, error
}
if r.fluentbitSpec.ConfigHotReload != nil {
containers = append(containers, newConfigMapReloader(r.fluentbitSpec))
imagePullSecrets = append(imagePullSecrets, r.fluentbitSpec.ConfigHotReload.Image.ImagePullSecrets...)
}
if c := r.bufferMetricsSidecarContainer(); c != nil {
containers = append(containers, *c)
Expand All @@ -85,7 +87,7 @@ func (r *Reconciler) daemonSet() (runtime.Object, reconciler.DesiredState, error
RunAsGroup: r.fluentbitSpec.Security.PodSecurityContext.RunAsGroup,
SeccompProfile: r.fluentbitSpec.Security.SecurityContext.SeccompProfile,
},
ImagePullSecrets: r.fluentbitSpec.Image.ImagePullSecrets,
ImagePullSecrets: imagePullSecrets,
DNSPolicy: r.fluentbitSpec.DNSPolicy,
DNSConfig: r.fluentbitSpec.DNSConfig,
HostNetwork: r.fluentbitSpec.HostNetwork,
Expand Down

0 comments on commit 83f35fd

Please sign in to comment.