Skip to content

Commit

Permalink
Merge pull request #42 from trifork/feature/upgrade-kafka-version
Browse files Browse the repository at this point in the history
Upgraded Kafka Version
  • Loading branch information
rkthtrifork authored Nov 23, 2023
2 parents 052c9ed + 5380eb8 commit 6c0c34c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
schedule:
- cron: "0 3 * * *"
push:
branches: [ 'main', 'release/v**' ]
branches: ["main", "release/v**"]
pull_request:
branches: [ 'main', 'release/v**' ]
types: [ opened, synchronize, reopened, labeled ]
branches: ["main", "release/v**"]
types: [opened, synchronize, reopened, labeled]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/megalinter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: MegaLinter

"on":
on:

Check warning on line 4 in .github/workflows/megalinter.yaml

View workflow job for this annotation

GitHub Actions / MegaLinter

4:1 [truthy] truthy value should be one of [false, true]
workflow_dispatch:
push:
branches:
Expand All @@ -22,7 +22,7 @@ permissions:
env:
# When active, APPLY_FIXES must also be defined as environment variable
# (in github/workflows/mega-linter.yml or other CI tool)
APPLY_FIXES: all
APPLY_FIXES: none

# Decide which event triggers application of fixes in a commit or a PR
# (pull_request, push, all)
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/wait-for-all-checks.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: summary
on:

Check warning on line 3 in .github/workflows/wait-for-all-checks.yml

View workflow job for this annotation

GitHub Actions / MegaLinter

3:1 [truthy] truthy value should be one of [false, true]
pull_request:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
---
# This file is needed for .env to work
version: "3"
6 changes: 3 additions & 3 deletions docker-compose/kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "2.1"

services:
zookeeper:
image: quay.io/strimzi/kafka:0.33.2-kafka-3.2.3
image: quay.io/strimzi/kafka:0.38.0-kafka-3.6.0
platform: linux/amd64
command:
["sh", "-c", "bin/zookeeper-server-start.sh config/zookeeper.properties"]
Expand All @@ -20,7 +20,7 @@ services:
- full

kafka:
image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-kafka:strimzi-0.33.0-kafka-3.3.2-trifork-1.4.0
image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-kafka:strimzi-0.38.0-kafka-3.6.0-trifork-1.5.0
platform: linux/amd64
hostname: kafka
mem_limit: 1024m
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
- full

kafka-setup:
image: quay.io/strimzi/kafka:0.33.2-kafka-3.3.2
image: quay.io/strimzi/kafka:0.38.0-kafka-3.6.0
platform: linux/amd64
container_name: kafka-setup
volumes:
Expand Down

0 comments on commit 6c0c34c

Please sign in to comment.