Skip to content

Commit 71f739f

Browse files
amuraruamuraru
committed
Upgrade dependencies
1 parent 5d74c24 commit 71f739f

File tree

5 files changed

+119
-91
lines changed

5 files changed

+119
-91
lines changed

‎Makefile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# http://www.apache.org/licenses/LICENSE-2.0
88

99
SHELL=/bin/bash -o pipefail
10-
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
11-
CRD_OPTIONS ?= "crd"
10+
# Produce CRDs compatible with Kubernetes 1.16+ (using apiextensions.k8s.io/v1)
11+
CRD_OPTIONS ?= "crd:crdVersions=v1,generateEmbeddedObjectMeta=true"
1212

1313
PROJECT_NAME=zookeeper-operator
1414
EXPORTER_NAME=zookeeper-exporter
@@ -42,8 +42,11 @@ uninstall: manifests kustomize
4242

4343
crds: ## Generate CRDs
4444
- make controller-gen
45-
- $(CONTROLLER_GEN) crd paths=./api/... output:dir=./config/crd/bases schemapatch:manifests=./config/crd/bases
45+
- $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=config/crd/bases
4646

47+
# Generate manifests e.g. CRD, RBAC etc.
48+
manifests: controller-gen
49+
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
4750

4851
# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
4952
deploy: manifests kustomize
@@ -65,10 +68,6 @@ undeploy-test: manifests kustomize
6568
undeploy:
6669
$(KUSTOMIZE) build config/default | kubectl delete -f -
6770

68-
# Generate manifests e.g. CRD, RBAC etc.
69-
manifests: controller-gen
70-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
71-
7271
# Run go fmt against code
7372
fmt:
7473
go fmt ./...

‎charts/zookeeper-operator/templates/zookeeper.pravega.io_zookeeperclusters_crd.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5872,6 +5872,23 @@ spec:
58725872
May contain labels and annotations that will be copied into the PVC
58735873
when creating it. No other fields are allowed and will be rejected during
58745874
validation.
5875+
properties:
5876+
annotations:
5877+
additionalProperties:
5878+
type: string
5879+
type: object
5880+
finalizers:
5881+
items:
5882+
type: string
5883+
type: array
5884+
labels:
5885+
additionalProperties:
5886+
type: string
5887+
type: object
5888+
name:
5889+
type: string
5890+
namespace:
5891+
type: string
58755892
type: object
58765893
spec:
58775894
description: |-

‎config/crd/bases/zookeeper.pravega.io_zookeeperclusters.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5871,6 +5871,23 @@ spec:
58715871
May contain labels and annotations that will be copied into the PVC
58725872
when creating it. No other fields are allowed and will be rejected during
58735873
validation.
5874+
properties:
5875+
annotations:
5876+
additionalProperties:
5877+
type: string
5878+
type: object
5879+
finalizers:
5880+
items:
5881+
type: string
5882+
type: array
5883+
labels:
5884+
additionalProperties:
5885+
type: string
5886+
type: object
5887+
name:
5888+
type: string
5889+
namespace:
5890+
type: string
58745891
type: object
58755892
spec:
58765893
description: |-

‎go.mod‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/pkg/errors v0.9.1
1111
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
1212
github.com/sirupsen/logrus v1.9.3
13-
golang.org/x/net v0.44.0
13+
golang.org/x/net v0.46.0
1414
k8s.io/api v0.34.1
1515
k8s.io/apimachinery v0.34.1
1616
k8s.io/client-go v0.34.1
17-
sigs.k8s.io/controller-runtime v0.22.1
17+
sigs.k8s.io/controller-runtime v0.22.3
1818
)
1919

