Skip to content

Commit 8f73f48

Browse files
o-afanasenkoo-afanasenko
authored
Merge branch 'main' into feature/rest-timeout
2 parents 8abd881 + 5a40117 commit 8f73f48

File tree

17 files changed

+31
-51
lines changed

17 files changed

+31
-51
lines changed

‎.dev/dev.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ services:
2727

2828
kafka0:
2929
image: confluentinc/cp-kafka:7.8.0
30-
user: "0:0"
3130
hostname: kafka0
3231
container_name: kafka0
3332
ports:

‎.github/workflows/docker_publish.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
registry: [ 'docker.io', 'ghcr.io', 'ecr' ]
23+
registry: [ 'docker.io', 'ghcr.io', 'public.ecr.aws' ]
2424

2525
runs-on: ubuntu-latest
2626
steps:
@@ -31,7 +31,8 @@ jobs:
3131
name: image
3232
path: /tmp
3333

34-
# setup containerd to preserve provenance attestations :https://docs.docker.com/build/attestations/#creating-attestations
34+
# setup containerd to preserve provenance attestations:
35+
# https://docs.docker.com/build/attestations/#creating-attestations
3536
- name: Setup docker with containerd
3637
uses: crazy-max/ghaction-setup-docker@v3
3738
with:
@@ -63,33 +64,33 @@ jobs:
6364
password: ${{ secrets.GITHUB_TOKEN }}
6465

6566
- name: Configure AWS credentials
66-
if: matrix.registry == 'ecr'
67+
if: matrix.registry == 'public.ecr.aws'
6768
uses: aws-actions/configure-aws-credentials@v4
6869
with:
6970
aws-region: us-east-1 # This region only for public ECR
7071
role-to-assume: ${{ secrets.AWS_ROLE }}
7172

7273
- name: Login to public ECR
73-
if: matrix.registry == 'ecr'
74+
if: matrix.registry == 'public.ecr.aws'
7475
id: login-ecr-public
7576
uses: aws-actions/amazon-ecr-login@v2
7677
with:
7778
registry-type: public
7879

79-
- name: define env vars
80+
- name: Define env vars for container registry URL
8081
run: |
81-
if [ ${{matrix.registry }} == 'docker.io' ]; then
82-
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
83-
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
84-
elif [ ${{ matrix.registry }} == 'ghcr.io' ]; then
85-
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
86-
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
87-
elif [ ${{ matrix.registry }} == 'ecr' ]; then
82+
if [ ${{ matrix.registry }} == 'public.ecr.aws' ]; then
83+
# vars.ECR_REGISTRY value is expected to be of the `public.ecr.aws/<public_ecr_id>` form
84+
# The `public_ecr_id` must be a *default* alias associated with public regsitry (rather
85+
# than a custom alias)
8886
echo "REGISTRY=${{ vars.ECR_REGISTRY }}" >> $GITHUB_ENV
87+
# Trim GH Org name so that resulting Public ECR URL has no duplicate org name
88+
# Public ECR default alias: public.ecr.aws/<public_ecr_id>/kafka-ui
89+
# Public ECR custom alias: public.ecr.aws/kafbat/kafka-ui
90+
echo "REPOSITORY=$(basename ${{ github.repository }})" >> $GITHUB_ENV
91+
else # this covers the case of docker.io and ghcr.io
92+
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
8993
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
90-
else
91-
echo "REGISTRY=" >> $GITHUB_ENV
92-
echo "REPOSITORY=notworking" >> $GITHUB_ENV
9394
fi
9495
9596
- name: Push images to ${{ matrix.registry }}

‎contract/src/main/resources/swagger/kafka-sr-api.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ paths:
165165
schema:
166166
$ref: '#/components/schemas/SubjectId'
167167

168-
/config/:
168+
/config:
169169
get:
170170
tags:
171171
- KafkaSrClient

‎documentation/compose/auth-context.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ services:
4242
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
4343
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
4444
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
45-
volumes:
46-
- ./scripts/update_run.sh:/tmp/update_run.sh
47-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
45+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'

‎documentation/compose/cluster-sr-auth.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ services:
2626
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
2727
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
2828
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
29-
volumes:
30-
- ./scripts/update_run.sh:/tmp/update_run.sh
31-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
29+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
3230

3331
schemaregistry1:
3432
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/e2e-tests.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ services:
3030

3131
kafka0:
3232
image: confluentinc/cp-kafka:7.8.0
33-
user: "0:0"
3433
hostname: kafka0
3534
container_name: kafka0
3635
healthcheck:

‎documentation/compose/kafbat-ui.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ services:
5050
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
5151
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
5252
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
53-
volumes:
54-
- ./scripts/update_run.sh:/tmp/update_run.sh
55-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
53+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5654

5755
kafka1:
5856
image: confluentinc/cp-kafka:7.8.0
@@ -78,9 +76,7 @@ services:
7876
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
7977
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
8078
KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
81-
volumes:
82-
- ./scripts/update_run.sh:/tmp/update_run.sh
83-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
79+
CLUSTER_ID: 'zlFiTJelTOuhnklFwLWixw'
8480

8581
schemaregistry0:
8682
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/kafka-ssl-components.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@ services:
7272
#KAFKA_SSL_CLIENT_AUTH: 'required'
7373
KAFKA_SSL_CLIENT_AUTH: 'requested'
7474
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
75+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
7576
volumes:
76-
- ./scripts/update_run.sh:/tmp/update_run.sh
7777
- ./ssl/creds:/etc/kafka/secrets/creds
7878
- ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
7979
- ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
80-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
8180

8281
schemaregistry0:
8382
image: confluentinc/cp-schema-registry:7.8.0

‎documentation/compose/kafka-ssl.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ services:
5555
#KAFKA_SSL_CLIENT_AUTH: 'required'
5656
KAFKA_SSL_CLIENT_AUTH: 'requested'
5757
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
58+
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
5859
volumes:
59-
- ./scripts/update_run.sh:/tmp/update_run.sh
6060
- ./ssl/creds:/etc/kafka/secrets/creds
6161
- ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
6262
- ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
63-
command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"

‎documentation/compose/ui-acl-with-zk.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ services:
5555
KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
5656
KAFKA_SUPER_USERS: 'User:admin'
5757
volumes:
58-
- ./scripts/update_run.sh:/tmp/update_run.sh
5958
- ./jaas:/etc/kafka/jaas

0 commit comments

Comments
 (0)