Skip to content

Commit 113eb03

Browse files
TMP
Co-authored-by: Tom Wieczorek <[email protected]> Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
1 parent 106a006 commit 113eb03

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.golangci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ linters:
8181
template-path: .go-header.txt
8282
revive:
8383
rules:
84+
# This forbids to name variables "close", which seems natural for "close" functions.
8485
- name: redefines-builtin-id
8586
disabled: true
8687
testifylint:
8788
enable-all: true
8889
disable:
89-
- require-error
90-
- suite-thelper
90+
- require-error # flags too many legitimate use cases
91+
- suite-thelper # flags too many legitimate use cases
9192
exclusions:
9293
generated: lax
9394
presets:

cmd/reset/reset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (c *command) reset() error {
6464

6565
k0sStatus, _ := status.GetStatusInfo(c.K0sVars.StatusSocketPath)
6666
if k0sStatus != nil && k0sStatus.Pid != 0 {
67-
return errors.New("k0s seems to be running! please stop k0s before reset")
67+
return errors.New("k0s seems to be running, please stop k0s before reset")
6868
}
6969

7070
nodeCfg, err := c.K0sVars.NodeConfig()

pkg/component/controller/extensions_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ func (cr *ChartReconciler) updateOrInstallChart(ctx context.Context, chart helmv
323323
}
324324

325325
func (cr *ChartReconciler) chartNeedsUpgrade(chart helmv1beta1.Chart) bool {
326-
return (chart.Status.Namespace != chart.Spec.Namespace ||
326+
return chart.Status.Namespace != chart.Spec.Namespace ||
327327
chart.Status.ReleaseName != chart.Spec.ReleaseName ||
328328
chart.Status.Version != chart.Spec.Version ||
329-
chart.Status.ValuesHash != chart.Spec.HashValues())
329+
chart.Status.ValuesHash != chart.Spec.HashValues()
330330
}
331331

332332
// updateStatus updates the status of the chart with the given release information. This function

0 commit comments

Comments
 (0)