2020
require (
@@ -27,60 +27,57 @@ require (
2727
github.com/fsnotify/fsnotify v1.9.0 // indirect
2828
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2929
github.com/go-logr/zapr v1.3.0 // indirect
30-
github.com/go-openapi/jsonpointer v0.22.0 // indirect
31-
github.com/go-openapi/jsonreference v0.21.1 // indirect
32-
github.com/go-openapi/swag v0.24.1 // indirect
33-
github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
34-
github.com/go-openapi/swag/conv v0.24.0 // indirect
35-
github.com/go-openapi/swag/fileutils v0.24.0 // indirect
36-
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
37-
github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
38-
github.com/go-openapi/swag/loading v0.24.0 // indirect
39-
github.com/go-openapi/swag/mangling v0.24.0 // indirect
40-
github.com/go-openapi/swag/netutils v0.24.0 // indirect
41-
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
42-
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
43-
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
30+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
31+
github.com/go-openapi/jsonreference v0.21.2 // indirect
32+
github.com/go-openapi/swag v0.25.1 // indirect
33+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
34+
github.com/go-openapi/swag/conv v0.25.1 // indirect
35+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
36+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
37+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
38+
github.com/go-openapi/swag/loading v0.25.1 // indirect
39+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
40+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
41+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
42+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
43+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
4444
github.com/gogo/protobuf v1.3.2 // indirect
4545
github.com/google/btree v1.1.3 // indirect
4646
github.com/google/gnostic-models v0.7.0 // indirect
4747
github.com/google/go-cmp v0.7.0 // indirect
4848
github.com/google/uuid v1.6.0 // indirect
49-
github.com/josharian/intern v1.0.0 // indirect
5049
github.com/json-iterator/go v1.1.12 // indirect
51-
github.com/mailru/easyjson v0.9.0 // indirect
5250
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5351
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5452
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5553
github.com/nxadm/tail v1.4.11 // indirect
5654
github.com/pmezard/go-difflib v1.0.0 // indirect
5755
github.com/prometheus/client_golang v1.23.2 // indirect
5856
github.com/prometheus/client_model v0.6.2 // indirect
59-
github.com/prometheus/common v0.66.1 // indirect
60-
github.com/prometheus/procfs v0.17.0 // indirect
57+
github.com/prometheus/common v0.67.2 // indirect
58+
github.com/prometheus/procfs v0.19.2 // indirect
6159
github.com/spf13/pflag v1.0.10 // indirect
6260
github.com/x448/float16 v0.8.4 // indirect
6361
go.uber.org/multierr v1.11.0 // indirect
6462
go.uber.org/zap v1.27.0 // indirect
6563
go.yaml.in/yaml/v2 v2.4.3 // indirect
6664
go.yaml.in/yaml/v3 v3.0.4 // indirect
67-
golang.org/x/oauth2 v0.31.0 // indirect
65+
golang.org/x/oauth2 v0.32.0 // indirect
6866
golang.org/x/sync v0.17.0 // indirect
69-
golang.org/x/sys v0.36.0 // indirect
70-
golang.org/x/term v0.35.0 // indirect
71-
golang.org/x/text v0.29.0 // indirect
72-
golang.org/x/time v0.13.0 // indirect
67+
golang.org/x/sys v0.37.0 // indirect
68+
golang.org/x/term v0.36.0 // indirect
69+
golang.org/x/text v0.30.0 // indirect
70+
golang.org/x/time v0.14.0 // indirect
7371
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
74-
google.golang.org/protobuf v1.36.9 // indirect
72+
google.golang.org/protobuf v1.36.10 // indirect
7573
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7674
gopkg.in/inf.v0 v0.9.1 // indirect
7775
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7876
gopkg.in/yaml.v2 v2.4.0 // indirect
79-
gopkg.in/yaml.v3 v3.0.1 // indirect
8077
k8s.io/apiextensions-apiserver v0.34.1 // indirect
8178
k8s.io/klog/v2 v2.130.1 // indirect
8279
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
83-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
80+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
8481
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
8582
sigs.k8s.io/randfill v1.0.0 // indirect
8683
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect

0 commit comments

Comments
 (0)