Skip to content

Commit 98e8df7

Browse files
(go/v3 and config-gen alpha command) Update controller-runtime dep from v0.11.2 to v0.12.1
1 parent c7d57aa commit 98e8df7

File tree

42 files changed

+303
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+303
-336
lines changed

go.mod

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ go 1.17
44

55
require (
66
github.com/cloudflare/cfssl v1.5.0 // for `kubebuilder alpha config-gen`
7-
github.com/gobuffalo/flect v0.2.3
7+
github.com/gobuffalo/flect v0.2.5
88
github.com/joelanford/go-apidiff v0.1.0
99
github.com/onsi/ginkgo v1.16.5
10-
github.com/onsi/gomega v1.17.0
10+
github.com/onsi/gomega v1.18.1
1111
github.com/sirupsen/logrus v1.8.1
1212
github.com/spf13/afero v1.6.0
13-
github.com/spf13/cobra v1.2.1
13+
github.com/spf13/cobra v1.4.0
1414
github.com/spf13/pflag v1.0.5
15-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff
16-
k8s.io/apimachinery v0.23.5 // for `kubebuilder alpha config-gen`
17-
sigs.k8s.io/controller-runtime v0.11.2
18-
sigs.k8s.io/controller-tools v0.8.0 // for `kubebuilder alpha config-gen`
15+
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717
16+
k8s.io/apimachinery v0.24.0 // for `kubebuilder alpha config-gen`
17+
sigs.k8s.io/controller-runtime v0.12.1
18+
sigs.k8s.io/controller-tools v0.9.0 // for `kubebuilder alpha config-gen`
1919
sigs.k8s.io/kustomize/kyaml v0.13.6 // for `kubebuilder alpha config-gen`
2020
sigs.k8s.io/yaml v1.3.0
2121
)
@@ -37,7 +37,6 @@ require (
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/golang/protobuf v1.5.2 // indirect
3939
github.com/google/certificate-transparency-go v1.0.21 // indirect
40-
github.com/google/go-cmp v0.5.6 // indirect
4140
github.com/google/gofuzz v1.1.0 // indirect
4241
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4342
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -62,11 +61,11 @@ require (
6261
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
6362
github.com/zmap/zcrypto v0.0.0-20200911161511-43ff0ea04f21 // indirect
6463
github.com/zmap/zlint/v2 v2.2.1 // indirect
65-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
64+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
6665
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
67-
golang.org/x/mod v0.4.2 // indirect
68-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
69-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
66+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
67+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
68+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
7069
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7170
google.golang.org/protobuf v1.27.1 // indirect
7271
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -76,11 +75,11 @@ require (
7675
gopkg.in/warnings.v0 v0.1.2 // indirect
7776
gopkg.in/yaml.v2 v2.4.0 // indirect
7877
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
79-
k8s.io/api v0.23.5 // indirect
80-
k8s.io/apiextensions-apiserver v0.23.5 // indirect
81-
k8s.io/klog/v2 v2.30.0 // indirect
82-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
83-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
84-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
78+
k8s.io/api v0.24.0 // indirect
79+
k8s.io/apiextensions-apiserver v0.24.0 // indirect
80+
k8s.io/klog/v2 v2.60.1 // indirect
81+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
82+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
83+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
8584
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
8685
)

go.sum

Lines changed: 66 additions & 59 deletions
Large diffs are not rendered by default.

pkg/cli/alpha/config-gen/testdata/componentconfig/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
type: object
4848
served: true
4949
storage: true
50-
status:
51-
acceptedNames:
52-
kind: ""
53-
plural: ""
54-
conditions: []
55-
storedVersions: []
5650
---
5751
apiVersion: apiextensions.k8s.io/v1
5852
kind: CustomResourceDefinition
@@ -96,12 +90,6 @@ spec:
9690
type: object
9791
served: true
9892
storage: true
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []
10593
---
10694
apiVersion: rbac.authorization.k8s.io/v1
10795
kind: Role

pkg/cli/alpha/config-gen/testdata/default/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
type: object
4848
served: true
4949
storage: true
50-
status:
51-
acceptedNames:
52-
kind: ""
53-
plural: ""
54-
conditions: []
55-
storedVersions: []
5650
---
5751
apiVersion: apiextensions.k8s.io/v1
5852
kind: CustomResourceDefinition
@@ -96,12 +90,6 @@ spec:
9690
type: object
9791
served: true
9892
storage: true
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []
10593
---
10694
apiVersion: rbac.authorization.k8s.io/v1
10795
kind: Role

pkg/cli/alpha/config-gen/testdata/disableauthproxy/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
type: object
4848
served: true
4949
storage: true
50-
status:
51-
acceptedNames:
52-
kind: ""
53-
plural: ""
54-
conditions: []
55-
storedVersions: []
5650
---
5751
apiVersion: apiextensions.k8s.io/v1
5852
kind: CustomResourceDefinition
@@ -96,12 +90,6 @@ spec:
9690
type: object
9791
served: true
9892
storage: true
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []
10593
---
10694
apiVersion: rbac.authorization.k8s.io/v1
10795
kind: Role

pkg/cli/alpha/config-gen/testdata/enablecertmanager/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
type: object
4848
served: true
4949
storage: true
50-
status:
51-
acceptedNames:
52-
kind: ""
53-
plural: ""
54-
conditions: []
55-
storedVersions: []
5650
---
5751
apiVersion: apiextensions.k8s.io/v1
5852
kind: CustomResourceDefinition
@@ -96,12 +90,6 @@ spec:
9690
type: object
9791
served: true
9892
storage: true
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []
10593
---
10694
apiVersion: rbac.authorization.k8s.io/v1
10795
kind: Role

pkg/cli/alpha/config-gen/testdata/enableconversionwebhooks/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ spec:
5656
namespace: simple-system
5757
name: webhook-service
5858
path: /convert
59-
status:
60-
acceptedNames:
61-
kind: ""
62-
plural: ""
63-
conditions: []
64-
storedVersions: []
6559
---
6660
apiVersion: apiextensions.k8s.io/v1
6761
kind: CustomResourceDefinition
@@ -105,12 +99,6 @@ spec:
10599
type: object
106100
served: true
107101
storage: true
108-
status:
109-
acceptedNames:
110-
kind: ""
111-
plural: ""
112-
conditions: []
113-
storedVersions: []
114102
---
115103
apiVersion: rbac.authorization.k8s.io/v1
116104
kind: Role

pkg/cli/alpha/config-gen/testdata/enableprometheus/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
type: object
4848
served: true
4949
storage: true
50-
status:
51-
acceptedNames:
52-
kind: ""
53-
plural: ""
54-
conditions: []
55-
storedVersions: []
5650
---
5751
apiVersion: apiextensions.k8s.io/v1
5852
kind: CustomResourceDefinition
@@ -96,12 +90,6 @@ spec:
9690
type: object
9791
served: true
9892
storage: true
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []
10593
---
10694
apiVersion: rbac.authorization.k8s.io/v1
10795
kind: Role

pkg/cli/alpha/config-gen/testdata/enablewebhooks/expected.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
type: object
4848
served: true
4949
storage: true
50-
status:
51-
acceptedNames:
52-
kind: ""
53-
plural: ""
54-
conditions: []
55-
storedVersions: []
5650
---
5751
apiVersion: apiextensions.k8s.io/v1
5852
kind: CustomResourceDefinition
@@ -96,12 +90,6 @@ spec:
9690
type: object
9791
served: true
9892
storage: true
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []
10593
---
10694
apiVersion: rbac.authorization.k8s.io/v1
10795
kind: Role

pkg/plugins/golang/declarative/v1/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
const (
3333
// kbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version
3434
kbDeclarativePatternForV2 = "v0.0.0-20200522144838-848d48e5b073"
35-
kbDeclarativePatternForV3 = "d0f104b6a96e152043e9c2d76229373a981ac96a"
35+
kbDeclarativePatternForV3 = "fe5be9431eae158f86f9de23000a9a2ec06745fc"
3636
)
3737

3838
var _ plugin.CreateAPISubcommand = &createAPISubcommand{}

0 commit comments

Comments
 (0)