Skip to content

Commit 018d1cf

Browse files
authored
Merge pull request #21 from fluxcd/controller-runtime-v0.9
Update dependencies
2 parents bebe0f5 + 55162eb commit 018d1cf

File tree

7 files changed

+158
-117
lines changed

7 files changed

+158
-117
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Go
2323
uses: actions/setup-go@v2
2424
with:
25-
go-version: 1.15.x
25+
go-version: 1.16.x
2626
- name: Setup Kubebuilder
2727
uses: fluxcd/pkg/actions/kubebuilder@main
2828
- name: Run tests

CONTRIBUTING.md

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

4242
Prerequisites:
43-
* go >= 1.15
44-
* kubebuilder >= 2.3
45-
* kustomize >= 3.1
43+
* go >= 1.16
44+
* kubebuilder >= 3.0
45+
* kustomize >= 4.0
4646

4747
You can run the unit tests by simply doing
4848

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.15-alpine as builder
1+
FROM golang:1.16-alpine as builder
22

33
WORKDIR /workspace
44

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.4.1 ;\
74+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
7575
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
7676
}
7777
CONTROLLER_GEN=$(GOBIN)/controller-gen

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/fluxcd/source-watcher
22

3-
go 1.15
3+
go 1.16
44

55
require (
6-
github.com/fluxcd/pkg/runtime v0.9.0
6+
github.com/fluxcd/pkg/runtime v0.12.0
77
github.com/fluxcd/pkg/untar v0.0.5
8-
github.com/fluxcd/source-controller/api v0.9.1
9-
github.com/go-logr/logr v0.3.0
8+
github.com/fluxcd/source-controller/api v0.15.0
9+
github.com/go-logr/logr v0.4.0
1010
github.com/spf13/pflag v1.0.5
11-
k8s.io/apimachinery v0.20.2
12-
k8s.io/client-go v0.20.2
13-
sigs.k8s.io/controller-runtime v0.8.3
11+
k8s.io/apimachinery v0.21.1
12+
k8s.io/client-go v0.21.1
13+
sigs.k8s.io/controller-runtime v0.9.0
1414
)

go.sum

Lines changed: 142 additions & 102 deletions
Large diffs are not rendered by default.

main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
flag "github.com/spf13/pflag"
2323
"k8s.io/apimachinery/pkg/runtime"
24+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2425
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
2526
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
2627
ctrl "sigs.k8s.io/controller-runtime"
@@ -37,8 +38,8 @@ var (
3738
)
3839

3940
func init() {
40-
_ = clientgoscheme.AddToScheme(scheme)
41-
_ = sourcev1.AddToScheme(scheme)
41+
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
42+
utilruntime.Must(sourcev1.AddToScheme(scheme))
4243

4344
// +kubebuilder:scaffold:scheme
4445
}

0 commit comments

Comments
 (0)