diff --git a/.golangci.yaml b/.golangci.yaml index 97599a9df..33beae434 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -10,9 +10,9 @@ linters: enable: - asciicheck - errorlint - - golint - gosec - prealloc + - revive - stylecheck - unconvert - unparam diff --git a/apis/duck/v1beta1/destination.go b/apis/duck/v1beta1/destination.go index fe0f5d171..4e369b872 100644 --- a/apis/duck/v1beta1/destination.go +++ b/apis/duck/v1beta1/destination.go @@ -136,10 +136,7 @@ func (dest *Destination) GetRef() *corev1.ObjectReference { if dest.Ref != nil { return dest.Ref } - if ref := dest.deprecatedObjectReference(); ref != nil { - return ref - } - return nil + return dest.deprecatedObjectReference() } func validateDestinationRef(ref corev1.ObjectReference) *apis.FieldError { diff --git a/leaderelection/chaosduck/main.go b/leaderelection/chaosduck/main.go index 9dc132908..686b36e01 100644 --- a/leaderelection/chaosduck/main.go +++ b/leaderelection/chaosduck/main.go @@ -47,8 +47,8 @@ type components map[string]sets.String var ( disabledComponents kflag.StringSet disabledComponentsRegex kflag.StringSet - tributePeriod time.Duration = 20 * time.Second - tributeFactor = 2.0 + tributePeriod = 20 * time.Second + tributeFactor = 2.0 ) func init() {