Skip to content

Commit 2442ff9

Browse files
amuraruamuraru
committed
fix(deps): update all non-major dependencies (#160)
1 parent 619f22f commit 2442ff9

File tree

23 files changed

+301
-110
lines changed

23 files changed

+301
-110
lines changed

‎.github/actions/kind-create/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
- name: Set up Docker Buildx
2626
uses: docker/setup-buildx-action@v3
2727
- name: Setup Kind
28-
uses: helm/kind-action@v1.10.0
28+
uses: helm/kind-action@v1.12.0
2929
with:
3030
cluster_name: ${{ inputs.kind_cluster_name }}
3131
version: v0.30.0

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,24 @@ jobs:
6060
with:
6161
go-version: '1.25'
6262

63-
- name: Clean Go module cache
63+
- name: Clean Go module and build cache
6464
run: |
65-
# Clean any existing Go module cache to avoid conflicts
65+
# Clean any existing Go module and build cache to avoid conflicts
6666
sudo rm -rf ~/go/pkg/mod || true
67+
sudo rm -rf ~/.cache/go-build || true
6768
mkdir -p ~/go/pkg/mod
69+
mkdir -p ~/.cache/go-build
70+
# Ensure proper permissions
6871
chmod -R 755 ~/go/pkg/mod
69-
70-
- name: Cache Go modules
71-
uses: actions/cache/restore@v4
72-
with:
73-
path: ~/go/pkg/mod
74-
key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
75-
restore-keys: |
76-
${{ runner.os }}-gomod-
77-
enableCrossOsArchive: false
78-
fail-on-cache-miss: false
79-
80-
- name: Cache Go build cache
81-
uses: actions/cache/restore@v4
82-
with:
83-
path: ~/.cache/go-build
84-
key: ${{ runner.os }}-gobuild-${{ github.sha }}
85-
restore-keys: |
86-
${{ runner.os }}-gobuild-
87-
enableCrossOsArchive: false
88-
fail-on-cache-miss: false
72+
chmod -R 755 ~/.cache/go-build
8973
9074
- name: License cache
9175
uses: actions/cache/restore@v4
9276
with:
9377
path: .licensei.cache
94-
key: license-v1-${{ hashFiles('**/go.sum') }}
78+
key: ci-license-v1-${{ hashFiles('**/go.sum') }}
9579
restore-keys: |
80+
ci-license-v1-
9681
license-v1-
9782
enableCrossOsArchive: false
9883
fail-on-cache-miss: false
@@ -131,20 +116,9 @@ jobs:
131116
run: |
132117
make test
133118
134-
- name: Save Go modules cache
135-
uses: actions/cache/save@v4
136-
with:
137-
path: ~/go/pkg/mod
138-
key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
139-
140-
- name: Save Go build cache
141-
uses: actions/cache/save@v4
142-
with:
143-
path: ~/.cache/go-build
144-
key: ${{ runner.os }}-gobuild-${{ github.sha }}
145-
146119
- name: Save license cache
147120
uses: actions/cache/save@v4
148121
with:
149122
path: .licensei.cache
150-
key: license-v1-${{ hashFiles('**/go.sum') }}
123+
key: ci-license-v1-${{ hashFiles('**/go.sum') }}
124+

‎.github/workflows/e2e-test.yaml‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,12 @@ jobs:
4141
# Clean any existing Go module cache to avoid conflicts
4242
# Use sudo to handle permission issues and force removal
4343
sudo rm -rf ~/go/pkg/mod || true
44+
sudo rm -rf ~/.cache/go-build || true
4445
mkdir -p ~/go/pkg/mod
46+
mkdir -p ~/.cache/go-build
4547
# Ensure proper permissions
4648
chmod -R 755 ~/go/pkg/mod
47-
48-
- name: Cache Go modules
49-
uses: actions/cache/restore@v4
50-
with:
51-
path: ~/go/pkg/mod
52-
key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
53-
restore-keys: |
54-
${{ runner.os }}-gomod-
55-
enableCrossOsArchive: false
56-
fail-on-cache-miss: false
57-
58-
- name: Cache Go build cache
59-
uses: actions/cache/restore@v4
60-
with:
61-
path: ~/.cache/go-build
62-
key: ${{ runner.os }}-gobuild-${{ github.sha }}
63-
restore-keys: |
64-
${{ runner.os }}-gobuild-
65-
enableCrossOsArchive: false
66-
fail-on-cache-miss: false
49+
chmod -R 755 ~/.cache/go-build
6750
6851
# Enable Tmate Session if you'd like to Debut the E2E Kind Cluster
6952
# - name: Setup tmate session
@@ -92,17 +75,6 @@ jobs:
9275
cd properties && go mod download && cd ..
9376
cd tests/e2e && go mod download && cd ../..
9477
95-
- name: Save Go modules cache
96-
uses: actions/cache/save@v4
97-
with:
98-
path: ~/go/pkg/mod
99-
key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
100-
101-
- name: Save Go build cache
102-
uses: actions/cache/save@v4
103-
with:
104-
path: ~/.cache/go-build
105-
key: ${{ runner.os }}-gobuild-${{ github.sha }}
10678
10779
- name: Run E2E tests
10880
env:

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ RELEASE_MSG ?= "koperator release"
1818
REL_TAG = $(shell ./scripts/increment_version.sh -${RELEASE_TYPE} ${TAG})
1919

2020
# Version constants
21-
GOLANGCI_VERSION = 2.4.0 # renovate: datasource=github-releases depName=golangci/golangci-lint
21+
GOLANGCI_VERSION = 2.5.0 # renovate: datasource=github-releases depName=golangci/golangci-lint
2222
LICENSEI_VERSION = 0.9.0 # renovate: datasource=github-releases depName=goph/licensei
2323
CONTROLLER_GEN_VERSION = v0.19.0 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
24-
ENVTEST_K8S_VERSION = 1.34.0 # renovate: datasource=github-releases depName=kubernetes/kubernetes
24+
ENVTEST_K8S_VERSION = 1.34.1 # renovate: datasource=github-releases depName=kubernetes/kubernetes
2525
SETUP_ENVTEST_VERSION := latest
2626
ADDLICENSE_VERSION := 1.2.0 # renovate: datasource=github-releases depName=google/addlicense
2727
GOTEMPLATE_VERSION := 3.12.0 # renovate: datasource=github-releases depName=cznic/gotemplate
@@ -95,6 +95,7 @@ install-kustomize: ## Install kustomize.
9595
test: generate fmt vet bin/setup-envtest
9696
cd api && go test ./...
9797
KUBEBUILDER_ASSETS=$$($(BIN_DIR)/setup-envtest --print path --bin-dir $(BIN_DIR) use $(ENVTEST_K8S_VERSION)) \
98+
GINKGO_FLAKE_ATTEMPTS=3 \
9899
go test ./... \
99100
-coverprofile cover.out \
100101
-v \
@@ -147,11 +148,13 @@ fmt: ## Run go fmt against code.
147148
go fmt ./...
148149
cd api && go fmt ./...
149150
cd properties && go fmt ./...
151+
cd tests/e2e && go fmt ./...
150152

151153
vet: ## Run go vet against code.
152154
go vet ./...
153155
cd api && go fmt ./...
154156
cd properties && go vet ./...
157+
cd tests/e2e && go vet ./...
155158

156159
generate: bin/controller-gen gen-license-header ## Generate source code for APIs, Mocks, etc.
157160
cd api && $(CONTROLLER_GEN) object:headerFile=$(BOILERPLATE_DIR)/header.go.generated.txt paths="./..."

‎docs/benchmarks/loadgens/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ WORKDIR /build/sangrenel
1515

1616
RUN go mod download && go build -o /sangrenel
1717

18-
FROM alpine:3.18
18+
FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
1919

2020
RUN apk add --update --no-cache ca-certificates tzdata curl bash
2121

‎docs/examples/springboot-kafka-avro/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6-jdk-11-slim as build
1+
FROM maven:3.8-jdk-11-slim@sha256:2cb7c73ba2fd0f7ae64cfabd99180030ec85841a1197b4ae821d21836cb0aa3b as build
22

33
# Resolve all the dependencies and cache them to save a LOT of time
44
COPY pom.xml /usr/src/myapp/

‎docs/examples/springboot-kafka-avro/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.1.5.RELEASE</version>
8+
<version>2.7.18</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.banzaicloud.blog</groupId>
@@ -46,17 +46,17 @@
4646
<dependency>
4747
<groupId>io.confluent</groupId>
4848
<artifactId>kafka-schema-registry-client</artifactId> <!-- <1> -->
49-
<version>5.3.0</version>
49+
<version>5.5.15</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.avro</groupId>
5353
<artifactId>avro</artifactId> <!-- <2> -->
54-
<version>1.11.4</version>
54+
<version>1.12.0</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>io.confluent</groupId>
5858
<artifactId>kafka-avro-serializer</artifactId> <!-- <3> -->
59-
<version>5.3.0</version>
59+
<version>5.5.15</version>
6060
</dependency>
6161
</dependencies>
6262

@@ -70,7 +70,7 @@
7070
<plugin>
7171
<groupId>org.apache.avro</groupId>
7272
<artifactId>avro-maven-plugin</artifactId>
73-
<version>1.8.2</version>
73+
<version>1.12.0</version>
7474
<executions>
7575
<execution>
7676
<phase>generate-sources</phase>

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25
55
require (
66
dario.cat/mergo v1.0.2
77
emperror.dev/errors v0.8.1
8-
github.com/IBM/sarama v1.46.0
8+
github.com/IBM/sarama v1.46.1
99
github.com/Masterminds/sprig/v3 v3.3.0
1010
github.com/banzaicloud/go-cruise-control v0.6.0
1111
github.com/banzaicloud/istio-client-go v0.0.17
@@ -16,7 +16,7 @@ require (
1616
github.com/cert-manager/cert-manager v1.18.2
1717
github.com/cisco-open/cluster-registry-controller/api v0.2.12
1818
github.com/envoyproxy/go-control-plane v0.13.4
19-
github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250926061013-da3e293e0651
19+
github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250926155504-ac643a5856f9
2020
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
2121
github.com/go-logr/logr v1.4.3
2222
github.com/onsi/ginkgo/v2 v2.25.3

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
44
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
55
emperror.dev/errors v0.8.1 h1:UavXZ5cSX/4u9iyvH6aDcuGkVjeexUGJ7Ij7G4VfQT0=
66
emperror.dev/errors v0.8.1/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE=
7-
github.com/IBM/sarama v1.46.0 h1:+YTM1fNd6WKMchlnLKRUB5Z0qD4M8YbvwIIPLvJD53s=
8-
github.com/IBM/sarama v1.46.0/go.mod h1:0lOcuQziJ1/mBGHkdp5uYrltqQuKQKM5O5FOWUQVVvo=
7+
github.com/IBM/sarama v1.46.1 h1:AlDkvyQm4LKktoQZxv0sbTfH3xukeH7r/UFBbUmFV9M=
8+
github.com/IBM/sarama v1.46.1/go.mod h1:ipyOREIx+o9rMSrrPGLZHGuT0mzecNzKd19Quq+Q8AA=
99
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
1010
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
1111
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
@@ -40,8 +40,8 @@ github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bF
4040
github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
4141
github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
4242
github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
43-
github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250926061013-da3e293e0651 h1:EKfwoXQq/ptgJtUY4L9fqSGnEzyqvOWut0xND0+oe8g=
44-
github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250926061013-da3e293e0651/go.mod h1:2LcmvJoXsDSrsGZIxGM0Gah9ykiwTn/kgjyQdnNH8Jc=
43+
github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250926155504-ac643a5856f9 h1:nnHvPVpBTcIUIuCMAe9bFmV7Ra4lO9xnohreZagKUs0=
44+
github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250926155504-ac643a5856f9/go.mod h1:2LcmvJoXsDSrsGZIxGM0Gah9ykiwTn/kgjyQdnNH8Jc=
4545
github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
4646
github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
4747
github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=

‎run-e2e.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export IMG_E2E=koperator_e2e_test:latest
44

55
kind delete clusters e2e-kind
6-
kind create cluster --config=/Users/dvaseeka/Documents/adobe/kRaft-migration/pipeline-kraft-migration/koperators/koperator/tests/e2e/platforms/kind/kind_config.yaml --name=e2e-kind
6+
kind create cluster --config=tests/e2e/platforms/kind/kind_config.yaml --name=e2e-kind
77
kubectl label node e2e-kind-control-plane node.kubernetes.io/exclude-from-external-load-balancers-
88
docker build . -t koperator_e2e_test
99
kind load docker-image koperator_e2e_test:latest --name e2e-kind

0 commit comments

Comments
 (0)