Skip to content

Commit 3469006

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #667 from jstourac/updateDeps
RHOAIENG-29976 - update ntb-controllers dependencies
2 parents 4b6d27e + e0663e9 commit 3469006

File tree

8 files changed

+1131
-292
lines changed

8 files changed

+1131
-292
lines changed

‎components/notebook-controller/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ docker-build-multi-arch: ## Build multi-arch docker images with docker buildx
104104

105105

106106
.PHONY: docker-build-push-multi-arch
107-
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
107+
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
108108
cd .. && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} --push -f ./notebook-controller/Dockerfile .
109109

110110

@@ -143,15 +143,15 @@ $(LOCALBIN): ## Ensure that the directory exists
143143
CONTROLLER_GEN = $(LOCALBIN)/controller-gen
144144
.PHONY: controller-gen
145145
controller-gen: ## Download controller-gen locally if necessary.
146-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3
146+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0
147147

148148
KUSTOMIZE = $(shell pwd)/bin/kustomize
149149
.PHONY: kustomize
150150
kustomize: ## Download kustomize locally if necessary.
151151
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
152152

153153
ENVTEST = $(shell pwd)/bin/setup-envtest
154-
ENVTEST_VERSION?=v0.0.0-20240923090159-236e448db12c
154+
ENVTEST_VERSION?=v0.0.0-20250723164028-948d554cd9c7
155155

156156
.PHONY: envtest
157157
envtest: ## Download setup-envtest locally if necessary.

‎components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml

Lines changed: 864 additions & 24 deletions
Large diffs are not rendered by default.

‎components/notebook-controller/go.mod

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,75 @@
11
module github.com/kubeflow/kubeflow/components/notebook-controller
22

3-
go 1.24
3+
go 1.24.3
44

55
toolchain go1.24.5
66

77
require (
8-
github.com/go-logr/logr v1.4.1
8+
github.com/go-logr/logr v1.4.3
99
github.com/kubeflow/kubeflow/components/common v0.0.0-20220218084159-4ad0158e955e
1010
github.com/onsi/ginkgo v1.16.5
11-
github.com/onsi/gomega v1.30.0
12-
github.com/prometheus/client_golang v1.18.0
13-
k8s.io/api v0.29.0
14-
k8s.io/apimachinery v0.29.0
15-
k8s.io/client-go v0.29.0
16-
sigs.k8s.io/controller-runtime v0.17.0
11+
github.com/onsi/gomega v1.36.1
12+
github.com/prometheus/client_golang v1.22.0
13+
k8s.io/api v0.33.0
14+
k8s.io/apimachinery v0.33.0
15+
k8s.io/client-go v0.33.0
16+
sigs.k8s.io/controller-runtime v0.21.0
1717
)
1818

1919
require (
2020
github.com/beorn7/perks v1.0.1 // indirect
21-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
21+
github.com/blang/semver/v4 v4.0.0 // indirect
22+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2223
github.com/davecgh/go-spew v1.1.1 // indirect
2324
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
24-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
25-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
25+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2626
github.com/fsnotify/fsnotify v1.7.0 // indirect
27+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2728
github.com/go-logr/zapr v1.3.0 // indirect
28-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
29+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2930
github.com/go-openapi/jsonreference v0.20.2 // indirect
30-
github.com/go-openapi/swag v0.22.3 // indirect
31+
github.com/go-openapi/swag v0.23.0 // indirect
3132
github.com/gogo/protobuf v1.3.2 // indirect
32-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33-
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/gnostic-models v0.6.8 // indirect
35-
github.com/google/go-cmp v0.6.0 // indirect
36-
github.com/google/gofuzz v1.2.0 // indirect
37-
github.com/google/uuid v1.3.0 // indirect
38-
github.com/imdario/mergo v0.3.12 // indirect
33+
github.com/google/btree v1.1.3 // indirect
34+
github.com/google/gnostic-models v0.6.9 // indirect
35+
github.com/google/go-cmp v0.7.0 // indirect
36+
github.com/google/uuid v1.6.0 // indirect
3937
github.com/josharian/intern v1.0.0 // indirect
4038
github.com/json-iterator/go v1.1.12 // indirect
4139
github.com/mailru/easyjson v0.7.7 // indirect
42-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4340
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4441
github.com/modern-go/reflect2 v1.0.2 // indirect
4542
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4643
github.com/nxadm/tail v1.4.8 // indirect
4744
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/prometheus/client_model v0.5.0 // indirect
49-
github.com/prometheus/common v0.45.0 // indirect
50-
github.com/prometheus/procfs v0.12.0 // indirect
45+
github.com/prometheus/client_model v0.6.1 // indirect
46+
github.com/prometheus/common v0.62.0 // indirect
47+
github.com/prometheus/procfs v0.15.1 // indirect
5148
github.com/spf13/pflag v1.0.5 // indirect
49+
github.com/x448/float16 v0.8.4 // indirect
5250
go.uber.org/multierr v1.11.0 // indirect
53-
go.uber.org/zap v1.26.0 // indirect
54-
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
51+
go.uber.org/zap v1.27.0 // indirect
5552
golang.org/x/net v0.38.0 // indirect
56-
golang.org/x/oauth2 v0.12.0 // indirect
53+
golang.org/x/oauth2 v0.27.0 // indirect
54+
golang.org/x/sync v0.12.0 // indirect
5755
golang.org/x/sys v0.31.0 // indirect
5856
golang.org/x/term v0.30.0 // indirect
5957
golang.org/x/text v0.23.0 // indirect
60-
golang.org/x/time v0.3.0 // indirect
58+
golang.org/x/time v0.9.0 // indirect
6159
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
62-
google.golang.org/appengine v1.6.7 // indirect
63-
google.golang.org/protobuf v1.33.0 // indirect
60+
google.golang.org/protobuf v1.36.5 // indirect
61+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6462
gopkg.in/inf.v0 v0.9.1 // indirect
6563
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
66-
gopkg.in/yaml.v2 v2.4.0 // indirect
6764
gopkg.in/yaml.v3 v3.0.1 // indirect
68-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
69-
k8s.io/component-base v0.29.0 // indirect
70-
k8s.io/klog/v2 v2.110.1 // indirect
71-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
72-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
73-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
65+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
66+
k8s.io/klog/v2 v2.130.1 // indirect
67+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
68+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
69+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
70+
sigs.k8s.io/randfill v1.0.0 // indirect
71+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
7572
sigs.k8s.io/yaml v1.4.0 // indirect
7673
)
7774

78-
replace google.golang.org/grpc => google.golang.org/grpc v1.56.3
75+
replace google.golang.org/grpc => google.golang.org/grpc v1.60.0

0 commit comments

Comments
 (0)