Skip to content

Commit 166e2b5

Browse files
Upgrade deps (#33)
* Upgrade deps * Potential fix for code scanning alert no. 3: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
1 parent 248c966 commit 166e2b5

File tree

13 files changed

+7950
-5724
lines changed

13 files changed

+7950
-5724
lines changed

.github/workflows/build-push-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Set up Go 1.21
12+
- name: Set up Go 1.25
1313
uses: actions/setup-go@v2
1414
with:
15-
go-version: 1.21
15+
go-version: 1.25
1616
id: go
1717
- name: Set up Go for root
1818
run: |

.github/workflows/ci.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: ci
2+
permissions:
3+
contents: read
4+
5+
on:
6+
pull_request:
7+
branches:
8+
- '**'
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Set up Go 1.25
15+
uses: actions/setup-go@v2
16+
with:
17+
go-version: 1.25
18+
id: go
19+
- name: Set up Go for root
20+
run: |
21+
sudo ln -sf `which go` `sudo which go` || true
22+
sudo go version
23+
- uses: actions/checkout@v2
24+
- name: get go version
25+
run: go version
26+
- name: Gofmt and License checks
27+
run: make check
28+
- name: unit tests
29+
run: make test
30+
- name: Build Docker image (no push)
31+
env:
32+
DOCKER_BUILDKIT: 1
33+
run: |
34+
docker build \
35+
--build-arg VERSION=0.0.0-ci \
36+
--build-arg GIT_SHA=${GITHUB_SHA::7} \
37+
-t zookeeper-operator:ci .

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG DOCKER_REGISTRY
22
ARG DISTROLESS_DOCKER_REGISTRY
3-
ARG ALPINE_VERSION=3.18
4-
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.20-alpine${ALPINE_VERSION} as go-builder
3+
ARG ALPINE_VERSION=3.22
4+
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.25-alpine${ALPINE_VERSION} AS go-builder
55

66
ARG PROJECT_NAME=zookeeper-operator
77
ARG REPO_PATH=github.com/pravega/$PROJECT_NAME

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ $(LOCALBIN):
8585
KUSTOMIZE ?= $(LOCALBIN)/kustomize
8686
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
8787
## Tool Versions
88-
KUSTOMIZE_VERSION ?= v3.5.4
89-
CONTROLLER_TOOLS_VERSION ?= v0.9.0
88+
# Upgraded to modern stable versions
89+
KUSTOMIZE_VERSION ?= v5.7.1
90+
CONTROLLER_TOOLS_VERSION ?= v0.19.0
9091
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
9192
.PHONY: kustomize
9293
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ The list of available commands are
389389
### Build the operator image
390390

391391
Requirements:
392-
- Go 1.21+
392+
- Go 1.25+
393393

394394
Use the `make` command to build the Zookeeper operator image.
395395

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3822 additions & 2710 deletions
Large diffs are not rendered by default.

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

Lines changed: 3822 additions & 2710 deletions
Large diffs are not rendered by default.

config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
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:

go.mod

Lines changed: 64 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,88 @@
11
module github.com/pravega/zookeeper-operator
22

3-
go 1.21
3+
go 1.25
44

55
require (
66
github.com/ghodss/yaml v1.0.0
7-
github.com/go-logr/logr v1.2.4
7+
github.com/go-logr/logr v1.4.3
88
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.27.7
10-
github.com/operator-framework/operator-lib v0.11.0
9+
github.com/onsi/gomega v1.38.2
1110
github.com/pkg/errors v0.9.1
1211
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
13-
github.com/sirupsen/logrus v1.9.0
14-
golang.org/x/net v0.17.0
15-
k8s.io/api v0.27.5
16-
k8s.io/apimachinery v0.27.5
17-
k8s.io/client-go v0.27.5
18-
sigs.k8s.io/controller-runtime v0.15.2
12+
github.com/sirupsen/logrus v1.9.3
13+
golang.org/x/net v0.44.0
14+
k8s.io/api v0.34.1
15+
k8s.io/apimachinery v0.34.1
16+
k8s.io/client-go v0.34.1
17+
sigs.k8s.io/controller-runtime v0.22.1
1918
)
2019

2120
require (
2221
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2423
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
24+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2625
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
27-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
28-
github.com/fsnotify/fsnotify v1.6.0 // indirect
29-
github.com/go-logr/zapr v1.2.4 // indirect
30-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
31-
github.com/go-openapi/jsonreference v0.20.1 // indirect
32-
github.com/go-openapi/swag v0.22.3 // indirect
26+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
27+
github.com/fsnotify/fsnotify v1.9.0 // indirect
28+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
29+
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
3344
github.com/gogo/protobuf v1.3.2 // indirect
34-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35-
github.com/golang/protobuf v1.5.3 // indirect
36-
github.com/google/gnostic v0.6.9 // indirect
37-
github.com/google/go-cmp v0.5.9 // indirect
38-
github.com/google/gofuzz v1.2.0 // indirect
39-
github.com/google/uuid v1.3.0 // indirect
40-
github.com/imdario/mergo v0.3.13 // indirect
45+
github.com/google/btree v1.1.3 // indirect
46+
github.com/google/gnostic-models v0.7.0 // indirect
47+
github.com/google/go-cmp v0.7.0 // indirect
48+
github.com/google/uuid v1.6.0 // indirect
4149
github.com/josharian/intern v1.0.0 // indirect
4250
github.com/json-iterator/go v1.1.12 // indirect
43-
github.com/mailru/easyjson v0.7.7 // indirect
44-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
51+
github.com/mailru/easyjson v0.9.0 // indirect
4552
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
46-
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4754
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
48-
github.com/nxadm/tail v1.4.8 // indirect
49-
github.com/prometheus/client_golang v1.15.1 // indirect
50-
github.com/prometheus/client_model v0.4.0 // indirect
51-
github.com/prometheus/common v0.42.0 // indirect
52-
github.com/prometheus/procfs v0.9.0 // indirect
53-
github.com/spf13/pflag v1.0.5 // indirect
54-
go.uber.org/atomic v1.9.0 // indirect
55-
go.uber.org/multierr v1.8.0 // indirect
56-
go.uber.org/zap v1.24.0 // indirect
57-
golang.org/x/oauth2 v0.5.0 // indirect
58-
golang.org/x/sys v0.13.0 // indirect
59-
golang.org/x/term v0.13.0 // indirect
60-
golang.org/x/text v0.13.0 // indirect
61-
golang.org/x/time v0.3.0 // indirect
62-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
63-
google.golang.org/appengine v1.6.7 // indirect
64-
google.golang.org/protobuf v1.30.0 // indirect
55+
github.com/nxadm/tail v1.4.11 // indirect
56+
github.com/pmezard/go-difflib v1.0.0 // indirect
57+
github.com/prometheus/client_golang v1.23.2 // indirect
58+
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
61+
github.com/spf13/pflag v1.0.10 // indirect
62+
github.com/x448/float16 v0.8.4 // indirect
63+
go.uber.org/multierr v1.11.0 // indirect
64+
go.uber.org/zap v1.27.0 // indirect
65+
go.yaml.in/yaml/v2 v2.4.3 // indirect
66+
go.yaml.in/yaml/v3 v3.0.4 // indirect
67+
golang.org/x/oauth2 v0.31.0 // indirect
68+
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
73+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
74+
google.golang.org/protobuf v1.36.9 // indirect
75+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
6576
gopkg.in/inf.v0 v0.9.1 // indirect
6677
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6778
gopkg.in/yaml.v2 v2.4.0 // indirect
6879
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.27.5 // indirect
70-
k8s.io/component-base v0.27.5 // indirect
71-
k8s.io/klog/v2 v2.90.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
73-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
74-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
75-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
76-
sigs.k8s.io/yaml v1.3.0 // indirect
80+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
81+
k8s.io/klog/v2 v2.130.1 // indirect
82+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
83+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
84+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
85+
sigs.k8s.io/randfill v1.0.0 // indirect
86+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
87+
sigs.k8s.io/yaml v1.6.0 // indirect
7788
)

0 commit comments

Comments
 (0)