Skip to content

[master] LOG-6343: When enabling inputs receivers in CLF, the tls secrets can't be created #2869

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

Merged
merged 1 commit into from
Nov 15, 2024
+4 −4
Merged

[master] LOG-6343: When enabling inputs receivers in CLF, the tls secrets can't be created #2869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions internal/collector/input_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
// ReconcileInputServices evaluates receiver inputs and deploys services for them
func (f *Factory) ReconcileInputServices(k8sClient kubernetes.Client, k8sReader kubernetes.Reader, namespace string, owner metav1.OwnerReference, visitors func(o runtime.Object)) error {

if err := RemoveOrphanedInputServices(k8sClient, k8sReader, namespace, f.ForwarderSpec, *f.ResourceNames, owner, true); err != nil {
if err := RemoveOrphanedInputServices(k8sClient, k8sReader, namespace, f.ForwarderSpec, *f.ResourceNames, owner); err != nil {
return err
}

Expand All @@ -33,8 +33,8 @@ func (f *Factory) ReconcileInputServices(k8sClient kubernetes.Client, k8sReader
return nil
}

// RemoveOrphanedInputServices removes receiver input services not owned by the given owner
func RemoveOrphanedInputServices(client kubernetes.Client, reader kubernetes.Reader, namespace string, spec obs.ClusterLogForwarderSpec, resourceNames factory.ForwarderResourceNames, currOwner metav1.OwnerReference, removeAllServices bool) error {
// RemoveOrphanedInputServices removes receiver input services owned by the current CLF but not defined in the spec
func RemoveOrphanedInputServices(client kubernetes.Client, reader kubernetes.Reader, namespace string, spec obs.ClusterLogForwarderSpec, resourceNames factory.ForwarderResourceNames, currOwner metav1.OwnerReference) error {

for _, receiverType := range obs.ReceiverTypes {
// Get list of input services by label/ namespace
Expand All @@ -53,7 +53,7 @@ func RemoveOrphanedInputServices(client kubernetes.Client, reader kubernetes.Rea

// Remove services only if owned by current CLF and isn't defined
for _, item := range services.Items {
if utils.HasSameOwner(item.OwnerReferences, []metav1.OwnerReference{currOwner}) && (!inputs.Has(item.Name) || removeAllServices) {
if utils.HasSameOwner(item.OwnerReferences, []metav1.OwnerReference{currOwner}) && !inputs.Has(item.Name) {
if err := service.Delete(client, item.Namespace, item.Name); err != nil {
return err
}
Expand Down