Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.

Commit 6bdf001

Browse files
authored
Merge pull request #287 from erikgb/bump-controller-tools
Bump Kubernetes dependencies to 1.26.x
2 parents 9b4b6a7 + 4b7fb70 commit 6bdf001

File tree

2,467 files changed

+266707
-195179
lines changed

Some content is hidden

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

2,467 files changed

+266707
-195179
lines changed

config/crd/bases/hnc.x-k8s.io_hierarchicalresourcequotas.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: hierarchicalresourcequotas.hnc.x-k8s.io
98
spec:
109
group: hnc.x-k8s.io
@@ -77,9 +76,3 @@ spec:
7776
type: object
7877
served: true
7978
storage: true
80-
status:
81-
acceptedNames:
82-
kind: ""
83-
plural: ""
84-
conditions: []
85-
storedVersions: []

config/crd/bases/hnc.x-k8s.io_hierarchyconfigurations.yaml

+3-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: hierarchyconfigurations.hnc.x-k8s.io
98
spec:
109
group: hnc.x-k8s.io
@@ -112,8 +111,8 @@ spec:
112111
description: "Condition contains details for one aspect of the current
113112
state of this API Resource. --- This struct is intended for direct
114113
use as an array at the field path .status.conditions. For example,
115-
type FooStatus struct{ // Represents the observations of a foo's
116-
current state. // Known .status.conditions.type are: \"Available\",
114+
\n type FooStatus struct{ // Represents the observations of a
115+
foo's current state. // Known .status.conditions.type are: \"Available\",
117116
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
118117
// +listType=map // +listMapKey=type Conditions []metav1.Condition
119118
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
@@ -179,9 +178,3 @@ spec:
179178
type: object
180179
served: true
181180
storage: true
182-
status:
183-
acceptedNames:
184-
kind: ""
185-
plural: ""
186-
conditions: []
187-
storedVersions: []

config/crd/bases/hnc.x-k8s.io_hncconfigurations.yaml

+3-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: hncconfigurations.hnc.x-k8s.io
98
spec:
109
group: hnc.x-k8s.io
@@ -88,8 +87,8 @@ spec:
8887
description: "Condition contains details for one aspect of the current
8988
state of this API Resource. --- This struct is intended for direct
9089
use as an array at the field path .status.conditions. For example,
91-
type FooStatus struct{ // Represents the observations of a foo's
92-
current state. // Known .status.conditions.type are: \"Available\",
90+
\n type FooStatus struct{ // Represents the observations of a
91+
foo's current state. // Known .status.conditions.type are: \"Available\",
9392
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
9493
// +listType=map // +listMapKey=type Conditions []metav1.Condition
9594
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
@@ -196,9 +195,3 @@ spec:
196195
type: object
197196
served: true
198197
storage: true
199-
status:
200-
acceptedNames:
201-
kind: ""
202-
plural: ""
203-
conditions: []
204-
storedVersions: []

config/crd/bases/hnc.x-k8s.io_subnamespaceanchors.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: subnamespaceanchors.hnc.x-k8s.io
98
spec:
109
group: hnc.x-k8s.io
@@ -106,9 +105,3 @@ spec:
106105
type: object
107106
served: true
108107
storage: true
109-
status:
110-
acceptedNames:
111-
kind: ""
112-
plural: ""
113-
conditions: []
114-
storedVersions: []

config/rbac/role.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: manager-role
76
rules:
87
- apiGroups:

config/webhook/manifests.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: admissionregistration.k8s.io/v1
33
kind: MutatingWebhookConfiguration
44
metadata:
5-
creationTimestamp: null
65
name: mutating-webhook-configuration
76
webhooks:
87
- admissionReviewVersions:
@@ -29,7 +28,6 @@ webhooks:
2928
apiVersion: admissionregistration.k8s.io/v1
3029
kind: ValidatingWebhookConfiguration
3130
metadata:
32-
creationTimestamp: null
3331
name: validating-webhook-configuration
3432
webhooks:
3533
- admissionReviewVersions:

go.mod

+81-79
Original file line numberDiff line numberDiff line change
@@ -5,120 +5,122 @@ go 1.20
55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.0
77
contrib.go.opencensus.io/exporter/stackdriver v0.13.0
8-
github.com/go-logr/logr v1.2.0
9-
github.com/go-logr/zapr v1.2.0
8+
github.com/go-logr/logr v1.2.4
9+
github.com/go-logr/zapr v1.2.4
1010
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
11-
github.com/onsi/ginkgo/v2 v2.1.4
12-
github.com/onsi/gomega v1.19.0
13-
github.com/open-policy-agent/cert-controller v0.2.1-0.20220125035755-54af89450964
14-
github.com/spf13/cobra v1.2.1
15-
go.opencensus.io v0.23.0
16-
go.uber.org/zap v1.19.1
11+
github.com/onsi/ginkgo/v2 v2.9.2
12+
github.com/onsi/gomega v1.27.6
13+
github.com/open-policy-agent/cert-controller v0.6.0
14+
github.com/spf13/cobra v1.7.0
15+
go.opencensus.io v0.24.0
16+
go.uber.org/zap v1.24.0
1717
honnef.co/go/tools v0.4.0
18-
k8s.io/api v0.23.2
19-
k8s.io/apiextensions-apiserver v0.23.2
20-
k8s.io/apimachinery v0.23.2
21-
k8s.io/cli-runtime v0.23.2
22-
k8s.io/client-go v0.23.2
23-
sigs.k8s.io/controller-runtime v0.11.0
24-
sigs.k8s.io/controller-tools v0.8.0
18+
k8s.io/api v0.26.5
19+
k8s.io/apiextensions-apiserver v0.26.5
20+
k8s.io/apimachinery v0.26.5
21+
k8s.io/cli-runtime v0.26.5
22+
k8s.io/client-go v0.26.5
23+
sigs.k8s.io/controller-runtime v0.14.6
24+
sigs.k8s.io/controller-tools v0.11.4
2525
)
2626

2727
require (
28-
cloud.google.com/go v0.81.0 // indirect
29-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
30-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
31-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
32-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
33-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
34-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3528
github.com/BurntSushi/toml v1.2.1 // indirect
36-
github.com/PuerkitoBio/purell v1.1.1 // indirect
37-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3829
github.com/aws/aws-sdk-go v1.38.49 // indirect
3930
github.com/beorn7/perks v1.0.1 // indirect
40-
github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
41-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
31+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
32+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4233
github.com/davecgh/go-spew v1.1.1 // indirect
4334
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
44-
github.com/fatih/color v1.12.0 // indirect
45-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
46-
github.com/fsnotify/fsnotify v1.5.1 // indirect
35+
github.com/fatih/color v1.15.0 // indirect
36+
github.com/fsnotify/fsnotify v1.6.0 // indirect
4737
github.com/go-errors/errors v1.0.1 // indirect
48-
github.com/go-kit/log v0.1.0 // indirect
49-
github.com/go-logfmt/logfmt v0.5.0 // indirect
50-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
51-
github.com/go-openapi/jsonreference v0.19.5 // indirect
52-
github.com/go-openapi/swag v0.19.14 // indirect
53-
github.com/gobuffalo/flect v0.2.3 // indirect
38+
github.com/go-kit/log v0.2.0 // indirect
39+
github.com/go-logfmt/logfmt v0.5.1 // indirect
40+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
41+
github.com/go-openapi/jsonreference v0.20.1 // indirect
42+
github.com/go-openapi/swag v0.22.3 // indirect
43+
github.com/gobuffalo/flect v1.0.2 // indirect
5444
github.com/gogo/protobuf v1.3.2 // indirect
5545
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
56-
github.com/golang/protobuf v1.5.2 // indirect
46+
github.com/golang/protobuf v1.5.3 // indirect
5747
github.com/google/btree v1.0.1 // indirect
58-
github.com/google/go-cmp v0.5.6 // indirect
59-
github.com/google/gofuzz v1.1.0 // indirect
48+
github.com/google/go-cmp v0.5.9 // indirect
49+
github.com/google/gofuzz v1.2.0 // indirect
6050
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
61-
github.com/google/uuid v1.1.2 // indirect
62-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
63-
github.com/googleapis/gnostic v0.5.5 // indirect
51+
github.com/google/uuid v1.3.0 // indirect
52+
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
6453
github.com/imdario/mergo v0.3.12 // indirect
65-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
54+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6655
github.com/jmespath/go-jmespath v0.4.0 // indirect
6756
github.com/josharian/intern v1.0.0 // indirect
6857
github.com/json-iterator/go v1.1.12 // indirect
6958
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
70-
github.com/mailru/easyjson v0.7.6 // indirect
71-
github.com/mattn/go-colorable v0.1.8 // indirect
72-
github.com/mattn/go-isatty v0.0.12 // indirect
73-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
59+
github.com/mailru/easyjson v0.7.7 // indirect
60+
github.com/mattn/go-colorable v0.1.13 // indirect
61+
github.com/mattn/go-isatty v0.0.17 // indirect
62+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
7463
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7564
github.com/modern-go/reflect2 v1.0.2 // indirect
7665
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7766
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7867
github.com/pkg/errors v0.9.1 // indirect
79-
github.com/pmezard/go-difflib v1.0.0 // indirect
80-
github.com/prometheus/client_golang v1.11.0 // indirect
81-
github.com/prometheus/client_model v0.2.0 // indirect
82-
github.com/prometheus/common v0.28.0 // indirect
83-
github.com/prometheus/procfs v0.6.0 // indirect
68+
github.com/prometheus/client_golang v1.14.0 // indirect
69+
github.com/prometheus/client_model v0.3.0 // indirect
70+
github.com/prometheus/common v0.37.0 // indirect
71+
github.com/prometheus/procfs v0.8.0 // indirect
8472
github.com/prometheus/statsd_exporter v0.21.0 // indirect
8573
github.com/spf13/pflag v1.0.5 // indirect
86-
github.com/stretchr/testify v1.7.0 // indirect
87-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
74+
github.com/xlab/treeprint v1.1.0 // indirect
8875
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
89-
go.uber.org/atomic v1.7.0 // indirect
90-
go.uber.org/multierr v1.6.0 // indirect
91-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
76+
go.uber.org/atomic v1.11.0 // indirect
77+
go.uber.org/multierr v1.11.0 // indirect
78+
golang.org/x/crypto v0.7.0 // indirect
9279
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
93-
golang.org/x/mod v0.7.0 // indirect
94-
golang.org/x/net v0.3.0 // indirect
95-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
80+
golang.org/x/mod v0.10.0 // indirect
81+
golang.org/x/net v0.9.0 // indirect
82+
golang.org/x/oauth2 v0.7.0 // indirect
9683
golang.org/x/sync v0.1.0 // indirect
97-
golang.org/x/sys v0.3.0 // indirect
98-
golang.org/x/term v0.3.0 // indirect
99-
golang.org/x/text v0.5.0
100-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
101-
golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d // indirect
84+
golang.org/x/sys v0.7.0 // indirect
85+
golang.org/x/term v0.7.0 // indirect
86+
golang.org/x/text v0.9.0
87+
golang.org/x/time v0.3.0 // indirect
88+
golang.org/x/tools v0.8.0 // indirect
10289
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
103-
google.golang.org/api v0.46.0 // indirect
90+
google.golang.org/api v0.118.0 // indirect
10491
google.golang.org/appengine v1.6.7 // indirect
105-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
106-
google.golang.org/grpc v1.40.0 // indirect
107-
google.golang.org/protobuf v1.27.1 // indirect
92+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
93+
google.golang.org/grpc v1.55.0 // indirect
94+
google.golang.org/protobuf v1.30.0 // indirect
10895
gopkg.in/inf.v0 v0.9.1 // indirect
10996
gopkg.in/yaml.v2 v2.4.0 // indirect
110-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
111-
k8s.io/component-base v0.23.2 // indirect
112-
k8s.io/klog/v2 v2.30.0 // indirect
113-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
114-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
115-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
116-
sigs.k8s.io/kustomize/api v0.10.1 // indirect
117-
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
118-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
97+
gopkg.in/yaml.v3 v3.0.1 // indirect
98+
k8s.io/component-base v0.26.5 // indirect
99+
k8s.io/klog/v2 v2.90.1 // indirect
100+
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
101+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
102+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103+
sigs.k8s.io/kustomize/api v0.12.1 // indirect
104+
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
105+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
119106
sigs.k8s.io/yaml v1.3.0 // indirect
120107
)
121108

122-
require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230208013708-22718275bffe
109+
require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230524200249-30eae58f1b98
123110

124-
require github.com/spf13/afero v1.6.0 // indirect
111+
require (
112+
cloud.google.com/go/compute v1.19.0 // indirect
113+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
114+
cloud.google.com/go/container v1.18.1 // indirect
115+
cloud.google.com/go/monitoring v1.14.0 // indirect
116+
cloud.google.com/go/trace v1.9.1 // indirect
117+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
118+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
119+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
120+
github.com/google/gnostic v0.5.7-v3refs // indirect
121+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
122+
github.com/google/s2a-go v0.1.0 // indirect
123+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
124+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
125+
github.com/spf13/afero v1.9.5 // indirect
126+
)

0 commit comments

Comments
 (0)