Skip to content

Commit 0e942e3

Browse files
authored
Merge pull request #18 from fluxcd/fluxcd/pkg/runtime-v0.9.0
Update fluxcd/pkg/runtime to v0.9.0
2 parents 0a88ff3 + 2287fce commit 0e942e3

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARD
4040
### How to run the test suite
4141

4242
Prerequisites:
43-
* go >= 1.13
43+
* go >= 1.15
4444
* kubebuilder >= 2.3
4545
* kustomize >= 3.1
4646

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ifeq (, $(shell which controller-gen))
7171
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
7272
cd $$CONTROLLER_GEN_TMP_DIR ;\
7373
go mod init tmp ;\
74-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
74+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\
7575
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
7676
}
7777
CONTROLLER_GEN=$(GOBIN)/controller-gen

controllers/gitrepository_watcher.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
// GitRepositoryWatcher watches GitRepository objects for revision changes
3737
type GitRepositoryWatcher struct {
3838
client.Client
39-
Log logr.Logger
4039
Scheme *runtime.Scheme
4140
}
4241

@@ -72,7 +71,7 @@ func (r *GitRepositoryWatcher) Reconcile(ctx context.Context, req ctrl.Request)
7271
// list artifact content
7372
files, err := ioutil.ReadDir(tmpDir)
7473
if err != nil {
75-
return ctrl.Result{}, fmt.Errorf("faild to list files, error: %w", err)
74+
return ctrl.Result{}, fmt.Errorf("failed to list files, error: %w", err)
7675
}
7776

7877
// do something with the artifact content

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/fluxcd/source-watcher
33
go 1.15
44

55
require (
6-
github.com/fluxcd/pkg/runtime v0.8.5
6+
github.com/fluxcd/pkg/runtime v0.9.0
77
github.com/fluxcd/pkg/untar v0.0.5
88
github.com/fluxcd/source-controller/api v0.9.1
99
github.com/go-logr/logr v0.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
9696
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
9797
github.com/fluxcd/pkg/apis/meta v0.8.0 h1:wqWpUsxhKHB1ZztcvOz+vnyhdKW9cWmjFp8Vci/XOdk=
9898
github.com/fluxcd/pkg/apis/meta v0.8.0/go.mod h1:yHuY8kyGHYz22I0jQzqMMGCcHViuzC/WPdo9Gisk8Po=
99-
github.com/fluxcd/pkg/runtime v0.8.5 h1:ynh8fszbLQ3QSisQBNOABEUTnvt+/QfCdaL6gOJQcoQ=
100-
github.com/fluxcd/pkg/runtime v0.8.5/go.mod h1:JD0eZIn5xkTeHHQUWXSqJPIh/ecO0d0qrUKbSVHnpnw=
99+
github.com/fluxcd/pkg/runtime v0.9.0 h1:4ZnkyWg+MTEh6ne7E4DwS77nGsih7b5YscwVRIu+XfI=
100+
github.com/fluxcd/pkg/runtime v0.9.0/go.mod h1:JD0eZIn5xkTeHHQUWXSqJPIh/ecO0d0qrUKbSVHnpnw=
101101
github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk=
102102
github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw=
103103
github.com/fluxcd/source-controller/api v0.9.1 h1:kaL+tBflccsuj3NDESPPQyKXlZXlAgyNoT2nYY02JAE=

0 commit comments

Comments
 (0)