(DOCSP-12580): Global API Keys require OrgID in project ConfigMap

Author: melissamahoney-mongodb

source/includes/list-tables/configmap-keys-curl.rst

@@ -1,13 +1,13 @@
 .. list-table::
-   :widths: 20 20 40 20
+   :widths: 20 10 50 20
    :header-rows: 1
 
    * - Key
      - Type
      - Description
      - Example
 
-   * - ``<configmap-name>``
+   * - ``configmap-name``
      - string
      - Name of the |k8s| |k8s-obj|.
 
@@ -19,7 +19,7 @@
           - |k8s| documentation on `names <https://kubernetes.io/docs/concepts/overview/working-with-objects/names/>`__.
             This name must follow :rfc:`RFC1123 <1123>` naming
             conventions, using only lowercase alphanumeric
-            characters, '-' or '.', and must start and end with an
+            characters, ``-`` or ``.``, and must start and end with an
             alphanumeric character.
 
      - ``myconfigmap``
@@ -60,32 +60,61 @@
      - string
      - 24 character hex string that uniquely identifies your
        MongoDB :opsmgr:`Organization </tutorial/manage-organizations>`.
-       You can find the ``orgId`` in your |onprem| |url|:
 
-       1. Click the :guilabel:`Context` menu.
-       2. Select your Organization.
-       3. View the current |url| in your browser and copy the value
-          displayed in the ``<orgId>`` placeholder below:
+       Depending on your |k8s-op-short| :ref:`credentials
+       <create-k8s-credentials>`, this field is:
 
-          | ``https://ops.example.com:8443/``
-          | ``v2#/org/<orgId>/projects``
+       - *Required* for :opsmgr:`Global Programmatic API Keys </reference/api/global-api-keys/>`.
+       - *Optional* for :ref:`Organization Programmatic API Keys <create-org-app-api-key>`.
 
-       .. important::
+       .. tabs::
+          
+          .. tab:: Global API Keys
+             :tabid: global
 
-          This field is *optional*. If you omit the ``orgId``,
-          |onprem| creates an Organization called ``projectName``
-          that contains a project also called ``projectName``.
+             You must specify an :ref:`existing Organization
+             <create-organization>`.
 
-          You must have the :authrole:`Organization project Creator`
-          role to create a new project
-          *within an existing organization*.
+             To find the ``orgId`` of your Organization:
 
-          .. admonition:: Limited to |com| Organizations
+             1. Click the :guilabel:`Context` menu.
+             2. Select your Organization.
+             3. View the current |url| in your browser and copy the   
+                value displayed in the ``<orgId>`` placeholder below:
 
-             If you set this value, it can be for a |com|
-             organization only. If you try to use an Atlas
-             organization, the |k8s-op-short| may not work as
-             intended.
+                | ``https://ops.example.com:8443/``
+                | ``v2#/org/<orgId>/projects``
+
+          .. tab:: Organization API Keys
+             :tabid: org
+       
+             If specified, the |k8s-op-short| links to the Organization.
+             
+             You can find the Organization's ``orgId`` in your |onprem|
+             |url|:
+
+             1. Click the :guilabel:`Context` menu.
+             2. Select your Organization.
+             3. View the current |url| in your browser and copy the 
+                value displayed in the ``<orgId>`` placeholder below:
+
+                | ``https://ops.example.com:8443/``
+                | ``v2#/org/<orgId>/projects``
+
+             If omitted, |onprem| creates an Organization called
+             ``projectName`` that contains a project also called
+             ``projectName``.
+             
+             You must have the :authrole:`Organization Project Creator`
+             role to create a new project within an existing
+             organization.
+
+       .. admonition:: Limited to |com| Organizations
+          :class: important
+
+          This value must be a |com|
+          organization. The |k8s-op-short| might not work as
+          expected when set to an |service| organization.
 
      - | ``5cc9b333dd3e384a625a6615``
 

source/includes/steps-create-k8s-configmap.yaml

@@ -16,7 +16,7 @@ content: |
      kubectl create configmap <configmap-name> \
        --from-literal="baseUrl=<myOpsManagerURL>" \
        --from-literal="projectName=<myOpsManagerProjectName>" \ #Optional
-       --from-literal="orgId=<orgID>" #Optional
+       --from-literal="orgId=<orgID>" #Required for Global API Keys
 
   .. include:: /includes/list-tables/configmap-keys-curl.rst
 

source/tutorial/create-project-using-configmap.txt

@@ -4,6 +4,8 @@
 Create One Project using a ConfigMap
 ====================================
 
+.. include:: /includes/styles/corrections.rst
+
 .. default-domain:: mongodb
 
 .. contents:: On this page
@@ -14,7 +16,7 @@ Create One Project using a ConfigMap
 
 The |k8s-op-full| uses a |k8s| |k8s-configmap| to create or link your
 |onprem| :opsmgr:`Project </tutorial/manage-projects>`. To create a
-|k8s-op-short| ConfigMap, you need to edit a few lines of the
+|k8s-op-short| ConfigMap, you can edit a few lines of the
 :ref:`example ConfigMap <example-k8s-configmap>` |yaml| file and apply
 the ConfigMap.
 
@@ -28,9 +30,6 @@ in your project, see :ref:`k8s-deploy-mdb-resources`.
 Prerequisites
 -------------
 
-Kubernetes
-~~~~~~~~~~
-
 - Kubernetes version 1.11 or later or Openshift version
   3.11 or later.
 - |k8s-op-full| version 0.11 or later