Skip to content

Commit decec8b

Browse files
superbrotherssuperbrothers
authored
Merge pull request #26 from ryotarai/ryotarai/k8s-1.33
Support Kubernetes 1.33
2 parents a7a2923 + cb19db5 commit decec8b

File tree

8 files changed

+180
-162
lines changed

8 files changed

+180
-162
lines changed

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.24.3
1+
golang 1.24.5

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GOBIN ?= ${CURDIR}/bin
5656
KUSTOMIZE_VERSION ?= v5.3.0
5757
KUSTOMIZE ?= ${GOBIN}/kustomize
5858

59-
CONTROLLER_GEN_VERSION ?= v0.17.3
59+
CONTROLLER_GEN_VERSION ?= v0.18.0
6060
CONTROLLER_GEN ?= ${GOBIN}/controller-gen
6161

6262
STATICCHECK_VERSION ?= 2023.1

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: hierarchicalresourcequotas.hnc.x-k8s.io
88
spec:
99
group: hnc.x-k8s.io
@@ -96,11 +96,13 @@ spec:
9696
items:
9797
type: string
9898
type: array
99+
x-kubernetes-list-type: atomic
99100
required:
100101
- operator
101102
- scopeName
102103
type: object
103104
type: array
105+
x-kubernetes-list-type: atomic
104106
type: object
105107
x-kubernetes-map-type: atomic
106108
type: object
@@ -119,12 +121,14 @@ spec:
119121
resource
120122
type: object
121123
limitsSummary:
122-
description: LimitsSummary is used by kubectl get hrq, and summarizes
123-
the relevant information from .status.hard.limits and .status.used.limits.
124+
description: |-
125+
LimitsSummary is used by kubectl get hrq, and summarizes the relevant information
126+
from .status.hard.limits and .status.used.limits.
124127
type: string
125128
requestsSummary:
126-
description: RequestsSummary is used by kubectl get hrq, and summarizes
127-
the relevant information from .status.hard.requests and .status.used.requests.
129+
description: |-
130+
RequestsSummary is used by kubectl get hrq, and summarizes the relevant information
131+
from .status.hard.requests and .status.used.requests.
128132
type: string
129133
used:
130134
additionalProperties:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: hierarchyconfigurations.hnc.x-k8s.io
88
spec:
99
group: hnc.x-k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: hncconfigurations.hnc.x-k8s.io
88
spec:
99
group: hnc.x-k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: subnamespaceanchors.hnc.x-k8s.io
88
spec:
99
group: hnc.x-k8s.io

‎go.mod‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
module sigs.k8s.io/hierarchical-namespaces
22

3-
go 1.24
3+
go 1.24.5
44

55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.0
77
contrib.go.opencensus.io/exporter/stackdriver v0.13.0
88
github.com/go-logr/logr v1.4.2
99
github.com/go-logr/zapr v1.3.0
1010
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
11-
github.com/onsi/ginkgo/v2 v2.22.0
12-
github.com/onsi/gomega v1.36.1
13-
github.com/open-policy-agent/cert-controller v0.12.0
11+
github.com/onsi/ginkgo/v2 v2.23.3
12+
github.com/onsi/gomega v1.37.0
13+
github.com/open-policy-agent/cert-controller v0.13.0
1414
github.com/spf13/cobra v1.8.1
1515
go.opencensus.io v0.24.0
1616
go.uber.org/zap v1.27.0
17-
k8s.io/api v0.32.3
18-
k8s.io/apiextensions-apiserver v0.32.3
19-
k8s.io/apimachinery v0.32.3
20-
k8s.io/cli-runtime v0.32.3
21-
k8s.io/client-go v0.32.3
22-
sigs.k8s.io/controller-runtime v0.20.4
17+
k8s.io/api v0.33.3
18+
k8s.io/apiextensions-apiserver v0.33.3
19+
k8s.io/apimachinery v0.33.3
20+
k8s.io/cli-runtime v0.33.3
21+
k8s.io/client-go v0.33.3
22+
sigs.k8s.io/controller-runtime v0.21.0
2323
)
2424

