Skip to content

Commit cbc96ff

Browse files
committed
Merge main
2 parents 6cf3881 + ed49499 commit cbc96ff

File tree

113 files changed

+1632
-659
lines changed

Some content is hidden

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

113 files changed

+1632
-659
lines changed

.dev/dev_arm64.yaml renamed to .dev/dev.yaml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# This is a compose file designed for arm64/Apple Silicon systems
2-
# To adapt this to x86 please find and replace ".arm64" with empty
3-
4-
# ARM64 supported images for kafka can be found here
5-
# https://hub.docker.com/r/confluentinc/cp-kafka/tags?page=1&name=arm64
6-
---
71
version: '3.8'
82
name: "kafbat-ui-dev"
93

@@ -32,7 +26,7 @@ services:
3226
KAFKA_CLUSTERS_0_AUDIT_CONSOLEAUDITENABLED: 'true'
3327

3428
kafka0:
35-
image: confluentinc/cp-kafka:7.6.0.arm64
29+
image: confluentinc/cp-kafka:7.8.0
3630
user: "0:0"
3731
hostname: kafka0
3832
container_name: kafka0
@@ -60,7 +54,7 @@ services:
6054
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
6155

6256
schema-registry0:
63-
image: confluentinc/cp-schema-registry:7.6.0.arm64
57+
image: confluentinc/cp-schema-registry:7.8.0
6458
ports:
6559
- 8085:8085
6660
depends_on:
@@ -76,7 +70,7 @@ services:
7670
SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
7771

7872
kafka-connect0:
79-
image: confluentinc/cp-kafka-connect:7.6.0.arm64
73+
image: confluentinc/cp-kafka-connect:7.8.0
8074
ports:
8175
- 8083:8083
8276
depends_on:
@@ -101,7 +95,7 @@ services:
10195
CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components,/usr/local/share/kafka/plugins,/usr/share/filestream-connectors"
10296

10397
ksqldb0:
104-
image: confluentinc/cp-ksqldb-server:7.6.0.arm64
98+
image: confluentinc/cp-ksqldb-server:7.8.0
10599
depends_on:
106100
- kafka0
107101
- kafka-connect0
@@ -119,7 +113,7 @@ services:
119113
KSQL_CACHE_MAX_BYTES_BUFFERING: 0
120114

121115
kafka-init-topics:
122-
image: confluentinc/cp-kafka:7.6.0.arm64
116+
image: confluentinc/cp-kafka:7.8.0
123117
volumes:
124118
- ../documentation/compose/data/message.json:/data/message.json
125119
depends_on:

.github/workflows/backend_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
cancel-in-progress: true
2020

2121
jobs:
22-
build:
22+
build-and-test:
2323
uses: ./.github/workflows/backend_tests.yml
2424
with:
2525
event_name: ${{ github.event_name }}

.github/workflows/backend_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020
cancel-in-progress: true
2121

2222
jobs:
23-
build:
23+
build-and-test:
2424
uses: ./.github/workflows/backend_tests.yml
2525
with:
2626
event_name: ${{ github.event_name }}

.github/workflows/cve_checks.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: "Infra: CVE checks"
22
on:
3+
pull_request:
4+
types: [ "opened", "reopened", "synchronize" ]
5+
push:
6+
branches: [ "main" ]
37
workflow_dispatch:
48
schedule:
59
# * is a special character in YAML so you have to quote this string
@@ -9,7 +13,8 @@ permissions:
913
contents: read
1014

1115
jobs:
12-
build-and-test:
16+
17+
check-cves:
1318
runs-on: ubuntu-latest
1419

1520
steps:
@@ -62,8 +67,17 @@ jobs:
6267
cache-to: type=local,dest=/tmp/.buildx-cache
6368

6469
- name: Run CVE checks
65-
uses: aquasecurity/trivy-action@0.19.0
70+
uses: aquasecurity/trivy-action@0.29.0
6671
with:
6772
image-ref: "ghcr.io/kafbat/kafka-ui:${{ steps.build.outputs.version }}"
6873
format: "table"
6974
exit-code: "1"
75+
76+
notify:
77+
needs: check-cves
78+
if: ${{ always() && needs.build-and-test.result == 'failure' && github.event_name == 'schedule' }}
79+
uses: ./.github/workflows/infra_discord_hook.yml
80+
with:
81+
message: "Attention! CVE checks run failed! Please fix them CVEs :("
82+
secrets:
83+
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL_CVE }}

.github/workflows/frontend_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
build:
18+
build-and-test:
1919
uses: ./.github/workflows/frontend_tests.yml

.github/workflows/frontend_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
jobs:
19-
build:
19+
build-and-test:
2020
uses: ./.github/workflows/frontend_tests.yml

.github/workflows/frontend_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install node
2929
uses: actions/[email protected]
3030
with:
31-
node-version: "18.17.1"
31+
node-version: "22.12.0"
3232
cache: "pnpm"
3333
cache-dependency-path: "./frontend/pnpm-lock.yaml"
3434

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: 'Discord hook'
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
message:
7+
description: 'Message text'
8+
required: true
9+
type: string
10+
secrets:
11+
DISCORD_WEBHOOK_URL:
12+
required: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
19+
hook:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Notify Discord on Failure
23+
uses: Ilshidur/[email protected]
24+
with:
25+
args: ${{ inputs.message }}
26+
env:
27+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL }}

.github/workflows/md-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
contents: read
1414

1515
jobs:
16-
build-and-test:
16+
lint-md:
1717
runs-on: ubuntu-latest
1818

1919
steps:

.github/workflows/pr_linter.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ on:
55
permissions:
66
checks: write
77
jobs:
8-
task-check:
8+
check-tasks:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: kentaro-m/[email protected]
1212
with:
1313
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1414
- uses: dekinderfiets/[email protected]
15-
if: false # TODO remove when public
1615
with:
1716
repo-token: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)