Skip to content

Commit 1d4cd2c

Browse files
committed
Upgrade deps
1 parent 279acc2 commit 1d4cd2c

File tree

19 files changed

+8112
-5725
lines changed

19 files changed

+8112
-5725
lines changed

.github/.dependabot.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
# GitHub Actions dependencies (grouped into single PR)
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "weekly"
13+
day: "monday"
14+
time: "09:00"
15+
timezone: "UTC"
16+
commit-message:
17+
prefix: "chore"
18+
include: "scope"
19+
groups:
20+
github-actions-dependencies:
21+
patterns:
22+
- "*"
23+
24+
# Tool versions tracking via Docker ecosystem (grouped into single PR)
25+
- package-ecosystem: "docker"
26+
directory: "/"
27+
schedule:
28+
interval: "weekly"
29+
day: "wednesday"
30+
time: "09:00"
31+
timezone: "UTC"
32+
commit-message:
33+
prefix: "chore"
34+
include: "scope"
35+
groups:
36+
docker-dependencies:
37+
patterns:
38+
- "*"
39+
40+
41+
# =============================================================================
42+
# GO MODULES CONFIGURATION WITH GROUPING
43+
# =============================================================================
44+
# Using groups to combine all Go module updates into fewer PRs.
45+
# Note: Groups work within each package-ecosystem entry, so we separate:
46+
# - Main modules (rot)
47+
#
48+
# Current go.mod files detected:
49+
# - / (root)
50+
# =============================================================================
51+
52+
# Main Go modules (grouped into single PR)
53+
- package-ecosystem: "gomod"
54+
directory: "/"
55+
schedule:
56+
interval: "weekly"
57+
day: "tuesday"
58+
time: "09:00"
59+
timezone: "UTC"
60+
commit-message:
61+
prefix: "chore"
62+
include: "scope"
63+
groups:
64+
main-go-dependencies:
65+
patterns:
66+
- "*"

.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.21-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/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ appVersion: 0.2.15
66
keywords:
77
- zookeeper
88
- storage
9-
home: https://github.com/pravega/zookeeper-operator
9+
home: https://github.com/adobe/zookeeper-operator
1010
icon: https://zookeeper.apache.org/images/zookeeper_small.gif

charts/zookeeper-operator/templates/role.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,16 @@ rules:
4040
- poddisruptionbudgets
4141
verbs:
4242
- "*"
43+
- apiGroups:
44+
- coordination.k8s.io
45+
resources:
46+
- leases
47+
verbs:
48+
- get
49+
- list
50+
- watch
51+
- create
52+
- update
53+
- patch
54+
- delete
4355
{{- end }}

0 commit comments

Comments
 (0)