From 2287fce6b57b5e072c1543388cdba3dd016a4df3 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Wed, 24 Mar 2021 14:56:00 +0200 Subject: [PATCH] Update fluxcd/pkg/runtime to v0.9.0 Signed-off-by: Stefan Prodan --- CONTRIBUTING.md | 2 +- Makefile | 2 +- controllers/gitrepository_watcher.go | 3 +-- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c805334..47dabbf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,7 @@ meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARD ### How to run the test suite Prerequisites: -* go >= 1.13 +* go >= 1.15 * kubebuilder >= 2.3 * kustomize >= 3.1 diff --git a/Makefile b/Makefile index 6b35580..e9d6395 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ ifeq (, $(shell which controller-gen)) CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\ cd $$CONTROLLER_GEN_TMP_DIR ;\ go mod init tmp ;\ - go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\ + go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\ rm -rf $$CONTROLLER_GEN_TMP_DIR ;\ } CONTROLLER_GEN=$(GOBIN)/controller-gen diff --git a/controllers/gitrepository_watcher.go b/controllers/gitrepository_watcher.go index e4904e8..7c94b30 100644 --- a/controllers/gitrepository_watcher.go +++ b/controllers/gitrepository_watcher.go @@ -36,7 +36,6 @@ import ( // GitRepositoryWatcher watches GitRepository objects for revision changes type GitRepositoryWatcher struct { client.Client - Log logr.Logger Scheme *runtime.Scheme } @@ -72,7 +71,7 @@ func (r *GitRepositoryWatcher) Reconcile(ctx context.Context, req ctrl.Request) // list artifact content files, err := ioutil.ReadDir(tmpDir) if err != nil { - return ctrl.Result{}, fmt.Errorf("faild to list files, error: %w", err) + return ctrl.Result{}, fmt.Errorf("failed to list files, error: %w", err) } // do something with the artifact content diff --git a/go.mod b/go.mod index 64a7513..bf2709a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/fluxcd/source-watcher go 1.15 require ( - github.com/fluxcd/pkg/runtime v0.8.5 + github.com/fluxcd/pkg/runtime v0.9.0 github.com/fluxcd/pkg/untar v0.0.5 github.com/fluxcd/source-controller/api v0.9.1 github.com/go-logr/logr v0.3.0 diff --git a/go.sum b/go.sum index 52d9f2f..533c6c4 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fluxcd/pkg/apis/meta v0.8.0 h1:wqWpUsxhKHB1ZztcvOz+vnyhdKW9cWmjFp8Vci/XOdk= github.com/fluxcd/pkg/apis/meta v0.8.0/go.mod h1:yHuY8kyGHYz22I0jQzqMMGCcHViuzC/WPdo9Gisk8Po= -github.com/fluxcd/pkg/runtime v0.8.5 h1:ynh8fszbLQ3QSisQBNOABEUTnvt+/QfCdaL6gOJQcoQ= -github.com/fluxcd/pkg/runtime v0.8.5/go.mod h1:JD0eZIn5xkTeHHQUWXSqJPIh/ecO0d0qrUKbSVHnpnw= +github.com/fluxcd/pkg/runtime v0.9.0 h1:4ZnkyWg+MTEh6ne7E4DwS77nGsih7b5YscwVRIu+XfI= +github.com/fluxcd/pkg/runtime v0.9.0/go.mod h1:JD0eZIn5xkTeHHQUWXSqJPIh/ecO0d0qrUKbSVHnpnw= github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk= github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw= github.com/fluxcd/source-controller/api v0.9.1 h1:kaL+tBflccsuj3NDESPPQyKXlZXlAgyNoT2nYY02JAE=