Skip to content

Commit 106a237

Browse files
majst01majst01
authored
update controller-runtime, kube-builder and controller-gen (#310)
1 parent 4bdbc6d commit 106a237

File tree

4 files changed

+297
-131
lines changed

4 files changed

+297
-131
lines changed

‎Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= r.metal-stack.io/postgreslet
44

5-
# `crd:crdVersions=v1`: Produce apiextensions.k8s.io/v1 CRD
6-
# `trivialVersions=true`: Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
7-
CRD_OPTIONS ?= "crd:crdVersions=v1,trivialVersions=true"
8-
95
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
106
ifeq (,$(shell go env GOBIN))
117
GOBIN=$(shell go env GOPATH)/bin
@@ -76,7 +72,7 @@ cleanup: manifests
7672

7773
# Generate manifests e.g. CRD, RBAC etc.
7874
manifests: controller-gen
79-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
75+
$(CONTROLLER_GEN) crd rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
8076

8177
# Run go fmt against code
8278
fmt:
@@ -122,7 +118,7 @@ ifeq (, $(shell which controller-gen))
122118
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
123119
cd $$CONTROLLER_GEN_TMP_DIR ;\
124120
go mod init tmp ;\
125-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.1 ;\
121+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 ;\
126122
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
127123
}
128124
CONTROLLER_GEN=$(GOBIN)/controller-gen
@@ -201,7 +197,7 @@ install-configmap-sidecars:
201197
crd-cwnp-for-testing:
202198
curl https://raw.githubusercontent.com/metal-stack/firewall-controller/master/config/crd/bases/metal-stack.io_clusterwidenetworkpolicies.yaml -o external/test/crd-clusterwidenetworkpolicy.yaml
203199

