Skip to content

Commit 54527a6

Browse files
committed
Upgrade dependencies
1 parent 56d4400 commit 54527a6

File tree

105 files changed

+26702
-23025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+26702
-23025
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs: # adding these parameters to make this reusable later on
88
kind_k8s_version:
99
description: 'The k8s version to use'
1010
required: true
11-
default: 'v1.27.3'
11+
default: 'v1.34.0'
1212
kind_config:
1313
description: 'Path to the kind config to use'
1414
required: true
@@ -24,11 +24,12 @@ runs:
2424
steps:
2525
- name: Set up Docker Buildx
2626
uses: docker/setup-buildx-action@v3
27-
- uses: engineerd/[email protected]
27+
- name: Setup Kind
28+
uses: helm/[email protected]
2829
with:
29-
name: ${{ inputs.kind_cluster_name }}
30-
version: v0.20.0
31-
image: kindest/node:${{ inputs.kind_k8s_version }}
30+
cluster_name: ${{ inputs.kind_cluster_name }}
31+
version: v0.30.0
32+
node_image: kindest/node:${{ inputs.kind_k8s_version }}
3233
config: ${{ inputs.kind_config }}
3334

3435
- name: Check kind cluster and extract kubeconfig

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

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,39 @@ on:
55
tags:
66
- '*'
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
10-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1115
steps:
12-
- uses: actions/checkout@v2
16+
- name: Checkout code
17+
uses: actions/checkout@v4
1318
- name: Get tag name
1419
id: vars
15-
run: echo ::set-output name=tag::${GITHUB_REF:10}
16-
- uses: docker/build-push-action@v1
20+
run: echo "tag=${GITHUB_REF:10}" >> $GITHUB_OUTPUT
21+
- name: Set up Docker Buildx
22+
uses: docker/setup-buildx-action@v3
23+
- name: Login to Docker Hub
1724
if: ${{ !startsWith( steps.vars.outputs.tag, 'kafka-' ) }}
25+
uses: docker/login-action@v3
1826
with:
19-
dockerfile: Dockerfile
20-
build_args: VERSION=${{ steps.vars.outputs.tag }},GIT_SHA=${{ github.sha }}
2127
username: ${{ secrets.DOCKER_USERNAME }}
2228
password: ${{ secrets.DOCKER_PASSWORD }}
23-
repository: adobe/kafka-operator
24-
tag_with_ref: true
29+
- name: Build and push
30+
uses: docker/build-push-action@v6
31+
if: ${{ !startsWith( steps.vars.outputs.tag, 'kafka-' ) }}
32+
with:
33+
context: .
34+
file: ./Dockerfile
35+
build-args: |
36+
VERSION=${{ steps.vars.outputs.tag }}
37+
GIT_SHA=${{ github.sha }}
38+
tags: adobe/kafka-operator:${{ steps.vars.outputs.tag }}
2539
push: ${{ startsWith(github.ref, 'refs/tags/') }}
26-
add_git_labels: true
40+
labels: |
41+
org.opencontainers.image.source=${{ github.event.repository.html_url }}
42+
org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
43+
org.opencontainers.image.revision=${{ github.sha }}

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ on:
55
tags:
66
- 'kafka-*'
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
10-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1115
steps:
12-
- uses: actions/checkout@v2
16+
- name: Checkout code
17+
uses: actions/checkout@v4
1318
- name: Prepare
1419
id: prep
1520
run: |
@@ -21,21 +26,21 @@ jobs:
2126
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
2227
fi
2328
TAGS="${DOCKER_IMAGE}:${VERSION}"
24-
echo ::set-output name=version::${VERSION}
25-
echo ::set-output name=tags::${TAGS}
26-
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
29+
echo "version=${VERSION}" >> $GITHUB_OUTPUT
30+
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
31+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
2732
- name: Set up QEMU
2833
uses: docker/setup-qemu-action@v3
2934
- name: Set up Docker Buildx
3035
uses: docker/setup-buildx-action@v3
3136
- name: Login to DockerHub
3237
if: startsWith(github.ref, 'refs/tags/')
33-
uses: docker/login-action@v1
38+
uses: docker/login-action@v3
3439
with:
3540
username: ${{ secrets.DOCKER_USERNAME }}
3641
password: ${{ secrets.DOCKER_PASSWORD }}
3742
- name: Build and push
38-
uses: docker/build-push-action@v5
43+
uses: docker/build-push-action@v6
3944
with:
4045
context: docker/kafka
4146
platforms: linux/amd64,linux/arm64

.github/workflows/ci.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,24 @@ on:
66
- master
77
pull_request:
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
check-integrity:
1115
name: Check integrity
1216
runs-on: ubuntu-22.04
1317

1418
steps:
15-
- name: Set up Go
16-
uses: actions/setup-go@v4
17-
with:
18-
go-version: 1.21
19-
2019
- name: Checkout code
2120
uses: actions/checkout@v4
2221

22+
- name: Set up Go
23+
uses: actions/setup-go@v5
24+
with:
25+
go-version: '1.25'
26+
2327
- name: Check Go modules dependency file integrity
2428
run: |
2529
find . -type f -name go.mod | while read module_file; do
@@ -48,16 +52,16 @@ jobs:
4852
runs-on: ubuntu-22.04
4953

