Skip to content

[release-4.5] Bug 1846482: Fixed CLO crash when reconciling Fluentd #561

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
Jun 19, 2020
Merged

[release-4.5] Bug 1846482: Fixed CLO crash when reconciling Fluentd #561

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions pkg/k8shandler/forwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ func isForwardingEnabled(cluster *logging.ClusterLogging) bool {

func (clusterRequest *ClusterLoggingRequest) generateCollectorConfig() (config string, err error) {

if clusterRequest.cluster == nil || clusterRequest.cluster.Spec.Collection == nil {
logger.Warnf("skipping collection config generation as 'collection' section is not specified in the CLO's CR")
return "", nil
}

switch clusterRequest.cluster.Spec.Collection.Logs.Type {
case logging.LogCollectionTypeFluentd:
break
Expand Down
Loading