Skip to content

Commit bd76c8f

Browse files
authored
fix: restore lost fluentd config error check (#1335)
Signed-off-by: Peter Wilcsinszky <[email protected]>
1 parent 6931c39 commit bd76c8f

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

pkg/resources/fluentd/fluentd.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ import (
2424
"github.com/cisco-open/operator-tools/pkg/secret"
2525
"github.com/cisco-open/operator-tools/pkg/utils"
2626
"github.com/go-logr/logr"
27-
"github.com/kube-logging/logging-operator/pkg/resources"
28-
"github.com/kube-logging/logging-operator/pkg/resources/configcheck"
29-
"github.com/kube-logging/logging-operator/pkg/resources/kubetool"
30-
"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
3127
appsv1 "k8s.io/api/apps/v1"
3228
batchv1 "k8s.io/api/batch/v1"
3329
corev1 "k8s.io/api/core/v1"
@@ -39,6 +35,11 @@ import (
3935
"sigs.k8s.io/controller-runtime/pkg/builder"
4036
"sigs.k8s.io/controller-runtime/pkg/client"
4137
"sigs.k8s.io/controller-runtime/pkg/reconcile"
38+
39+
"github.com/kube-logging/logging-operator/pkg/resources"
40+
"github.com/kube-logging/logging-operator/pkg/resources/configcheck"
41+
"github.com/kube-logging/logging-operator/pkg/resources/kubetool"
42+
"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
4243
)
4344

4445
const (
@@ -132,6 +133,12 @@ func (r *Reconciler) Reconcile() (*reconcile.Result, error) {
132133
if err != nil {
133134
return nil, err
134135
}
136+
137+
// Fail when the current config is invalid
138+
if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok && !result {
139+
return nil, errors.Errorf("current config is invalid")
140+
}
141+
135142
if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok {
136143
cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck)
137144

0 commit comments

Comments
 (0)