Skip to content

Commit

Permalink
style: fix code style
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Lüders committed Nov 28, 2023
1 parent 909b7cf commit 0116d3e
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 34 deletions.
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_kube_controller_manager_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
// ### Changes
// None
func (g *Gatherer) GatherKubeControllerManagerLogs(ctx context.Context) ([]record.Record, []error) {
containersFilter := common.LogResourceFilter{
containersFilter := &common.LogResourceFilter{
Namespace: "openshift-kube-controller-manager",
LabelSelector: "app=kube-controller-manager",
ContainerNameRegexFilter: "kube-controller-manager",
Expand All @@ -65,8 +65,8 @@ func (g *Gatherer) GatherKubeControllerManagerLogs(ctx context.Context) ([]recor
return records, nil
}

func getKubeControllerManagerLogsMessagesFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getKubeControllerManagerLogsMessagesFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{
"Internal error occurred: error resolving resource",
"syncing garbage collector with updated resources from discovery",
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_openshift_apiserver_operator_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
// ### Changes
// None
func (g *Gatherer) GatherOpenShiftAPIServerOperatorLogs(ctx context.Context) ([]record.Record, []error) {
containersFilter := common.LogResourceFilter{
containersFilter := &common.LogResourceFilter{
Namespace: "openshift-apiserver-operator",
LabelSelector: "app=openshift-apiserver-operator",
}
Expand All @@ -61,8 +61,8 @@ func (g *Gatherer) GatherOpenShiftAPIServerOperatorLogs(ctx context.Context) ([]
return records, nil
}

func getAPIServerOperatorLogsMessagesFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getAPIServerOperatorLogsMessagesFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{
"the server has received too many requests and has asked us",
"because serving request timed out and response had been started",
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_openshift_authentication_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
// ### Changes
// None
func (g *Gatherer) GatherOpenshiftAuthenticationLogs(ctx context.Context) ([]record.Record, []error) {
containersFilter := common.LogResourceFilter{
containersFilter := &common.LogResourceFilter{
Namespace: "openshift-authentication",
LabelSelector: "app=oauth-openshift",
}
Expand All @@ -61,8 +61,8 @@ func (g *Gatherer) GatherOpenshiftAuthenticationLogs(ctx context.Context) ([]rec
return records, nil
}

func getOpenshiftAuthenticationLogsMessagesFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getOpenshiftAuthenticationLogsMessagesFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{
"AuthenticationError: invalid resource name",
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_openshift_sdn_controller_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import (
// ### Changes
// None
func (g *Gatherer) GatherOpenshiftSDNControllerLogs(ctx context.Context) ([]record.Record, []error) {
containersFilter := common.LogResourceFilter{
containersFilter := &common.LogResourceFilter{
Namespace: "openshift-sdn",
LabelSelector: "app=sdn-controller",
}
Expand All @@ -72,8 +72,8 @@ func (g *Gatherer) GatherOpenshiftSDNControllerLogs(ctx context.Context) ([]reco
return records, nil
}

func getSDNControllerLogsMessagesFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getSDNControllerLogsMessagesFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{
`Node.+is not Ready`,
`Node.+may be offline... retrying`,
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_openshift_sdn_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
// ### Changes
// None
func (g *Gatherer) GatherOpenshiftSDNLogs(ctx context.Context) ([]record.Record, []error) {
containersFilter := common.LogResourceFilter{
containersFilter := &common.LogResourceFilter{
Namespace: "openshift-sdn",
LabelSelector: "app=sdn",
}
Expand All @@ -64,8 +64,8 @@ func (g *Gatherer) GatherOpenshiftSDNLogs(ctx context.Context) ([]record.Record,
return records, nil
}

func getGatherOpenshiftSDNLogsMessageFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getGatherOpenshiftSDNLogsMessageFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{
"Got OnEndpointsUpdate for unknown Endpoints",
"Got OnEndpointsDelete for unknown Endpoints",
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_sap_vsystem_iptables_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func gatherSAPLicenseManagementLogs(
var errs []error

for _, item := range datahubs {
containersFilter := common.LogResourceFilter{
containersFilter := &common.LogResourceFilter{
Namespace: item.GetNamespace(),
ContainerNameRegexFilter: "^vsystem-iptables$",
}
Expand All @@ -107,8 +107,8 @@ func gatherSAPLicenseManagementLogs(
return records, errs
}

func getSAPLicenseManagementLogsMessageFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getSAPLicenseManagementLogsMessageFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{
"can't initialize iptables table",
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/clusterconfig/gather_scheduler_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (g *Gatherer) GatherSchedulerLogs(ctx context.Context) ([]record.Record, []

func gatherSchedulerLogs(ctx context.Context, coreClient corev1client.CoreV1Interface) ([]record.Record, []error) {
records, err := common.CollectLogsFromContainers(ctx, coreClient,
common.LogResourceFilter{
&common.LogResourceFilter{
Namespace: "openshift-kube-scheduler",
LabelSelector: "app=openshift-kube-scheduler",
},
Expand All @@ -62,8 +62,8 @@ func gatherSchedulerLogs(ctx context.Context, coreClient corev1client.CoreV1Inte
return records, nil
}

func getSchedulerLogsMessagesFilter() common.LogMessagesFilter {
return common.LogMessagesFilter{
func getSchedulerLogsMessagesFilter() *common.LogMessagesFilter {
return &common.LogMessagesFilter{
MessagesToSearch: []string{"PodTopologySpread"},
SinceSeconds: logDefaultSinceSeconds,
LimitBytes: logDefaultLimitBytes,
Expand Down
6 changes: 3 additions & 3 deletions pkg/gatherers/common/gather_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ type FilterLogOption func(line string) bool
func CollectLogsFromContainers( //nolint:gocyclo
ctx context.Context,
coreClient v1.CoreV1Interface,
containersFilter LogResourceFilter,
messagesFilter LogMessagesFilter,
containersFilter *LogResourceFilter,
messagesFilter *LogMessagesFilter,
buildLogFileName func(namespace, podName, containerName string) string,
) ([]record.Record, error) {
if buildLogFileName == nil {
Expand Down Expand Up @@ -245,7 +245,7 @@ func FilterLogFromScanner(scanner *bufio.Scanner, filter FilterLogOption, cb Fil
return strings.Join(result, "\n"), nil
}

func podLogOptions(containerName string, messagesFilter LogMessagesFilter) *corev1.PodLogOptions {
func podLogOptions(containerName string, messagesFilter *LogMessagesFilter) *corev1.PodLogOptions {
sinceSeconds := &messagesFilter.SinceSeconds
if messagesFilter.SinceSeconds == 0 {
sinceSeconds = nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/gatherers/common/gather_logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ func testGatherLogs(t *testing.T, regexSearch bool, stringToSearch string, shoul
records, err := CollectLogsFromContainers(
ctx,
coreClient,
LogResourceFilter{
&LogResourceFilter{
Namespace: testPodName,
},
LogMessagesFilter{
&LogMessagesFilter{
MessagesToSearch: []string{
stringToSearch,
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/gatherers/conditional/gather_containers_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (g *Gatherer) gatherContainersLogs(
}
}

logContainersFilter := common.LogResourceFilter{
logContainersFilter := &common.LogResourceFilter{
Namespace: podNamespace,
FieldSelector: fmt.Sprintf("metadata.name=%s", podName),
}
Expand All @@ -111,7 +111,7 @@ func (g *Gatherer) gatherContainersLogs(
ctx,
coreClient,
logContainersFilter,
common.LogMessagesFilter{
&common.LogMessagesFilter{
TailLines: params.TailLines,
Previous: params.Previous,
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/gatherers/conditional/gather_logs_of_namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ func (g *Gatherer) gatherLogsOfNamespace(ctx context.Context, namespace string,
records, err := common.CollectLogsFromContainers(
ctx,
coreClient,
common.LogResourceFilter{
&common.LogResourceFilter{
Namespace: namespace,
MaxNamespaceContainers: 64, // arbitrary fixed value
},
common.LogMessagesFilter{
&common.LogMessagesFilter{
TailLines: tailLines,
},
func(namespace string, podName string, containerName string) string {
Expand Down
9 changes: 5 additions & 4 deletions pkg/gatherers/conditional/gather_pod_logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ func (g *Gatherer) BuildGatherPodLogs(paramsInterface interface{}) (gatherers.Ga
return nil, []error{err}
}
coreClient := kubeClient.CoreV1()
return g.gatherPodLogs(ctx, params, coreClient)
return g.gatherPodLogs(ctx, &params, coreClient)
},
}, nil
}

func (g *Gatherer) gatherPodLogs(ctx context.Context, params GatherPodLogsParams, coreClient v1.CoreV1Interface) ([]record.Record, []error) {
func (g *Gatherer) gatherPodLogs(ctx context.Context, params *GatherPodLogsParams,
coreClient v1.CoreV1Interface) ([]record.Record, []error) {
records, err := common.CollectLogsFromContainers(
ctx,
coreClient,
params.ResourceFilter,
params.LogMessageFilter,
&params.ResourceFilter,
&params.LogMessageFilter,
func(namespace string, podName string, containerName string) string {
filename := "current.log"
if params.LogMessageFilter.Previous {
Expand Down

0 comments on commit 0116d3e

Please sign in to comment.