Skip to content

Commit 4f8ac35

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #170 from zroubalik/1.29.4
Bump K8s deps to 0.29.4
2 parents 7bbbf88 + c46dc06 commit 4f8ac35

File tree

13 files changed

+492
-178
lines changed

13 files changed

+492
-178
lines changed

‎Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ all: build-test-adapter
1919
generated_openapis := core custommetrics externalmetrics
2020
generated_files := $(generated_openapis:%=pkg/generated/openapi/%/zz_generated.openapi.go)
2121

22-
pkg/generated/openapi/core/zz_generated.openapi.go: INPUTS := k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version,k8s.io/api/core/v1
23-
pkg/generated/openapi/custommetrics/zz_generated.openapi.go: INPUTS := k8s.io/metrics/pkg/apis/custom_metrics,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,k8s.io/metrics/pkg/apis/custom_metrics/v1beta2
24-
pkg/generated/openapi/externalmetrics/zz_generated.openapi.go: INPUTS := k8s.io/metrics/pkg/apis/external_metrics,k8s.io/metrics/pkg/apis/external_metrics/v1beta1
22+
pkg/generated/openapi/core/zz_generated.openapi.go: INPUTS := "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/version" "k8s.io/api/core/v1"
23+
pkg/generated/openapi/custommetrics/zz_generated.openapi.go: INPUTS := "k8s.io/metrics/pkg/apis/custom_metrics" "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" "k8s.io/metrics/pkg/apis/custom_metrics/v1beta2"
24+
pkg/generated/openapi/externalmetrics/zz_generated.openapi.go: INPUTS := "k8s.io/metrics/pkg/apis/external_metrics" "k8s.io/metrics/pkg/apis/external_metrics/v1beta1"
2525

2626
pkg/generated/openapi/%/zz_generated.openapi.go: go.mod go.sum
2727
go install -mod=readonly k8s.io/kube-openapi/cmd/openapi-gen
2828
$(GOPATH)/bin/openapi-gen --logtostderr \
29-
-i $(INPUTS) \
30-
-h ./hack/boilerplate.go.txt \
31-
-p ./$(@D) \
32-
-O zz_generated.openapi \
33-
-o ./ \
34-
-r /dev/null
29+
--go-header-file ./hack/boilerplate.go.txt \
30+
--output-package ./$(@D) \
31+
--output-file-base zz_generated.openapi \
32+
--output-base ./$(@D) \
33+
-r /dev/null \
34+
$(INPUTS)
3535

3636
.PHONY: update-generated
3737
update-generated: $(generated_files)

‎go.mod

+18-18
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ module sigs.k8s.io/custom-metrics-apiserver
22

33
go 1.21
44

5-
toolchain go1.21.5
5+
toolchain go1.21.8
66

77
require (
88
github.com/emicklei/go-restful/v3 v3.11.0
99
github.com/google/addlicense v1.1.1
1010
github.com/spf13/pflag v1.0.5
11-
github.com/stretchr/testify v1.8.4
12-
k8s.io/api v0.28.5
13-
k8s.io/apimachinery v0.28.5
14-
k8s.io/apiserver v0.28.5
15-
k8s.io/client-go v0.28.5
16-
k8s.io/component-base v0.28.5
11+
github.com/stretchr/testify v1.9.0
12+
k8s.io/api v0.29.4
13+
k8s.io/apimachinery v0.29.4
14+
k8s.io/apiserver v0.29.4
15+
k8s.io/client-go v0.29.4
16+
k8s.io/component-base v0.29.4
1717
k8s.io/klog/v2 v2.110.1
18-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
19-
k8s.io/metrics v0.28.5
18+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
19+
k8s.io/metrics v0.29.4
2020
k8s.io/utils v0.0.0-20231127182322-b307cd553661
2121
)
2222

@@ -42,8 +42,8 @@ require (
4242
github.com/go-openapi/swag v0.22.7 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45-
github.com/golang/protobuf v1.5.3 // indirect
46-
github.com/google/cel-go v0.16.1 // indirect
45+
github.com/golang/protobuf v1.5.4 // indirect
46+
github.com/google/cel-go v0.17.7 // indirect
4747
github.com/google/gnostic-models v0.6.8 // indirect
4848
github.com/google/go-cmp v0.6.0 // indirect
4949
github.com/google/gofuzz v1.2.0 // indirect
@@ -81,29 +81,29 @@ require (
8181
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
8282
go.uber.org/multierr v1.11.0 // indirect
8383
go.uber.org/zap v1.26.0 // indirect
84-
golang.org/x/crypto v0.17.0 // indirect
84+
golang.org/x/crypto v0.21.0 // indirect
8585
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
8686
golang.org/x/mod v0.14.0 // indirect
87-
golang.org/x/net v0.19.0 // indirect
87+
golang.org/x/net v0.23.0 // indirect
8888
golang.org/x/oauth2 v0.15.0 // indirect
8989
golang.org/x/sync v0.5.0 // indirect
90-
golang.org/x/sys v0.15.0 // indirect
91-
golang.org/x/term v0.15.0 // indirect
90+
golang.org/x/sys v0.18.0 // indirect
91+
golang.org/x/term v0.18.0 // indirect
9292
golang.org/x/text v0.14.0 // indirect
9393
golang.org/x/time v0.5.0 // indirect
94-
golang.org/x/tools v0.16.0 // indirect
94+
golang.org/x/tools v0.16.1 // indirect
9595
google.golang.org/appengine v1.6.8 // indirect
9696
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
9797
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
9898
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
9999
google.golang.org/grpc v1.60.1 // indirect
100-
google.golang.org/protobuf v1.32.0 // indirect
100+
google.golang.org/protobuf v1.33.0 // indirect
101101
gopkg.in/inf.v0 v0.9.1 // indirect
102102
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
103103
gopkg.in/yaml.v2 v2.4.0 // indirect
104104
gopkg.in/yaml.v3 v3.0.1 // indirect
105105
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
106-
k8s.io/kms v0.29.0 // indirect
106+
k8s.io/kms v0.29.4 // indirect
107107
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
108108
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109109
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)