204-
KUBEBUILDER_VERSION:=2.3.2
200+
KUBEBUILDER_VERSION:=3.2.0
205201
kubebuilder:
206202
ifeq (,$(wildcard ~/.kubebuilder/${KUBEBUILDER_VERSION}))
207203
{ \

‎config/crd/bases/database.fits.cloud_postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: postgres.database.fits.cloud
1010
spec:

‎go.mod

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,89 +3,90 @@ module github.com/fi-ts/postgreslet
33
go 1.17
44

55
require (
6-
github.com/go-logr/logr v0.4.0
7-
github.com/google/uuid v1.2.0
6+
github.com/go-logr/logr v1.2.2
7+
github.com/google/uuid v1.3.0
88
github.com/metal-stack/firewall-controller v1.1.2
99
github.com/metal-stack/v v1.0.3
1010
github.com/onsi/ginkgo v1.16.5
1111
github.com/onsi/gomega v1.17.0
12-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.49.0
13-
github.com/spf13/viper v1.8.1
12+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1
13+
github.com/spf13/viper v1.10.1
1414
github.com/zalando/postgres-operator v1.7.0
15-
inet.af/netaddr v0.0.0-20210718074554-06ca8145d722
16-
k8s.io/api v0.22.2
17-
k8s.io/apiextensions-apiserver v0.22.2
18-
k8s.io/apimachinery v0.22.2
19-
k8s.io/client-go v0.22.2
20-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
21-
sigs.k8s.io/controller-runtime v0.9.2
15+
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
16+
k8s.io/api v0.23.0
17+
k8s.io/apiextensions-apiserver v0.23.0
18+
k8s.io/apimachinery v0.23.0
19+
k8s.io/client-go v0.23.0
20+
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
21+
sigs.k8s.io/controller-runtime v0.11.0
2222
)
2323

2424
require (
25-
cloud.google.com/go v0.81.0 // indirect
25+
cloud.google.com/go v0.99.0 // indirect
2626
github.com/beorn7/perks v1.0.1 // indirect
27-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
27+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2828
github.com/davecgh/go-spew v1.1.1 // indirect
29-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
30-
github.com/fsnotify/fsnotify v1.4.9 // indirect
31-
github.com/go-logr/zapr v0.4.0 // indirect
29+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
30+
github.com/fsnotify/fsnotify v1.5.1 // indirect
31+
github.com/go-logr/zapr v1.2.0 // indirect
3232
github.com/gogo/protobuf v1.3.2 // indirect
3333
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3434
github.com/golang/protobuf v1.5.2 // indirect
35-
github.com/google/go-cmp v0.5.5 // indirect
35+
github.com/google/go-cmp v0.5.6 // indirect
3636
github.com/google/gofuzz v1.2.0 // indirect
3737
github.com/googleapis/gnostic v0.5.5 // indirect
3838
github.com/hashicorp/errwrap v1.0.0 // indirect
3939
github.com/hashicorp/go-multierror v1.1.0 // indirect
4040
github.com/hashicorp/hcl v1.0.0 // indirect
4141
github.com/imdario/mergo v0.3.12 // indirect
42-
github.com/json-iterator/go v1.1.11 // indirect
42+
github.com/json-iterator/go v1.1.12 // indirect
4343
github.com/kr/text v0.2.0 // indirect
4444
github.com/magiconair/properties v1.8.5 // indirect
4545
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
4646
github.com/metal-stack/metal-lib v0.7.2 // indirect
47-
github.com/mitchellh/mapstructure v1.4.1 // indirect
47+
github.com/mitchellh/mapstructure v1.4.3 // indirect
4848
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
49-
github.com/modern-go/reflect2 v1.0.1 // indirect
49+
github.com/modern-go/reflect2 v1.0.2 // indirect
5050
github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d // indirect
5151
github.com/nxadm/tail v1.4.8 // indirect
52-
github.com/pelletier/go-toml v1.9.3 // indirect
52+
github.com/pelletier/go-toml v1.9.4 // indirect
5353
github.com/pkg/errors v0.9.1 // indirect
5454
github.com/prometheus/client_golang v1.11.0 // indirect
5555
github.com/prometheus/client_model v0.2.0 // indirect
56-
github.com/prometheus/common v0.26.0 // indirect
56+
github.com/prometheus/common v0.28.0 // indirect
5757
github.com/prometheus/procfs v0.6.0 // indirect
5858
github.com/sirupsen/logrus v1.8.1 // indirect
5959
github.com/spf13/afero v1.6.0 // indirect
60-
github.com/spf13/cast v1.3.1 // indirect
60+
github.com/spf13/cast v1.4.1 // indirect
6161
github.com/spf13/jwalterweatherman v1.1.0 // indirect
6262
github.com/spf13/pflag v1.0.5 // indirect
6363
github.com/subosito/gotenv v1.2.0 // indirect
6464
go.uber.org/atomic v1.7.0 // indirect
6565
go.uber.org/multierr v1.6.0 // indirect
66-
go.uber.org/zap v1.17.0 // indirect
67-
go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
68-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect
69-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
70-
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
71-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
72-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
73-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
74-
golang.org/x/text v0.3.6 // indirect
66+
go.uber.org/zap v1.19.1 // indirect
67+
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
68+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
69+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
70+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
71+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
72+
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
73+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
74+
golang.org/x/text v0.3.7 // indirect
7575
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
7676
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
7777
google.golang.org/appengine v1.6.7 // indirect
78-
google.golang.org/protobuf v1.26.0 // indirect
78+
google.golang.org/protobuf v1.27.1 // indirect
7979
gopkg.in/inf.v0 v0.9.1 // indirect
80-
gopkg.in/ini.v1 v1.62.0 // indirect
80+
gopkg.in/ini.v1 v1.66.2 // indirect
8181
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8282
gopkg.in/yaml.v2 v2.4.0 // indirect
8383
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
84-
k8s.io/component-base v0.22.2 // indirect
85-
k8s.io/klog/v2 v2.9.0 // indirect
86-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
87-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
88-
sigs.k8s.io/yaml v1.2.0 // indirect
84+
k8s.io/component-base v0.23.0 // indirect
85+
k8s.io/klog/v2 v2.30.0 // indirect
86+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
87+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
88+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
89+
sigs.k8s.io/yaml v1.3.0 // indirect
8990
)
9091

9192
replace github.com/zalando/postgres-operator v1.7.0 => github.com/ermajn/postgres-operator v1.0.1-0.20211123085256-711648b7fdde

0 commit comments

Comments
 (0)