2525
require (
26-
github.com/aws/aws-sdk-go v1.38.49 // indirect
26+
github.com/aws/aws-sdk-go v1.43.16 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
2929
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -39,11 +39,10 @@ require (
3939
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4040
github.com/golang/protobuf v1.5.4 // indirect
4141
github.com/google/btree v1.1.3 // indirect
42-
github.com/google/go-cmp v0.6.0 // indirect
43-
github.com/google/gofuzz v1.2.0 // indirect
42+
github.com/google/go-cmp v0.7.0 // indirect
4443
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4544
github.com/google/uuid v1.6.0
46-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
45+
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
4746
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4847
github.com/jmespath/go-jmespath v0.4.0 // indirect
4948
github.com/josharian/intern v1.0.0 // indirect
@@ -55,69 +54,74 @@ require (
5554
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5655
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5756
github.com/pkg/errors v0.9.1 // indirect
58-
github.com/prometheus/client_golang v1.20.2 // indirect
57+
github.com/prometheus/client_golang v1.22.0 // indirect
5958
github.com/prometheus/client_model v0.6.1 // indirect
60-
github.com/prometheus/common v0.55.0 // indirect
59+
github.com/prometheus/common v0.62.0 // indirect
6160
github.com/prometheus/procfs v0.15.1 // indirect
6261
github.com/prometheus/statsd_exporter v0.21.0 // indirect
6362
github.com/spf13/pflag v1.0.5 // indirect
6463
github.com/xlab/treeprint v1.2.0 // indirect
6564
go.uber.org/atomic v1.11.0 // indirect
6665
go.uber.org/multierr v1.11.0 // indirect
67-
golang.org/x/crypto v0.28.0 // indirect
68-
golang.org/x/net v0.30.0 // indirect
69-
golang.org/x/oauth2 v0.23.0 // indirect
70-
golang.org/x/sync v0.8.0 // indirect
71-
golang.org/x/sys v0.26.0 // indirect
72-
golang.org/x/term v0.25.0 // indirect
73-
golang.org/x/text v0.19.0
74-
golang.org/x/time v0.7.0 // indirect
66+
golang.org/x/crypto v0.36.0 // indirect
67+
golang.org/x/net v0.38.0 // indirect
68+
golang.org/x/oauth2 v0.27.0 // indirect
69+
golang.org/x/sync v0.12.0 // indirect
70+
golang.org/x/sys v0.31.0 // indirect
71+
golang.org/x/term v0.30.0 // indirect
72+
golang.org/x/text v0.23.0
73+
golang.org/x/time v0.9.0 // indirect
7574
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
76-
google.golang.org/api v0.155.0 // indirect
77-
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
78-
google.golang.org/grpc v1.65.0 // indirect
79-
google.golang.org/protobuf v1.35.1 // indirect
75+
google.golang.org/api v0.169.0 // indirect
76+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
77+
google.golang.org/grpc v1.68.1 // indirect
78+
google.golang.org/protobuf v1.36.5 // indirect
8079
gopkg.in/inf.v0 v0.9.1 // indirect
8180
gopkg.in/yaml.v2 v2.4.0 // indirect
8281
gopkg.in/yaml.v3 v3.0.1 // indirect
8382
k8s.io/klog/v2 v2.130.1 // indirect
84-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
85-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
83+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
84+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
8685
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
87-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
88-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
89-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
86+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
87+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
88+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
9089
sigs.k8s.io/yaml v1.4.0
9190
)
9291

9392
require (
94-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
95-
cloud.google.com/go/container v1.29.0 // indirect
96-
cloud.google.com/go/monitoring v1.17.0 // indirect
97-
cloud.google.com/go/trace v1.10.4 // indirect
93+
cloud.google.com/go v0.112.1 // indirect
94+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
95+
cloud.google.com/go/container v1.31.0 // indirect
96+
cloud.google.com/go/monitoring v1.18.0 // indirect
97+
cloud.google.com/go/trace v1.10.5 // indirect
9898
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
9999
github.com/blang/semver/v4 v4.0.0 // indirect
100100
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
101+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
101102
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
102103
github.com/felixge/httpsnoop v1.0.4 // indirect
103104
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
104105
github.com/go-logr/stdr v1.2.2 // indirect
105106
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
106-
github.com/google/gnostic-models v0.6.8 // indirect
107-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
107+
github.com/google/gnostic-models v0.6.9 // indirect
108+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
108109
github.com/google/s2a-go v0.1.7 // indirect
109110
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
110-
github.com/klauspost/compress v1.17.9 // indirect
111111
github.com/moby/term v0.5.0 // indirect
112112
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
113+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
114+
github.com/sergi/go-diff v1.3.1 // indirect
113115
github.com/x448/float16 v0.8.4 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
116-
go.opentelemetry.io/otel v1.28.0 // indirect
117-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
118-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
119-
golang.org/x/tools v0.26.0 // indirect
120-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
121-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
116+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
118+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
119+
go.opentelemetry.io/otel v1.33.0 // indirect
120+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
121+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
122+
golang.org/x/tools v0.30.0 // indirect
123+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
124+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
122125
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
126+
sigs.k8s.io/randfill v1.0.0 // indirect
123127
)

0 commit comments

Comments
 (0)