Skip to content

Commit 0adf599

Browse files
marcofranssenmarcofranssen
committed
Resolve long line length linter warnings
Signed-off-by: Marco Franssen <[email protected]>
1 parent 28c4240 commit 0adf599

File tree

20 files changed

+338
-220
lines changed

20 files changed

+338
-220
lines changed

‎apis/fluentbit/v1alpha2/plugins/configmap_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ func NewConfigMapLoader(c client.Client, ns string) ConfigMapLoader {
2424

2525
func (cl ConfigMapLoader) LoadConfigMap(selector v1.ConfigMapKeySelector, namespace string) (string, error) {
2626
var configMap v1.ConfigMap
27-
if err := cl.client.Get(context.Background(), client.ObjectKey{Name: selector.Name, Namespace: namespace}, &configMap); err != nil {
27+
ctx := context.Background()
28+
if err := cl.client.Get(ctx, client.ObjectKey{Name: selector.Name, Namespace: namespace}, &configMap); err != nil {
2829
return "", err
2930
}
3031

‎apis/fluentbit/v1alpha2/plugins/secret_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ func NewSecretLoader(c client.Client, ns string) SecretLoader {
3838

3939
func (sl SecretLoader) LoadSecret(s Secret) (string, error) {
4040
var secret corev1.Secret
41-
if err := sl.Client.Get(context.Background(), client.ObjectKey{Name: s.ValueFrom.SecretKeyRef.Name, Namespace: sl.namespace}, &secret); err != nil {
41+
ctx := context.Background()
42+
if err := sl.Client.Get(ctx, client.ObjectKey{Name: s.ValueFrom.SecretKeyRef.Name, Namespace: sl.namespace}, &secret); err != nil {
4243
return "", err
4344
}
4445

‎apis/fluentd/v1alpha1/plugins/configmap_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ func NewConfigMapLoader(c client.Client, ns string) ConfigMapLoader {
2424

2525
func (cl ConfigMapLoader) LoadConfigMap(selector v1.ConfigMapKeySelector) (string, error) {
2626
var configMap v1.ConfigMap
27-
if err := cl.client.Get(context.Background(), client.ObjectKey{Name: selector.Name, Namespace: cl.namespace}, &configMap); err != nil {
27+
ctx := context.Background()
28+
if err := cl.client.Get(ctx, client.ObjectKey{Name: selector.Name, Namespace: cl.namespace}, &configMap); err != nil {
2829
return "", err
2930
}
3031

‎apis/fluentd/v1alpha1/plugins/secret_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ func NewSecretLoader(c client.Client, ns string, l logr.Logger) SecretLoader {
4141

4242
func (sl SecretLoaderStruct) LoadSecret(s Secret) (string, error) {
4343
var secret corev1.Secret
44-
if err := sl.client.Get(context.Background(), client.ObjectKey{Name: s.ValueFrom.SecretKeyRef.Name, Namespace: sl.namespace}, &secret); err != nil {
44+
ctx := context.Background()
45+
if err := sl.client.Get(ctx, client.ObjectKey{Name: s.ValueFrom.SecretKeyRef.Name, Namespace: sl.namespace}, &secret); err != nil {
4546
return "", err
4647
}
4748

‎cmd/doc-gen/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ func wrapInLink(text, link string) string {
380380
func fieldName(field *ast.Field) string {
381381
jsonTag := ""
382382
if field.Tag != nil {
383-
jsonTag = reflect.StructTag(field.Tag.Value[1 : len(field.Tag.Value)-1]).Get("json") // Delete first and last quotation
383+
jsonTag = reflect.StructTag(strings.Trim(field.Tag.Value, "`")).Get("json")
384384
if strings.Contains(jsonTag, "inline") {
385385
return "-"
386386
}

‎cmd/fluent-manager/main.go‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,27 @@ func main() {
7878
var disabledControllers string
7979
var tlsOpts []func(*tls.Config)
8080

81-
flag.StringVar(&watchNamespaces, "watch-namespaces", "", "Optional comma separated list of namespaces to watch for resources in. Defaults to cluster scope.")
82-
flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
83-
"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
81+
flag.StringVar(&watchNamespaces, "watch-namespaces", "",
82+
"Optional comma separated list of namespaces to watch for resources in. Defaults to cluster scope.")
83+
flag.StringVar(&metricsAddr, "metrics-bind-address", "0",
84+
"The address the metrics endpoint binds to. Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
8485
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
8586
"Enable leader election for controller manager. "+
8687
"Enabling this will ensure there is only one active controller manager.")
87-
flag.BoolVar(&secureMetrics, "metrics-secure", true, "If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
88-
flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.")
89-
flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.")
88+
flag.BoolVar(&secureMetrics, "metrics-secure", true,
89+
"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
90+
flag.StringVar(&webhookCertPath, "webhook-cert-path", "",
91+
"The directory that contains the webhook certificate.")
92+
flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt",
93+
"The name of the webhook certificate file.")
9094
flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.")
91-
flag.StringVar(&metricsCertPath, "metrics-cert-path", "", "The directory that contains the metrics server certificate.")
92-
flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.")
95+
flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
96+
"The directory that contains the metrics server certificate.")
97+
flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt",
98+
"The name of the metrics server certificate file.")
9399
flag.StringVar(&metricsCertKey, "metrics-cert-key", "tls.key", "The name of the metrics server key file.")
94-
flag.BoolVar(&enableHTTP2, "enable-http2", false, "If set, HTTP/2 will be enabled for the metrics and webhook servers")
100+
flag.BoolVar(&enableHTTP2, "enable-http2", false,
101+
"If set, HTTP/2 will be enabled for the metrics and webhook servers")
95102
flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
96103
flag.StringVar(&disabledControllers, "disable-component-controllers", "",
97104
"Optional argument that accepts two values: fluent-bit and fluentd. "+
@@ -240,7 +247,8 @@ func main() {
240247
case fluentdName:
241248
fluentdEnabled = false
242249
default:
243-
setupLog.Error(errors.New("incorrect value for `-disable-component-controllers` and it will not be proceeded (possible values are: fluent-bit, fluentd)"), "")
250+
err := errors.New("incorrect value for disable-component-controllers flag")
251+
setupLog.Error(err, "it will not be proceeded (possible values are: fluent-bit, fluentd)")
244252
}
245253
}
246254

‎cmd/fluent-watcher/fluentbit/main.go‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,30 @@ func main() {
4949
flag.BoolVar(&exitOnFailure, "exit-on-failure", false, "Deprecated: This has no effect anymore.")
5050
flag.DurationVar(&flbTerminationTimeout, "flb-timeout", 0, "Deprecated: This has no effect anymore.")
5151

52-
signalCtx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
52+
ctx := context.Background()
53+
signalCtx, cancel := signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM)
5354
defer cancel()
5455

55-
logger := log.NewLogfmtLogger(os.Stdout)
56-
logger = log.With(logger, "time", log.TimestampFormat(time.Now, time.RFC3339))
56+
l := log.NewLogfmtLogger(os.Stdout)
57+
l = log.With(l, "time", log.TimestampFormat(time.Now, time.RFC3339))
5758

5859
// check the config file format
5960
_, err := os.Stat(defaultSecretYamlPath)
6061
if os.IsNotExist(err) {
61-
_ = level.Info(logger).Log("msg", "No fluent-bit secret yaml found, using classic one.")
62+
_ = level.Info(l).Log("msg", "No fluent-bit secret yaml found, using classic one.")
6263
flag.StringVar(&configPath, "c", defaultCfgPath, "The classic config file path.")
6364
} else {
64-
_ = level.Info(logger).Log("msg", "fluent-bit secret yaml found, using yaml one.")
65+
_ = level.Info(l).Log("msg", "fluent-bit secret yaml found, using yaml one.")
6566
flag.StringVar(&configPath, "c", defaultYamlCfgPath, "The yaml config file path.")
6667
}
6768

6869
if exitOnFailure {
69-
_ = level.Warn(logger).Log("--exit-on-failure is deprecated. The process will exit no matter what if fluent-bit exits so this can safely be removed.")
70+
_ = level.Warn(l).
71+
Log("--exit-on-failure is deprecated. The process will exit no matter what if fluent-bit exits so this can safely be removed.")
7072
}
7173
if flbTerminationTimeout > 0 {
72-
_ = level.Warn(logger).Log("--flb-timeout is deprecated. Consider setting the terminationGracePeriod field on the `(Cluster)FluentBit` instance.")
74+
_ = level.Warn(l).
75+
Log("--flb-timeout is deprecated. Consider setting the terminationGracePeriod field on the `(Cluster)FluentBit` instance.")
7376
}
7477

7578
flag.Parse()
@@ -83,12 +86,12 @@ func main() {
8386
cmd.Stdout = os.Stdout
8487
cmd.Stderr = os.Stderr
8588
if err := cmd.Start(); err != nil {
86-
_ = level.Error(logger).Log("msg", "failed to start fluent-bit", "error", err)
89+
_ = level.Error(l).Log("msg", "failed to start fluent-bit", "error", err)
8790
os.Exit(1)
8891
}
89-
_ = level.Info(logger).Log("msg", "fluent-bit watcher started")
92+
_ = level.Info(l).Log("msg", "fluent-bit watcher started")
9093

91-
grp, grpCtx := errgroup.WithContext(context.Background())
94+
grp, grpCtx := errgroup.WithContext(ctx)
9295
grp.Go(func() error {
9396
// Watch the process. If it exits, we want to crash immediately.
9497
defer cancel()
@@ -124,7 +127,7 @@ func main() {
124127
if !isValidEvent(event) {
125128
continue
126129
}
127-
_ = level.Info(logger).Log("msg", "Config file changed, reloading...")
130+
_ = level.Info(l).Log("msg", "Config file changed, reloading...")
128131
if err := cmd.Process.Signal(syscall.SIGHUP); err != nil {
129132
return fmt.Errorf("failed to reload config: %w", err)
130133
}
@@ -142,12 +145,12 @@ func main() {
142145
// Always try to gracefully shut down fluent-bit. This will allow `cmd.Wait` above to finish
143146
// and thus allow `grp.Wait` below to return.
144147
if err := cmd.Process.Signal(syscall.SIGTERM); err != nil && !errors.Is(err, os.ErrProcessDone) {
145-
_ = level.Error(logger).Log("msg", "Failed to send SIGTERM to fluent-bit", "error", err)
148+
_ = level.Error(l).Log("msg", "Failed to send SIGTERM to fluent-bit", "error", err)
146149
// Do not exit on error here. The process might've died and that's okay.
147150
}
148151

149152
if err := grp.Wait(); err != nil {
150-
_ = level.Error(logger).Log("msg", "Failure during the run time of fluent-bit", "error", err)
153+
_ = level.Error(l).Log("msg", "Failure during the run time of fluent-bit", "error", err)
151154
os.Exit(1)
152155
}
153156
}

‎cmd/fluent-watcher/fluentd/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ func main() {
7070
flag.Parse()
7171

7272
logger = log.NewLogfmtLogger(os.Stdout)
73-
74-
timerCtx, timerCancel = context.WithCancel(context.Background())
73+
ctx := context.Background()
74+
timerCtx, timerCancel = context.WithCancel(ctx)
7575

7676
var g run.Group
7777
{
7878
// Termination handler.
79-
g.Add(run.SignalHandler(context.Background(), os.Interrupt, syscall.SIGTERM))
79+
g.Add(run.SignalHandler(ctx, os.Interrupt, syscall.SIGTERM))
8080
}
8181
{
8282
// Watch the Fluentd, if the Fluentd not exists or stopped, restart it.
@@ -100,7 +100,7 @@ func main() {
100100
return err
101101
}
102102

103-
timerCtx, timerCancel = context.WithCancel(context.Background())
103+
timerCtx, timerCancel = context.WithCancel(ctx)
104104

105105
// After the fluentd exit, fluentd watcher restarts it with an exponential
106106
// back-off delay (1s, 2s, 4s, ...), that is capped at five minutes.

‎controllers/collector_controller.go‎

Lines changed: 58 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,22 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
8585

8686
// Check if Secret exists and requeue when not found
8787
var sec corev1.Secret
88-
if err := r.Get(ctx, client.ObjectKey{Namespace: co.Namespace, Name: co.Spec.FluentBitConfigName}, &sec); err != nil {
88+
objKey := client.ObjectKey{Namespace: co.Namespace, Name: co.Spec.FluentBitConfigName}
89+
if err := r.Get(ctx, objKey, &sec); err != nil {
8990
if errors.IsNotFound(err) {
9091
return ctrl.Result{Requeue: true}, nil
9192
}
9293
return ctrl.Result{}, err
9394
}
9495

9596
// Install RBAC resources for the filter plugin kubernetes
96-
cr, sa, crb := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
97+
cr, sa, crb := operator.MakeRBACObjects(
98+
co.Name,
99+
co.Namespace,
100+
"collector",
101+
co.Spec.RBACRules,
102+
co.Spec.ServiceAccountAnnotations,
103+
)
97104
// Deploy Fluent Bit Collector ClusterRole
98105
if _, err := controllerutil.CreateOrPatch(ctx, r.Client, cr, r.mutate(cr, &co)); err != nil {
99106
return ctrl.Result{}, err
@@ -127,14 +134,24 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
127134
func (r *CollectorReconciler) mutate(obj client.Object, co *fluentbitv1alpha2.Collector) controllerutil.MutateFn {
128135
switch o := obj.(type) {
129136
case *rbacv1.ClusterRole:
130-
expected, _, _ := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
137+
expected, _, _ := operator.MakeRBACObjects(co.Name,
138+
co.Namespace, "collector",
139+
co.Spec.RBACRules,
140+
co.Spec.ServiceAccountAnnotations,
141+
)
131142

132143
return func() error {
133144
o.Rules = expected.Rules
134145
return nil
135146
}
136147
case *corev1.ServiceAccount:
137-
_, expected, _ := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
148+
_, expected, _ := operator.MakeRBACObjects(
149+
co.Name,
150+
co.Namespace,
151+
"collector",
152+
co.Spec.RBACRules,
153+
co.Spec.ServiceAccountAnnotations,
154+
)
138155

139156
return func() error {
140157
o.Annotations = expected.Annotations
@@ -144,7 +161,12 @@ func (r *CollectorReconciler) mutate(obj client.Object, co *fluentbitv1alpha2.Co
144161
return nil
145162
}
146163
case *rbacv1.ClusterRoleBinding:
147-
_, _, expected := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
164+
_, _, expected := operator.MakeRBACObjects(co.Name,
165+
co.Namespace,
166+
"collector",
167+
co.Spec.RBACRules,
168+
co.Spec.ServiceAccountAnnotations,
169+
)
148170

149171
return func() error {
150172
o.RoleRef = expected.RoleRef
@@ -220,35 +242,40 @@ func (r *CollectorReconciler) delete(ctx context.Context, co *fluentbitv1alpha2.
220242
}
221243

222244
func (r *CollectorReconciler) SetupWithManager(mgr ctrl.Manager) error {
223-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &corev1.ServiceAccount{}, collectorOwnerKey, func(rawObj client.Object) []string {
224-
// grab the job object, extract the owner.
225-
sa := rawObj.(*corev1.ServiceAccount)
226-
owner := metav1.GetControllerOf(sa)
227-
if owner == nil {
228-
return nil
229-
}
230-
// Make sure it's a FluentBit. If so, return it.
231-
if owner.APIVersion != fluentbitApiGVStr || owner.Kind != "Collector" {
232-
return nil
233-
}
234-
return []string{owner.Name}
235-
}); err != nil {
245+
ctx := context.Background()
246+
if err := mgr.GetFieldIndexer().IndexField(
247+
ctx, &corev1.ServiceAccount{}, collectorOwnerKey,
248+
func(rawObj client.Object) []string {
249+
// grab the job object, extract the owner.
250+
sa := rawObj.(*corev1.ServiceAccount)
251+
owner := metav1.GetControllerOf(sa)
252+
if owner == nil {
253+
return nil
254+
}
255+
// Make sure it's a FluentBit. If so, return it.
256+
if owner.APIVersion != fluentbitApiGVStr || owner.Kind != "Collector" {
257+
return nil
258+
}
259+
return []string{owner.Name}
260+
}); err != nil {
236261
return err
237262
}
238263

239-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &appsv1.StatefulSet{}, collectorOwnerKey, func(rawObj client.Object) []string {
240-
// grab the job object, extract the owner.
241-
sts := rawObj.(*appsv1.StatefulSet)
242-
owner := metav1.GetControllerOf(sts)
243-
if owner == nil {
244-
return nil
245-
}
246-
// Make sure it's a FluentBit. If so, return it.
247-
if owner.APIVersion != fluentbitApiGVStr || owner.Kind != "Collector" {
248-
return nil
249-
}
250-
return []string{owner.Name}
251-
}); err != nil {
264+
if err := mgr.GetFieldIndexer().IndexField(
265+
ctx, &appsv1.StatefulSet{}, collectorOwnerKey,
266+
func(rawObj client.Object) []string {
267+
// grab the job object, extract the owner.
268+
sts := rawObj.(*appsv1.StatefulSet)
269+
owner := metav1.GetControllerOf(sts)
270+
if owner == nil {
271+
return nil
272+
}
273+
// Make sure it's a FluentBit. If so, return it.
274+
if owner.APIVersion != fluentbitApiGVStr || owner.Kind != "Collector" {
275+
return nil
276+
}
277+
return []string{owner.Name}
278+
}); err != nil {
252279
return err
253280
}
254281

‎controllers/fluent_controller_finalizer.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,13 @@ func (r *FluentdReconciler) mutate(obj client.Object, fd *fluentdv1alpha1.Fluent
121121
return nil
122122
}
123123
case *corev1.ServiceAccount:
124-
_, expected, _ := operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
124+
_, expected, _ := operator.MakeRBACObjects(
125+
fd.Name,
126+
fd.Namespace,
127+
"fluentd",
128+
fd.Spec.RBACRules,
129+
fd.Spec.ServiceAccountAnnotations,
130+
)
125131

126132
return func() error {
127133
o.Labels = expected.Labels
@@ -132,7 +138,13 @@ func (r *FluentdReconciler) mutate(obj client.Object, fd *fluentdv1alpha1.Fluent
132138
return nil
133139
}
134140
case *rbacv1.ClusterRoleBinding:
135-
_, _, expected := operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
141+
_, _, expected := operator.MakeRBACObjects(
142+
fd.Name,
143+
fd.Namespace,
144+
"fluentd",
145+
fd.Spec.RBACRules,
146+
fd.Spec.ServiceAccountAnnotations,
147+
)
136148

137149
return func() error {
138150
o.RoleRef = expected.RoleRef

0 commit comments

Comments
 (0)