5054
steps:
51-
- name: Set up Go
52-
uses: actions/setup-go@v4
53-
with:
54-
go-version: 1.21
55-
5655
- name: Checkout code
5756
uses: actions/checkout@v4
5857

58+
- name: Set up Go
59+
uses: actions/setup-go@v5
60+
with:
61+
go-version: '1.25'
62+
5963
- name: License cache
60-
uses: actions/cache@v3
64+
uses: actions/cache@v4
6165
with:
6266
path: .licensei.cache
6367
key: license-v1-${{ hashFiles('**/go.sum') }}

.github/workflows/codeql-analysis.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ on:
2020
schedule:
2121
- cron: '34 23 * * 4'
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428
analyze:
2529
name: Analyze
26-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-22.04
2731
permissions:
2832
actions: read
2933
contents: read
@@ -39,11 +43,11 @@ jobs:
3943

4044
steps:
4145
- name: Checkout repository
42-
uses: actions/checkout@v2
46+
uses: actions/checkout@v4
4347

4448
# Initializes the CodeQL tools for scanning.
4549
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
50+
uses: github/codeql-action/init@v3
4751
with:
4852
languages: ${{ matrix.language }}
4953
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +58,7 @@ jobs:
5458
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5559
# If this step fails, then you should remove it and run the build manually (see below)
5660
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v2
61+
uses: github/codeql-action/autobuild@v3
5862

5963
# ℹ️ Command-line programs to run using the OS shell.
6064
# 📚 https://git.io/JvXDl
@@ -68,4 +72,4 @@ jobs:
6872
# make release
6973

7074
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v2
75+
uses: github/codeql-action/analyze@v3

.github/workflows/e2e-test.yaml

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,46 @@ on:
66
- master
77
pull_request:
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
env:
1014
REPOSITORY: koperator_e2e_test
1115

1216
jobs:
1317
build:
14-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1519

1620
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v4
23+
24+
- name: Clean workspace
25+
run: |
26+
# Remove any existing go.work files to ensure clean module resolution
27+
rm -f go.work go.work.sum
28+
1729
- name: Set up Go
18-
uses: actions/setup-go@v4
30+
uses: actions/setup-go@v5
31+
with:
32+
go-version: '1.25'
33+
34+
- name: Cache Go modules
35+
uses: actions/cache@v4
1936
with:
20-
go-version: 1.21
37+
path: |
38+
~/.cache/go-build
39+
~/go/pkg/mod
40+
key: ${{ runner.os }}-go-${{ hashFiles('go.sum', 'api/go.sum', 'properties/go.sum', 'tests/e2e/go.sum') }}
41+
restore-keys: |
42+
${{ runner.os }}-go-
2143
2244
# Enable Tmate Session if you'd like to Debut the E2E Kind Cluster
2345
# - name: Setup tmate session
2446
# uses: mxschmitt/action-tmate@v3
2547
# with:
2648
# detached: true
27-
28-
- name: Checkout code
29-
uses: actions/checkout@v4
3049

3150
- name: Build docker image
3251
run: |
@@ -41,10 +60,18 @@ jobs:
4160
kind load docker-image $REPOSITORY:$GITHUB_SHA --name e2e-kind
4261
4362
63+
- name: Download dependencies
64+
run: |
65+
# Download dependencies for all modules
66+
go mod download
67+
cd api && go mod download && cd ..
68+
cd properties && go mod download && cd ..
69+
cd tests/e2e && go mod download && cd ../..
70+
4471
- name: Run E2E tests
4572
env:
4673
KUBECONFIG: ${{ steps.setup-kind.outputs.kubeconfig }}
4774
run: |
48-
go work init
49-
go work use -r .
75+
# Clean any existing go.work files to avoid workspace conflicts
76+
rm -f go.work go.work.sum
5077
IMG_E2E=$REPOSITORY:$GITHUB_SHA make test-e2e

.github/workflows/helm.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,28 @@ on:
1111
- "chart/**/[0-9]+.[0-9]+.[0-9]+-adobe-[0-9]+"
1212
pull_request:
1313

14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: true
17+
1418
env:
1519
HELM_CHART_NAME: kafka-operator
1620
HELM_CHART_PATH: "${{ github.workspace }}/charts/kafka-operator"
1721
HELM_PLUGIN_CHARTMUSEUM_PUSH_VERSION: 0.9.0
1822
HELM_PUSH_REPOSITORY_NAME: banzaicloud-stable
19-
HELM_VERSION: 3.6.0
23+
HELM_VERSION: 3.16.4
2024

2125
jobs:
2226
helm:
2327
name: Helm
24-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2529

2630
steps:
2731
- name: Checkout
2832
uses: actions/checkout@v4
2933

30-
- uses: azure/setup-helm@v3
34+
- name: Setup Helm
35+
uses: azure/setup-helm@v4
3136
with:
3237
version: ${{ env.HELM_VERSION }}
3338

0 commit comments

Comments
 (0)