From aab58f5ae7c7ae369dae7434a338d3534a0378bd Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Tue, 2 Mar 2021 19:11:56 -0500
Subject: [PATCH] Dont require credential for Container Groups

Might want to follow up and make this only apply to Tower on Kubernetes
---
 .../InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.jsx   | 2 +-
 .../src/screens/InstanceGroup/shared/ContainerGroupForm.jsx   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.jsx b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.jsx
index 3bf66a9d4d..9f4454c0a8 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.jsx
@@ -37,7 +37,7 @@ function ContainerGroupEdit({ instanceGroup }) {
     try {
       await InstanceGroupsAPI.update(instanceGroup.id, {
         name: values.name,
-        credential: values.credential.id,
+        credential: values.credential ? values.credential.id : null,
         pod_spec_override: values.override ? values.pod_spec_override : null,
       });
       history.push(detailsIUrl);
diff --git a/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx b/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx
index fda18b73bc..e41ab0a1b0 100644
--- a/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.jsx
@@ -25,7 +25,6 @@ function ContainerGroupFormFields({ i18n, instanceGroup }) {
   const { setFieldValue } = useFormikContext();
   const [credentialField, credentialMeta, credentialHelpers] = useField({
     name: 'credential',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
   });
 
   const [overrideField] = useField('override');
@@ -55,9 +54,8 @@ function ContainerGroupFormFields({ i18n, instanceGroup }) {
         onBlur={() => credentialHelpers.setTouched()}
         onChange={onCredentialChange}
         value={credentialField.value}
-        required
         tooltip={i18n._(
-          t`Credential to authenticate with Kubernetes or OpenShift.  Must be of type "Kubernetes/OpenShift API Bearer Token”.`
+          t`Credential to authenticate with Kubernetes or OpenShift. Must be of type "Kubernetes/OpenShift API Bearer Token". If left blank, the underlying Pod's service account will be used.`
         )}
         autoPopulate={!instanceGroup?.id}
       />