From 4911e35d9f6d94fe40415ae623785765c33feb30 Mon Sep 17 00:00:00 2001 From: fengshunli <1171313930@qq.com> Date: Sat, 11 Feb 2023 23:36:36 +0800 Subject: [PATCH] Fix Code format (including comment) Signed-off-by: fengshunli <1171313930@qq.com> --- apis/fluentbit/v1alpha2/clusterfilter_types.go | 6 +++--- .../v1alpha2/clusterfluentbitconfig_types.go | 6 ++++-- apis/fluentbit/v1alpha2/clusteroutput_types.go | 3 ++- apis/fluentbit/v1alpha2/clusterparser_types.go | 1 + apis/fluentbit/v1alpha2/doc.go | 2 +- apis/fluentd/v1alpha1/clusterfilter_types.go | 2 +- .../v1alpha1/clusterfluentdconfig_types.go | 2 +- apis/fluentd/v1alpha1/clusteroutput_types.go | 2 +- apis/fluentd/v1alpha1/filter_types.go | 10 +++++----- apis/fluentd/v1alpha1/fluentd_types.go | 10 +++++----- apis/fluentd/v1alpha1/fluentdconfig_types.go | 10 +++++----- apis/fluentd/v1alpha1/output_types.go | 10 +++++----- cmd/fluent-manager/main.go | 8 ++++---- controllers/collector_controller.go | 12 ++++++------ controllers/fluentbit_controller.go | 12 ++++++------ controllers/fluentbitconfig_controller.go | 6 +++--- controllers/fluentd_controller.go | 6 +++--- controllers/fluentdconfig_controller.go | 16 ++++++++-------- controllers/suite_test.go | 4 ++-- pkg/filenotify/filenotify.go | 2 +- pkg/filenotify/fsnotify.go | 2 +- pkg/filenotify/poller.go | 2 +- pkg/fluentd/router/pluginstore.go | 4 ++-- pkg/operator/collector-statefulset.go | 4 ++-- pkg/utils/utils.go | 3 +-- 25 files changed, 74 insertions(+), 71 deletions(-) diff --git a/apis/fluentbit/v1alpha2/clusterfilter_types.go b/apis/fluentbit/v1alpha2/clusterfilter_types.go index 122abad85..a33a440e2 100644 --- a/apis/fluentbit/v1alpha2/clusterfilter_types.go +++ b/apis/fluentbit/v1alpha2/clusterfilter_types.go @@ -63,11 +63,11 @@ type FilterItem struct { Throttle *filter.Throttle `json:"throttle,omitempty"` // RewriteTag defines a RewriteTag configuration. RewriteTag *filter.RewriteTag `json:"rewriteTag,omitempty"` - //Aws defines a Aws configuration. + // Aws defines a Aws configuration. AWS *filter.AWS `json:"aws,omitempty"` - //Multiline defines a Multiline configuration. + // Multiline defines a Multiline configuration. Multiline *filter.Multiline `json:"multiline,omitempty"` - //CustomPlugin defines a Custom plugin configuration. + // CustomPlugin defines a Custom plugin configuration. CustomPlugin *custom.CustomPlugin `json:"customPlugin,omitempty"` } diff --git a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go index 6caadb456..de4fd8e5a 100644 --- a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go +++ b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go @@ -41,8 +41,8 @@ type FluentBitConfigSpec struct { OutputSelector metav1.LabelSelector `json:"outputSelector,omitempty"` // Select parser plugins ParserSelector metav1.LabelSelector `json:"parserSelector,omitempty"` - //If namespace is defined, then the configmap and secret for fluent-bit is in this namespace. - //If it is not defined, it is in the namespace of the fluentd-operator + // If namespace is defined, then the configmap and secret for fluent-bit is in this namespace. + // If it is not defined, it is in the namespace of the fluentd-operator Namespace *string `json:"namespace,omitempty"` } @@ -179,12 +179,14 @@ func (cfg ClusterFluentBitConfig) RenderParserConfig(sl plugins.SecretLoader, pa } // +kubebuilder:object:generate:=false + type Script struct { Name string Content string } // +kubebuilder:object:generate:=false + // ByName implements sort.Interface for []Script based on the Name field. type ByName []Script diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go index 4dd43e374..50f0f03aa 100644 --- a/apis/fluentbit/v1alpha2/clusteroutput_types.go +++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go @@ -72,7 +72,7 @@ type OutputSpec struct { DataDog *output.DataDog `json:"datadog,omitempty"` // Firehose defines Firehose Output configuration. Fireose *output.Firehose `json:"firehose,omitempty"` - //Splunk defines Splunk Output Configuration + // Splunk defines Splunk Output Configuration Splunk *output.Splunk `json:"splunk,omitempty"` // OpenSearch defines OpenSearch Output configuration. OpenSearch *output.OpenSearch `json:"opensearch,omitempty"` @@ -107,6 +107,7 @@ type ClusterOutputList struct { } // +kubebuilder:object:generate:=false + // OutputByName implements sort.Interface for []ClusterOutput based on the Name field. type OutputByName []ClusterOutput diff --git a/apis/fluentbit/v1alpha2/clusterparser_types.go b/apis/fluentbit/v1alpha2/clusterparser_types.go index 672272cb3..f7f0e3018 100644 --- a/apis/fluentbit/v1alpha2/clusterparser_types.go +++ b/apis/fluentbit/v1alpha2/clusterparser_types.go @@ -80,6 +80,7 @@ type ClusterParserList struct { } // +kubebuilder:object:generate:=false + // ParserByName implements sort.Interface for []ClusterParser based on the Name field. type ParserByName []ClusterParser diff --git a/apis/fluentbit/v1alpha2/doc.go b/apis/fluentbit/v1alpha2/doc.go index 2548193c6..c171bc6d3 100644 --- a/apis/fluentbit/v1alpha2/doc.go +++ b/apis/fluentbit/v1alpha2/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package // +groupName=fluentbit.fluent.io -package v1alpha2 // import "github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2" +package v1alpha2 // Package v1alpha2 import "github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2" diff --git a/apis/fluentd/v1alpha1/clusterfilter_types.go b/apis/fluentd/v1alpha1/clusterfilter_types.go index 2d8f70d48..ec12593f9 100644 --- a/apis/fluentd/v1alpha1/clusterfilter_types.go +++ b/apis/fluentd/v1alpha1/clusterfilter_types.go @@ -47,7 +47,7 @@ type ClusterFilter struct { Status ClusterFilterStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // ClusterFilterList contains a list of ClusterFilter type ClusterFilterList struct { diff --git a/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go b/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go index e2f0f4fd0..ea5f5fea1 100644 --- a/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go +++ b/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go @@ -75,7 +75,7 @@ type ClusterFluentdConfig struct { Status ClusterFluentdConfigStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // ClusterFluentdConfigList contains a list of ClusterFluentdConfig type ClusterFluentdConfigList struct { diff --git a/apis/fluentd/v1alpha1/clusteroutput_types.go b/apis/fluentd/v1alpha1/clusteroutput_types.go index 5b3d6138a..57311cb3c 100644 --- a/apis/fluentd/v1alpha1/clusteroutput_types.go +++ b/apis/fluentd/v1alpha1/clusteroutput_types.go @@ -47,7 +47,7 @@ type ClusterOutput struct { Status ClusterOutputStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // ClusterOutputList contains a list of ClusterOutput type ClusterOutputList struct { diff --git a/apis/fluentd/v1alpha1/filter_types.go b/apis/fluentd/v1alpha1/filter_types.go index a9f242c84..24accae99 100644 --- a/apis/fluentd/v1alpha1/filter_types.go +++ b/apis/fluentd/v1alpha1/filter_types.go @@ -32,10 +32,10 @@ type FilterStatus struct { // Important: Run "make" to regenerate code after modifying this file } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:resource:shortName=fdf -//+genclient +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:resource:shortName=fdf +// +genclient // Filter is the Schema for the filters API type Filter struct { @@ -46,7 +46,7 @@ type Filter struct { Status FilterStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // FilterList contains a list of Filter type FilterList struct { diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go index d9b517879..50b8cf83d 100644 --- a/apis/fluentd/v1alpha1/fluentd_types.go +++ b/apis/fluentd/v1alpha1/fluentd_types.go @@ -90,10 +90,10 @@ type FluentdStatus struct { State StatusState `json:"state,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:resource:shortName=fd -//+genclient +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:resource:shortName=fd +// +genclient // Fluentd is the Schema for the fluentds API type Fluentd struct { @@ -127,7 +127,7 @@ func (fd *Fluentd) RemoveFinalizer(finalizerName string) { fd.ObjectMeta.Finalizers = utils.RemoveString(fd.ObjectMeta.Finalizers, finalizerName) } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // FluentdList contains a list of Fluentd type FluentdList struct { diff --git a/apis/fluentd/v1alpha1/fluentdconfig_types.go b/apis/fluentd/v1alpha1/fluentdconfig_types.go index b55f7572f..cf5d98768 100644 --- a/apis/fluentd/v1alpha1/fluentdconfig_types.go +++ b/apis/fluentd/v1alpha1/fluentdconfig_types.go @@ -55,10 +55,10 @@ type FluentdConfigStatus struct { State StatusState `json:"state,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:resource:shortName=fdc -//+genclient +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:resource:shortName=fdc +// +genclient // FluentdConfig is the Schema for the fluentdconfigs API type FluentdConfig struct { @@ -69,7 +69,7 @@ type FluentdConfig struct { Status FluentdConfigStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // FluentdConfigList contains a list of FluentdConfig type FluentdConfigList struct { diff --git a/apis/fluentd/v1alpha1/output_types.go b/apis/fluentd/v1alpha1/output_types.go index 60ac1a754..2c450b071 100644 --- a/apis/fluentd/v1alpha1/output_types.go +++ b/apis/fluentd/v1alpha1/output_types.go @@ -35,10 +35,10 @@ type OutputStatus struct { // Important: Run "make" to regenerate code after modifying this file } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:resource:shortName=fdo -//+genclient +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:resource:shortName=fdo +// +genclient // Output is the Schema for the outputs API type Output struct { @@ -49,7 +49,7 @@ type Output struct { Status OutputStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // OutputList contains a list of Output type OutputList struct { diff --git a/cmd/fluent-manager/main.go b/cmd/fluent-manager/main.go index 7b0d89fd5..e64f0e3b3 100644 --- a/cmd/fluent-manager/main.go +++ b/cmd/fluent-manager/main.go @@ -39,7 +39,7 @@ import ( fluentdv1alpha1 "github.com/fluent/fluent-operator/apis/fluentd/v1alpha1" "github.com/fluent/fluent-operator/controllers" - //+kubebuilder:scaffold:imports + // +kubebuilder:scaffold:imports ) var ( @@ -52,7 +52,7 @@ func init() { utilruntime.Must(fluentbitv1alpha2.AddToScheme(scheme)) utilruntime.Must(fluentdv1alpha1.AddToScheme(scheme)) - //+kubebuilder:scaffold:scheme + // +kubebuilder:scaffold:scheme } func main() { @@ -131,7 +131,7 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "FluentBit") os.Exit(1) } - //+kubebuilder:scaffold:builder + // +kubebuilder:scaffold:builder if err = (&controllers.FluentdConfigReconciler{ Client: mgr.GetClient(), @@ -150,7 +150,7 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "Fluentd") os.Exit(1) } - //+kubebuilder:scaffold:builder + // +kubebuilder:scaffold:builder if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { setupLog.Error(err, "unable to set up health check") diff --git a/controllers/collector_controller.go b/controllers/collector_controller.go index ef68d5c8d..68dac2c37 100644 --- a/controllers/collector_controller.go +++ b/controllers/collector_controller.go @@ -41,12 +41,12 @@ type CollectorReconciler struct { Scheme *runtime.Scheme } -//+kubebuilder:rbac:groups=fluentbit.fluent.io,resources=fluentbits;fluentbitconfigs;collectors;inputs;filters;outputs,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=create -//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=create -//+kubebuilder:rbac:groups=core,resources=pods,verbs=get +// +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=fluentbits;fluentbitconfigs;collectors;inputs;filters;outputs,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=create +// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=create +// +kubebuilder:rbac:groups=core,resources=pods,verbs=get // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/fluentbit_controller.go b/controllers/fluentbit_controller.go index dd2244205..5bd31fe1c 100644 --- a/controllers/fluentbit_controller.go +++ b/controllers/fluentbit_controller.go @@ -44,12 +44,12 @@ type FluentBitReconciler struct { Namespaced bool } -//+kubebuilder:rbac:groups=fluentbit.fluent.io,resources=fluentbits;fluentbitconfigs;inputs;filters;outputs,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=create -//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=create -//+kubebuilder:rbac:groups=core,resources=pods,verbs=get +// +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=fluentbits;fluentbitconfigs;inputs;filters;outputs,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=create +// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=create +// +kubebuilder:rbac:groups=core,resources=pods,verbs=get // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/fluentbitconfig_controller.go b/controllers/fluentbitconfig_controller.go index 2b4ea3060..54a627cd8 100644 --- a/controllers/fluentbitconfig_controller.go +++ b/controllers/fluentbitconfig_controller.go @@ -43,9 +43,9 @@ type FluentBitConfigReconciler struct { Scheme *runtime.Scheme } -//+kubebuilder:rbac:groups=fluentbit.fluent.io,resources=clusterfluentbitconfigs,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=fluentbit.fluent.io,resources=clusterinputs;clusterfilters;clusteroutputs;clusterparsers,verbs=list -//+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=clusterfluentbitconfigs,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=clusterinputs;clusterfilters;clusteroutputs;clusterparsers,verbs=list +// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/fluentd_controller.go b/controllers/fluentd_controller.go index 9c1dc7905..5ed00e320 100644 --- a/controllers/fluentd_controller.go +++ b/controllers/fluentd_controller.go @@ -42,9 +42,9 @@ type FluentdReconciler struct { Scheme *runtime.Scheme } -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds/finalizers,verbs=update +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/fluentdconfig_controller.go b/controllers/fluentdconfig_controller.go index 01e355700..9183908f2 100644 --- a/controllers/fluentdconfig_controller.go +++ b/controllers/fluentdconfig_controller.go @@ -82,14 +82,14 @@ type FluentdConfigReconciler struct { Scheme *runtime.Scheme } -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentdconfigs,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=clusterfluentdconfigs,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=inputs;filters;outputs,verbs=list -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=clusterinputs;clusterfilters;clusteroutputs,verbs=list; -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds,verbs=list -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds/status,verbs=patch -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentdconfigs/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentdconfigs/finalizers,verbs=update +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentdconfigs,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=clusterfluentdconfigs,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=inputs;filters;outputs,verbs=list +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=clusterinputs;clusterfilters;clusteroutputs,verbs=list; +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds,verbs=list +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentds/status,verbs=patch +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentdconfigs/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=fluentd.fluent.io,resources=fluentdconfigs/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 244089470..195d28f53 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -31,7 +31,7 @@ import ( fluentbitv1alpha2 "github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2" fluentdv1alpha1 "github.com/fluent/fluent-operator/apis/fluentd/v1alpha1" - //+kubebuilder:scaffold:imports + // +kubebuilder:scaffold:imports ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to @@ -67,7 +67,7 @@ var _ = BeforeSuite(func() { err = fluentdv1alpha1.AddToScheme(scheme.Scheme) Expect(err).NotTo(HaveOccurred()) - //+kubebuilder:scaffold:scheme + // +kubebuilder:scaffold:scheme k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/filenotify/filenotify.go b/pkg/filenotify/filenotify.go index d87d7fc4c..856a60ccf 100644 --- a/pkg/filenotify/filenotify.go +++ b/pkg/filenotify/filenotify.go @@ -1,7 +1,7 @@ // Adapted from https://github.com/gohugoio/hugo // Apache License 2.0 // Copyright Hugo Authors -// + // Package filenotify provides a mechanism for watching file(s) for changes. // Generally leans on fsnotify, but provides a poll-based notifier which fsnotify does not support. // These are wrapped up in a common interface so that either can be used interchangeably in your code. diff --git a/pkg/filenotify/fsnotify.go b/pkg/filenotify/fsnotify.go index 84f0393f2..04bbad9db 100644 --- a/pkg/filenotify/fsnotify.go +++ b/pkg/filenotify/fsnotify.go @@ -1,7 +1,7 @@ // Adapted from https://github.com/gohugoio/hugo // Apache License 2.0 // Copyright Hugo Authors -// + // Package filenotify is adapted from https://github.com/moby/moby/tree/master/pkg/filenotify, Apache-2.0 License. // Hopefully this can be replaced with an external package sometime in the future, see https://github.com/fsnotify/fsnotify/issues/9 package filenotify diff --git a/pkg/filenotify/poller.go b/pkg/filenotify/poller.go index ea138ee26..abc34799c 100644 --- a/pkg/filenotify/poller.go +++ b/pkg/filenotify/poller.go @@ -1,7 +1,7 @@ // Adapted from https://github.com/gohugoio/hugo // Apache License 2.0 // Copyright Hugo Authors -// + // Package filenotify is adapted from https://github.com/moby/moby/tree/master/pkg/filenotify, Apache-2.0 License. // Hopefully this can be replaced with an external package sometime in the future, see https://github.com/fsnotify/fsnotify/issues/9 package filenotify diff --git a/pkg/fluentd/router/pluginstore.go b/pkg/fluentd/router/pluginstore.go index 94c7b2684..bb45b491a 100644 --- a/pkg/fluentd/router/pluginstore.go +++ b/pkg/fluentd/router/pluginstore.go @@ -30,7 +30,7 @@ type LabelRouter struct { Routes []*Route `json:"routes,omitempty"` } -// Each fluentd config instance will create a route pluginstore. +// NewRoutePlugin will create a route pluginstore for each fluentd config instance func (r *Route) NewRoutePlugin() (*params.PluginStore, error) { ps := params.NewPluginStore("route") childs := make([]*params.PluginStore, 0) @@ -83,7 +83,7 @@ func (r *Route) NewRoutePlugin() (*params.PluginStore, error) { return ps, nil } -// The global router to store routes +// NewGlobalRouter will create a global router to store routes func NewGlobalRouter(id string) *params.PluginStore { ps := params.NewPluginStore("match") ps.InsertPairs("@id", id) diff --git a/pkg/operator/collector-statefulset.go b/pkg/operator/collector-statefulset.go index 4d69f5db3..399d33548 100644 --- a/pkg/operator/collector-statefulset.go +++ b/pkg/operator/collector-statefulset.go @@ -11,7 +11,7 @@ import ( ) var ( - // Buffer path for single process + // DefaultBufferPath defines the buffer path for single process DefaultBufferPath = "/buffers/fluentbit/log" ) @@ -129,7 +129,7 @@ func MakefbStatefuset(co fluentbitv1alpha2.Collector) appsv1.StatefulSet { }) } - //Bind pvc + // Bind pvc statefulset.Spec.VolumeClaimTemplates = append(statefulset.Spec.VolumeClaimTemplates, MakeFluentbitPVC(co)) statefulset.Spec.Template.Spec.Containers[0].VolumeMounts = append(statefulset.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{ Name: fmt.Sprintf("%s-buffer-pvc", co.Name), diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 964a2f18a..b7d98a93e 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -2,7 +2,6 @@ package utils import ( "crypto/md5" - "hash" "strings" ) @@ -40,7 +39,7 @@ func ConcatString(slice []string, sep string) string { } func HashCode(msg string) string { - var h hash.Hash = md5.New() + var h = md5.New() h.Write([]byte(msg)) return string(h.Sum(nil)) }