From ad486d89b1ba120bb593f8cf31c817b2f347d6ce Mon Sep 17 00:00:00 2001
From: Benjamin Pineau <ben.pineau@gmail.com>
Date: Sun, 29 Nov 2020 19:24:53 +0100
Subject: [PATCH] Linter fixes and go version bump

Small changes:
* Upgrade to latest go and golint version, to ease development
* Explicitely ask for watch bookmarks where possible
* Filter out `managedFields` (k8s 1.19 noise) as this severely bloat archives, and has little value being backuped

Not sure if we should keep the `mispell` linter (which just broke
travis tests on master), as they are of low value.
---
 .travis.yml                  | 2 +-
 Dockerfile                   | 2 +-
 Makefile                     | 2 +-
 go.mod                       | 2 +-
 pkg/controller/controller.go | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c20be91..2966946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-  - "1.13.x"
+  - "1.15.x"
 
 # needed for e2e tests (so we can start minikube)
 sudo: required
diff --git a/Dockerfile b/Dockerfile
index f92fc6e..5e11d1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13 as builder
+FROM golang:1.15 as builder
 WORKDIR /go/src/github.com/bpineau/katafygio
 COPY . .
 RUN make build
diff --git a/Makefile b/Makefile
index e33d932..8f33689 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GOLANGCI_VERSION=1.21.0
+GOLANGCI_VERSION=1.33.0
 export GO111MODULE := on
 
 all: build
diff --git a/go.mod b/go.mod
index 6baf3f0..0750273 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/bpineau/katafygio
 
-go 1.13
+go 1.15
 
 require (
 	github.com/ghodss/yaml v1.0.0
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 83756c6..7b70a16 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -28,7 +28,7 @@ import (
 var (
 	maxProcessRetry = 6
 	canaryKey       = "$katafygio canary$"
-	unexported      = []string{"selfLink", "uid", "resourceVersion", "generation"}
+	unexported      = []string{"selfLink", "uid", "resourceVersion", "generation", "managedFields"}
 )
 
 // Interface describe a standard kubernetes controller
@@ -77,7 +77,7 @@ func New(client cache.ListerWatcher,
 	excludednamespace []string,
 ) *Controller {
 
-	selector := metav1.ListOptions{LabelSelector: filter, ResourceVersion: "0"}
+	selector := metav1.ListOptions{LabelSelector: filter, ResourceVersion: "0", AllowWatchBookmarks: true}
 	lw := &cache.ListWatch{
 		ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 			return client.List(selector)
@@ -234,7 +234,7 @@ func (c *Controller) processItem(key string) error {
 		for _, nsre := range c.excludedns {
 			if nsre.MatchString(namespace) {
 				// Rely on the background sync to delete these excluded files if
-				// we previously had aquired them
+				// we previously had acquired them
 				return nil
 			}
 		}