Skip to content

Commit 3f945a9

Browse files
authored
(DOCSP-35988) Fixing RST for steps that should not be bolded (#58)
[DOCSP-35988](https://jira.mongodb.org/browse/DOCSP-35988) [Staging](https://preview-mongodbjuliamongo.gatsbyjs.io/ops-manager/DOCSP-35988/tutorial/nav/k8s-config-for-mdb-resource/#navigate-to-the-k8s-setup-page-in-the-mms-ui) Added headings and reorganized the page to make the bolded step titles display normally. All other changes are incidental edits and cleanup and don't need to be reviewed. Latest [build](https://workerpool-boxgs.mongodbstitch.com/pages/job.html?collName=queue&jobId=65b90cfe6b2f17c95ad22afc)
1 parent 5acd799 commit 3f945a9

7 files changed

+98
-83
lines changed

source/includes/setting-fileConf-kubernetes.templates.credentialsFilePath.rst

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22

33
*Type*: string
44

5-
65
Path to the YAML file that contains your :ref:`Programmatic API Key
7-
<mms-prog-api-key>` as a Kubernetes secret to create or update
8-
Kubernetes `objects <https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/>`__
9-
in your |mms| project.
10-
11-
This file must be in YAML format and must be stored under
12-
``/mongodb-ops-manager/`` directory.
13-
6+
<mms-prog-api-key>` as a |k8s| secret to create or update |k8s-objs|
7+
in your |mms| project. This file must be in YAML format and must be
8+
stored under the ``/mongodb-ops-manager/`` directory. This file
9+
corresponds to :setting:`Kubernetes Secret Setup`.
10+
1411
.. code-block:: yaml
15-
12+
1613
apiVersion: v1
1714
kind: Secret
1815
metadata:
@@ -21,7 +18,3 @@
2118
stringData:
2219
user: ${publicKey}
2320
publicApiKey: ${privateKey}
24-
25-
Corresponds to :setting:`Kubernetes Secret Setup`.
26-
27-

source/includes/setting-fileConf-kubernetes.templates.projectFilePath.rst

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22

33
*Type*: string
44

5-
6-
Path to the YAML file that contains the ConfigMap to use to link to
7-
your |mms| project.
8-
9-
This file must be in YAML format and must be stored under
10-
``/mongodb-ops-manager/`` directory.
11-
12-
Corresponds to :setting:`Kubernetes ConfigMap Setup`.
13-
5+
Path to the YAML file that contains the ConfigMap to use to link to your
6+
|mms| project. This file must be in YAML format and must be stored under
7+
the ``/mongodb-ops-manager/`` directory. This file corresponds to
8+
:setting:`Kubernetes ConfigMap Setup`.
149

source/includes/steps-k8s-setup-custom-ca.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,19 @@ content: |
2323
In your server's ``conf-mms.properties`` file, configure the
2424
following settings:
2525
26-
- ``kubernetes.templates.credentialsFilePath``
27-
- ``kubernetes.templates.projectFilePath``
26+
- ``kubernetes.templates.credentialsFilePath``. Path to the YAML file
27+
that contains the ConfigMap to use to link to your |mms| project.
28+
This file must be in YAML format and must be stored under the
29+
``/mongodb-ops-manager/`` directory. The file corresponds to
30+
:setting:`Kubernetes ConfigMap Setup`.
2831
29-
To learn more about these settings, see
30-
:ref:`conf-mms.properties-k8s`.
32+
- ``kubernetes.templates.projectFilePath``. Path to the YAML file that
33+
contains your :ref:`Programmatic API Key <mms-prog-api-key>` as a
34+
|k8s| secret to create or update |k8s-objs| in your |mms| project.
35+
This file must be in YAML format and must be stored under the
36+
``/mongodb-ops-manager/`` directory. The file corresponds to
37+
:setting:`Kubernetes Secret Setup`.
38+
39+
To learn more, see :ref:`conf-mms.properties-k8s`.
3140
3241
...
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
title: "Log in to |mms| and select your desired organization from the
1+
title: "Log in to |mms| and select your organization from the
22
:icon-mms:`office` :guilabel:`Organizations` menu in the
33
navigation bar."
44
level: 4
5+
stepnum: 1
56
ref: select-org-k8s-setup
7+
68
---
7-
title: "Click :guilabel:`Kubernetes Setup` in the sidebar, or click
8-
:guilabel:`Kubernetes Setup` in the navigation bar."
9+
10+
title: "Click :guilabel:`Kubernetes Setup` in the sidebar or the
11+
navigation bar."
912
level: 4
13+
stepnum: 2
1014
ref: select-k8s-setup-org
1115
...
Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
title: "Log in to |mms| and select the organization that contains your
2-
desired project from the |ui-org-menu| in the navigation bar."
1+
title: "Log in to |mms| and select the organization that contains your
2+
project from the |ui-org-menu| in the navigation bar."
33
level: 4
4+
stepnum: 1
45
ref: k8s-setup-login
56
---
6-
title: "Select your desired project from the :guilabel:`Project` menu
7-
in the navigation bar."
7+
8+
title: "Select your project from the :guilabel:`Project` menu in the
9+
navigation bar."
810
level: 4
11+
stepnum: 2
912
ref: select-project-k8s-setup
1013
---
11-
title: "Click the :guilabel:`Add` dropdown and select
12-
:guilabel:`Prepare Kubernetes Configuration` to display the
14+
15+
title: "Click the :guilabel:`Add` dropdown and select
16+
:guilabel:`Prepare Kubernetes Configuration` to display the
1317
:guilabel:`Kubernetes Setup` page."
1418
level: 4
19+
stepnum: 3
1520
ref: select-k8s-setup
1621
...

source/includes/steps-k8s-setup.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ content: |
66
- Click :guilabel:`Create New API Keys` to generate new API keys.
77
- Click :guilabel:`Use Existing API Keys` to specify your existing
88
public and private keys.
9+
910
---
1011
title: "Enter the IP addresses to add to your |mms| project's IP access
1112
list to grant programmatic access from your Kubernetes
1213
environment."
13-
level: 4
14+
level: 4
1415
ref: k8s-setup-step2
1516
content: |
1617
@@ -29,6 +30,7 @@ content: |
2930
API keys.
3031
- Click :guilabel:`Generate YAML` if you are using existing API keys.
3132
---
33+
3234
title: "Follow the steps in the :guilabel:`Generated ConfigMap and
3335
Secret YAML file` modal to apply the generated ConfigMap and
3436
Kubernetes secret YAML files to your Kubernetes environment."

source/tutorial/nav/k8s-config-for-mdb-resource.txt

Lines changed: 54 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,45 @@ Configure Kubernetes for Deploying MongoDB Resource
1212
:depth: 1
1313
:class: singlecol
1414

15-
You can use the Kubernetes Operator to deploy MongoDB resources such as
15+
You can use the |k8s-op-full| to deploy MongoDB resources such as
1616
:k8s:`a replica set </tutorial/deploy-replica-set>`, :k8s:`a sharded
1717
cluster </tutorial/deploy-sharded-cluster>`, or :k8s:`a standalone
18-
instance </tutorial/deploy-standalone>` using an `object
19-
<https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/>`__.
20-
|mms| can generate the YAML files you need to configure your Kubernetes
21-
environment for deploying a MongoDB Database resource.
18+
instance </tutorial/deploy-standalone>` using an |k8s-obj|.
19+
|mms| can generate the YAML files you need to configure your |k8s|
20+
environment for deploying a MongoDB Database resource.
2221

2322
To generate the YAML files:
2423

2524
- :ref:`k8s-config-mdb-res-roles`
26-
- :ref:`k8s-config-mdb-res-nav`
25+
- :ref:`Learn about the MongoDB Resource in Kubernetes <k8s-config-mdb-res-nav>`
2726
- :ref:`k8s-config-mdb-res-create-procedure`
2827

2928
.. _k8s-config-mdb-res-roles:
3029

31-
Verify Permissions
30+
Verify Permissions
3231
------------------
3332

3433
You must have one of the following roles to access the |mms| UI for
35-
setting up Kubernetes:
34+
setting up |k8s|:
3635

3736
- :authrole:`Organization Owner`
3837
- :authrole:`Project Owner`
3938
- :authrole:`Project Data Access Admin`
4039

41-
.. _k8s-config-mdb-res-nav:
42-
43-
Navigate to the Kubernetes Setup Page in the |mms| UI
44-
-----------------------------------------------------
45-
46-
To access the :guilabel:`Kubernetes Setup` page in the |mms| UI:
47-
48-
.. include:: /includes/steps/k8s-setup-nav.rst
49-
50-
If you are a :authrole:`Global Owner` or :authrole:`Organization
51-
Owner`, you can access the Kubernetes Setup page in the |mms| UI
52-
by doing the following also:
53-
54-
.. include:: /includes/steps/k8s-setup-nav-global-org-owner.rst
55-
5640
.. _k8s-config-mdb-res-create-procedure:
5741

58-
Set Up Kubernetes for a MongoDB Resource
42+
Overview of MongoDB Resource in |k8s|
5943
----------------------------------------
6044

61-
The |k8s-op-full| requires a Kubernetes ConfigMap to create or link
62-
your |mms| project.
45+
To create or link your |mms| project, the |k8s-op-full| requires that you
46+
configure a |k8s| ConfigMap. Using the |k8s| ConfigMap, you can:
6347

64-
.. cond:: onprem
48+
- Connect to a HTTPS-enabled |mms| that is using a custom |certauth|, or
49+
- Link to a |mms| project that isn't using a custom |certauth|.
6550

66-
Using the Kubernetes ConfigMap, you can either connect to a
67-
HTTPS-enabled |mms| that is using a custom CA or link to a |mms|
68-
project that isn't using a custom CA.
69-
70-
You can use the |mms| :guilabel:`Kubernetes Setup` page to
71-
automatically generate the ConfigMap. The generated YAML file for the
72-
ConfigMap looks similar to the following:
51+
You can use the |mms| :guilabel:`Kubernetes Setup` page to automatically
52+
generate the ConfigMap. The generated YAML file for the ConfigMap looks
53+
similar to the following:
7354

7455
.. tabs::
7556

@@ -92,7 +73,7 @@ ConfigMap looks similar to the following:
9273
orgId: <your-org-id>
9374

9475
sslMMSCAConfigMap: <root-ca-configmap-name>
95-
sslRequireValidMMSServerCertificates: true
76+
sslRequireValidMMSServerCertificates: 'true'
9677

9778
.. tab:: Not Using a Custom CA
9879
:tabid: link
@@ -112,25 +93,51 @@ ConfigMap looks similar to the following:
11293

11394
orgId: <your-org-id>
11495

115-
You need to store your :ref:`Programmatic API Key <mms-prog-api-key>`
116-
as a Kubernetes secret to create or update Kubernetes `objects
117-
<https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/>`__
118-
in your |mms| project. A Kubernetes secret stores authentication
119-
credentials so only Kubernetes can access them.
96+
To create or update |k8s-objs| in your |mms| project, configure your
97+
:ref:`Programmatic API Key <mms-prog-api-key>` as a |k8s| secret.
98+
The secret stores authentication credentials so only |k8s| can access them.
99+
100+
The following procedures provide the detailed steps.
101+
102+
.. _k8s-config-mdb-res-procedure:
103+
104+
Procedures
105+
------------
106+
107+
- :ref:`k8s-config-mdb-res-nav`
108+
- :ref:`k8s-setup-custom-ca-configmap-om-settings`
109+
- :ref:`k8s-generate-yaml`
110+
111+
.. _k8s-config-mdb-res-nav:
112+
113+
Navigate to the |k8s| Setup Page in the |mms| UI
114+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
115+
116+
To access the :guilabel:`Kubernetes Setup` page in the |mms| UI:
117+
118+
.. include:: /includes/steps/k8s-setup-nav.rst
119+
120+
If you are a :authrole:`Global Owner` or :authrole:`Organization
121+
Owner`, you can also access the :guilabel:`Kubernetes Setup` page in
122+
the |mms| UI by following these steps:
123+
124+
.. include:: /includes/steps/k8s-setup-nav-global-org-owner.rst
125+
126+
.. _k8s-setup-custom-ca-configmap-om-settings:
120127

121-
Setting up Template files and Configuration Parameters
122-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
128+
Create a Secret, a ConfigMap, and |onprem| Settings for |k8s|
129+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123130

124-
To generate the YAML files, you must do the following:
131+
To create a secret, a ConfigMap file, and |onprem| settings for |k8s|:
125132

126133
.. include:: /includes/steps/k8s-setup-custom-ca.rst
127134

128-
.. _k8s-config-mdb-res-procedure:
135+
.. _k8s-generate-yaml:
129136

130-
Generating the YAML Files
131-
~~~~~~~~~~~~~~~~~~~~~~~~~
137+
Generate the ConfigMap YAML Files
138+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
132139

133-
To setup Kubernetes for a MongoDB resource:
140+
To generate the |k8s| configuration files for a MongoDB resource:
134141

135142
.. tabs::
136143

0 commit comments

Comments
 (0)