From ec4df353acde81036ca3625cbb94a26f52fabf5f Mon Sep 17 00:00:00 2001
From: Krishna Agarwal <62741600+kagarwal06@users.noreply.github.com>
Date: Thu, 23 May 2024 15:30:42 +0530
Subject: [PATCH 1/2] KAFKA-16826: Integrate Native Docker Image with github
 actions

---
 .github/workflows/docker_build_and_test.yml | 1 +
 .github/workflows/docker_promote.yml        | 4 ++--
 .github/workflows/docker_rc_release.yml     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_build_and_test.yml b/.github/workflows/docker_build_and_test.yml
index 695c08672fd87..1d30aa85ea25d 100644
--- a/.github/workflows/docker_build_and_test.yml
+++ b/.github/workflows/docker_build_and_test.yml
@@ -23,6 +23,7 @@ on:
         description: Docker image type to build and test
         options: 
           - "jvm"
+          - "native"
       kafka_url:
         description: Kafka url to be used to build the docker image
         required: true
diff --git a/.github/workflows/docker_promote.yml b/.github/workflows/docker_promote.yml
index 3449265877b8a..cd75601123d94 100644
--- a/.github/workflows/docker_promote.yml
+++ b/.github/workflows/docker_promote.yml
@@ -19,10 +19,10 @@ on:
   workflow_dispatch:
     inputs:
       rc_docker_image:
-        description: RC docker image that needs to be promoted (Example:- apache/kafka:3.6.0-rc0)
+        description: RC docker image that needs to be promoted (Example:- apache/kafka:3.6.0-rc0, apache/kafka-native:3.6.0-rc0)
         required: true
       promoted_docker_image:
-        description: Docker image name of the promoted image (Example:- apache/kafka:3.6.0)
+        description: Docker image name of the promoted image (Example:- apache/kafka:3.6.0, apache/kafka-native:3.6.0)
         required: true
 
 jobs:
diff --git a/.github/workflows/docker_rc_release.yml b/.github/workflows/docker_rc_release.yml
index c7082dcac910c..6b4c4bfa97a75 100644
--- a/.github/workflows/docker_rc_release.yml
+++ b/.github/workflows/docker_rc_release.yml
@@ -23,8 +23,9 @@ on:
         description: Docker image type to be built and pushed
         options: 
           - "jvm"
+          - "native"
       rc_docker_image:
-        description: RC docker image that needs to be built and pushed to Dockerhub (Example:- apache/kafka:3.6.0-rc0)
+        description: RC docker image that needs to be built and pushed to Dockerhub (Example:- apache/kafka:3.6.0-rc0, apache/kafka-native:3.6.0-rc0)
         required: true
       kafka_url:
         description: Kafka url to be used to build the docker image

From fc9fe4d3bfa45e0764745d52e6748bd74b40afb2 Mon Sep 17 00:00:00 2001
From: Krishna Agarwal <62741600+kagarwal06@users.noreply.github.com>
Date: Fri, 24 May 2024 12:07:32 +0530
Subject: [PATCH 2/2] KAFKA-16826: Update example message

---
 .github/workflows/docker_promote.yml    | 4 ++--
 .github/workflows/docker_rc_release.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_promote.yml b/.github/workflows/docker_promote.yml
index cd75601123d94..04872f9d59d3b 100644
--- a/.github/workflows/docker_promote.yml
+++ b/.github/workflows/docker_promote.yml
@@ -19,10 +19,10 @@ on:
   workflow_dispatch:
     inputs:
       rc_docker_image:
-        description: RC docker image that needs to be promoted (Example:- apache/kafka:3.6.0-rc0, apache/kafka-native:3.6.0-rc0)
+        description: RC docker image that needs to be promoted (Example:- apache/kafka:3.8.0-rc0 (OR) apache/kafka-native:3.8.0-rc0)
         required: true
       promoted_docker_image:
-        description: Docker image name of the promoted image (Example:- apache/kafka:3.6.0, apache/kafka-native:3.6.0)
+        description: Docker image name of the promoted image (Example:- apache/kafka:3.8.0 (OR) apache/kafka-native:3.8.0)
         required: true
 
 jobs:
diff --git a/.github/workflows/docker_rc_release.yml b/.github/workflows/docker_rc_release.yml
index 6b4c4bfa97a75..22dd924b51b61 100644
--- a/.github/workflows/docker_rc_release.yml
+++ b/.github/workflows/docker_rc_release.yml
@@ -25,7 +25,7 @@ on:
           - "jvm"
           - "native"
       rc_docker_image:
-        description: RC docker image that needs to be built and pushed to Dockerhub (Example:- apache/kafka:3.6.0-rc0, apache/kafka-native:3.6.0-rc0)
+        description: RC docker image that needs to be built and pushed to Dockerhub (Example:- apache/kafka:3.8.0-rc0 (OR) apache/kafka-native:3.8.0-rc0)
         required: true
       kafka_url:
         description: Kafka url to be used to build the docker image