From 75a0382c3112787782aa9fedabb2025209f39228 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 16 Jul 2020 09:50:38 -0400 Subject: [PATCH] show k8s credentials in the Job Template prompt on launch UI --- awx/ui/client/lib/components/tag/_index.less | 2 +- .../multi-credential/multi-credential-modal.partial.html | 1 + .../multi-credential/multi-credential.partial.html | 2 ++ awx/ui/client/src/templates/prompt/prompt.controller.js | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/lib/components/tag/_index.less b/awx/ui/client/lib/components/tag/_index.less index 2be7f05320..486b304337 100644 --- a/awx/ui/client/lib/components/tag/_index.less +++ b/awx/ui/client/lib/components/tag/_index.less @@ -68,7 +68,7 @@ content: '\f14c' } - &--kubernetes_bearer_token:before { + &--kubernetes:before, &--kubernetes_bearer_token:before { content: '\f0c2'; } } diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html index 22c019d4a0..f40c9c55a4 100644 --- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html +++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html @@ -29,6 +29,7 @@ +
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html index 052c81f94f..054d48a29c 100644 --- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html +++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html @@ -26,6 +26,7 @@ +
@@ -34,6 +35,7 @@ +
diff --git a/awx/ui/client/src/templates/prompt/prompt.controller.js b/awx/ui/client/src/templates/prompt/prompt.controller.js index 53a8370a0c..f923c8018e 100644 --- a/awx/ui/client/src/templates/prompt/prompt.controller.js +++ b/awx/ui/client/src/templates/prompt/prompt.controller.js @@ -55,7 +55,7 @@ export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings', '$f vm.promptDataClone.prompts.credentials.credentialTypeOptions = []; response.data.results.forEach((credentialTypeRow => { vm.promptDataClone.prompts.credentials.credentialTypes[credentialTypeRow.id] = credentialTypeRow.kind; - if(credentialTypeRow.kind.match(/^(cloud|net|ssh|vault)$/)) { + if(credentialTypeRow.kind.match(/^(cloud|net|ssh|vault|kubernetes)$/)) { if(credentialTypeRow.kind === 'ssh') { vm.promptDataClone.prompts.credentials.credentialKind = credentialTypeRow.id.toString(); }