From 6fa22f5be29262d52e9ee95bc37dc133ccb54de9 Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Tue, 21 Feb 2023 16:17:48 -0500
Subject: [PATCH] Add UI for the new setting

---
 .../screens/Setting/Jobs/JobsEdit/JobsEdit.js |  5 +++++
 .../Setting/Jobs/JobsEdit/JobsEdit.test.js    |  1 +
 .../shared/data.allSettingOptions.json        | 19 +++++++++++++++++++
 .../Setting/shared/data.allSettings.json      |  1 +
 .../Setting/shared/data.jobSettings.json      |  1 +
 5 files changed, 27 insertions(+)

diff --git a/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js b/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
index 52e216e41e..d258fdec46 100644
--- a/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
+++ b/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
@@ -150,6 +150,11 @@ function JobsEdit() {
                   type={options?.SCHEDULE_MAX_JOBS ? 'number' : undefined}
                   isRequired={Boolean(options?.SCHEDULE_MAX_JOBS)}
                 />
+                <InputField
+                  name="AWX_RUNNER_KEEPALIVE_SECONDS"
+                  config={jobs.AWX_RUNNER_KEEPALIVE_SECONDS}
+                  type="number"
+                />
                 <InputField
                   name="DEFAULT_JOB_TIMEOUT"
                   config={jobs.DEFAULT_JOB_TIMEOUT}
diff --git a/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.test.js b/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.test.js
index 3f8b6dd220..0d9d2a9ca2 100644
--- a/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.test.js
+++ b/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.test.js
@@ -79,6 +79,7 @@ describe('<JobsEdit />', () => {
     const {
       EVENT_STDOUT_MAX_BYTES_DISPLAY,
       STDOUT_MAX_BYTES_DISPLAY,
+      AWX_RUNNER_KEEPALIVE_SECONDS,
       ...jobRequest
     } = mockJobSettings;
     expect(SettingsAPI.updateAll).toHaveBeenCalledWith(jobRequest);
diff --git a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
index b654d1bd90..3eaf93eff0 100644
--- a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
+++ b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
@@ -344,6 +344,16 @@
         "category_slug": "jobs",
         "default": 10
       },
+      "AWX_RUNNER_KEEPALIVE_SECONDS": {
+        "type": "integer",
+        "required": true,
+        "label": "K8S Ansible Runner Keep-Alive Message Interval",
+        "help_text": "Only applies to K8S deployments and container_group jobs. If not 0, send a message every so-many seconds to keep connection open.",
+        "category": "Jobs",
+        "category_slug": "jobs",
+        "placeholder": 240,
+        "default": 0
+      },
       "AWX_ANSIBLE_CALLBACK_PLUGINS": {
         "type": "list",
         "required": false,
@@ -4098,6 +4108,15 @@
         "category_slug": "jobs",
         "defined_in_file": false
       },
+      "AWX_RUNNER_KEEPALIVE_SECONDS": {
+        "type": "integer",
+        "label": "K8S Ansible Runner Keep-Alive Message Interval",
+        "help_text": "Only applies to K8S deployments and container_group jobs. If not 0, send a message every so-many seconds to keep connection open.",
+        "category": "Jobs",
+        "category_slug": "jobs",
+        "placeholder": 240,
+        "default": 0
+      },
       "AWX_ANSIBLE_CALLBACK_PLUGINS": {
         "type": "list",
         "label": "Ansible Callback Plugins",
diff --git a/awx/ui/src/screens/Setting/shared/data.allSettings.json b/awx/ui/src/screens/Setting/shared/data.allSettings.json
index e5136f4b58..b2eaea2a12 100644
--- a/awx/ui/src/screens/Setting/shared/data.allSettings.json
+++ b/awx/ui/src/screens/Setting/shared/data.allSettings.json
@@ -51,6 +51,7 @@
   "STDOUT_MAX_BYTES_DISPLAY":1048576,
   "EVENT_STDOUT_MAX_BYTES_DISPLAY":1024,
   "SCHEDULE_MAX_JOBS":10,
+  "AWX_RUNNER_KEEPALIVE_SECONDS": 0,
   "AWX_ANSIBLE_CALLBACK_PLUGINS":[],
   "DEFAULT_JOB_TIMEOUT":0,
   "DEFAULT_JOB_IDLE_TIMEOUT":0,
diff --git a/awx/ui/src/screens/Setting/shared/data.jobSettings.json b/awx/ui/src/screens/Setting/shared/data.jobSettings.json
index 29567a8f8c..6c001cca3f 100644
--- a/awx/ui/src/screens/Setting/shared/data.jobSettings.json
+++ b/awx/ui/src/screens/Setting/shared/data.jobSettings.json
@@ -19,6 +19,7 @@
   "STDOUT_MAX_BYTES_DISPLAY": 1048576,
   "EVENT_STDOUT_MAX_BYTES_DISPLAY": 1024,
   "SCHEDULE_MAX_JOBS": 10,
+  "AWX_RUNNER_KEEPALIVE_SECONDS": 0,
   "AWX_ANSIBLE_CALLBACK_PLUGINS": [],
   "DEFAULT_JOB_TIMEOUT": 0,
   "DEFAULT_JOB_IDLE_TIMEOUT": 0,