From defce265003fdc555534ffd29e5d7a2aed098642 Mon Sep 17 00:00:00 2001
From: Dimitrie Hoekstra <dimitrie@gitlab.com>
Date: Wed, 19 Jul 2017 10:56:11 +0000
Subject: [PATCH] Resolve "Clarify k8s service keys"

---
 .../project_services/kubernetes_service.rb    | 20 +++++++++----------
 .../33741-clarify-k8s-service-keys.yml        |  5 +++++
 doc/user/project/integrations/kubernetes.md   |  4 ++--
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 changelogs/unreleased/33741-clarify-k8s-service-keys.yml

diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index 62f7c057c5b..dee99bbb859 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -58,22 +58,22 @@ class KubernetesService < DeploymentService
 
   def fields
     [
-        { type: 'text',
-          name: 'namespace',
-          title: 'Kubernetes namespace',
-          placeholder: namespace_placeholder },
         { type: 'text',
           name: 'api_url',
           title: 'API URL',
           placeholder: 'Kubernetes API URL, like https://kube.example.com/' },
-        { type: 'text',
-          name: 'token',
-          title: 'Service token',
-          placeholder: 'Service token' },
         { type: 'textarea',
           name: 'ca_pem',
-          title: 'Custom CA bundle',
-          placeholder: 'Certificate Authority bundle (PEM format)' }
+          title: 'CA Certificate',
+          placeholder: 'Certificate Authority bundle (PEM format)' },
+        { type: 'text',
+          name: 'namespace',
+          title: 'Project namespace (optional/unique)',
+          placeholder: namespace_placeholder },
+        { type: 'text',
+          name: 'token',
+          title: 'Token',
+          placeholder: 'Service token' }
     ]
   end
 
diff --git a/changelogs/unreleased/33741-clarify-k8s-service-keys.yml b/changelogs/unreleased/33741-clarify-k8s-service-keys.yml
new file mode 100644
index 00000000000..91142a0d580
--- /dev/null
+++ b/changelogs/unreleased/33741-clarify-k8s-service-keys.yml
@@ -0,0 +1,5 @@
+---
+title: Clarifies and rearranges the input variables on the kubernetes integration
+  page and adjusts the docs slightly to meet the same order
+merge_request: !12188
+author:
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md
index bfe2672e098..f4000523938 100644
--- a/doc/user/project/integrations/kubernetes.md
+++ b/doc/user/project/integrations/kubernetes.md
@@ -19,10 +19,10 @@ of your project and select the **Kubernetes** service to configure it.
 
 The Kubernetes service takes the following arguments:
 
-1. Kubernetes namespace
 1. API URL
-1. Service token
 1. Custom CA bundle
+1. Kubernetes namespace
+1. Service token
 
 The API URL is the URL that GitLab uses to access the Kubernetes API. Kubernetes
 exposes several APIs - we want the "base" URL that is common to all of them,