Skip to content

Commit 3ee99c8

Browse files
JuliaMongojwilliams-mongo
authored andcommitted
(DOCSP-18726) Helm Charts Installation (#859)
* first commit, to be continued * Interim commit, to be continued * removing the step about cd to directory, as not needed * Build issues * fixing build errors * Fixing warnings * warnings * Made changes to the updgrade commands * Changed the syntax for setting the namespace * First round of copy review, to be continued * Fixing the build * Finish including copy and tech review comments from the first round. Ready for a review by John W * One more change, ready for a review * Addressed a few more comments from Rodrigo * Halfway through the copy review, to be continued * Added copy review * Ready for a review * Restaging * Address comment from Rodrigo in steps-helm-master * Tech review * indentation * Remaining edits: removed 1.7.1 steps from upgrades, removed update crd steps from upgrades, removed step 2 from plan-considerations topic as not relevant. Ready for the tech review by Mircea
1 parent 09a1265 commit 3ee99c8

31 files changed

+170
-675
lines changed

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@
245245
'k8sdocs': ('https://kubernetes.io/docs%s', ''),
246246
'v1.2': ('https://www.mongodb.com/docs/kubernetes-operator/v1.2%s', ''),
247247
'github' : ('https://github.com%s', ''),
248+
'github-raw' : ('https://raw.githubusercontent.com%s', ''),
248249
'mdb-github' : ('https://mongodb.github.io%s', ''),
249250
'gopkg' : ('https://godoc.org%s',''),
250251
'npmjs' : ('https://www.npmjs.com/package%s',''),

source/includes/code-examples/yaml-files/example-watch-namespaces-env-helm.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55

66
# Operator with name `mongodb-enterprise-operator-qa-envs` will
77
# watch ns-dev, ns-qa and ns-uat namespaces
8-
helm install mongodb-operator helm_chart --set operator.watchNamespace="ns-dev\,ns-qa\,ns-uat" mongodb-enterprise-operator-qa-envs
8+
9+
helm install mongodb-enterprise-operator-qa-envs mongodb/enterprise-operator \
10+
--set operator.watchNamespace="ns-dev\,ns-qa\,ns-uat"
911

source/includes/code-examples/yaml-files/example-watch-one-namespace-helm.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
:emphasize-lines: 2
55

66
# Watch one namespace
7-
helm install mongodb-operator helm_chart --set operator.watchNamespace='namespace-to-watch' <...>
7+
helm install enterprise-operator mongodb/enterprise-operator \
8+
--set operator.watchNamespace='namespace-to-watch' <...>
89

source/includes/code-examples/yaml-files/example-watch-two-namespaces-helm.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
:emphasize-lines: 2
55

66
# Watch both namespace-a and namespace-b
7-
helm install mongodb-operator helm_chart --set operator.watchNamespace="namespace-a\,namespace-b"
7+
helm install enterprise-operator mongodb/enterprise-operator \
8+
--set operator.watchNamespace="namespace-a\,namespace-b"
89

source/includes/install/install-os-311-helm.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

source/includes/install/upgrade-crds-oc-helm.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

source/includes/steps-configure-kubectl-namespace.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ content: |
1111
.. code-block:: sh
1212
1313
kubectl config set-context $(kubectl config current-context) --namespace=<metadata.namespace>
14+
1415
...

source/includes/steps-helm-master.yaml

Lines changed: 61 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
---
2-
title: "Change to the directory in which you cloned the repository."
32
level: 4
4-
ref: helm-master-cd
3+
ref: install-helm-charts
4+
title: "Add the :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>` repository to Helm."
5+
content: |
6+
7+
.. code-block:: sh
8+
9+
helm repo add mongodb https://mongodb.github.io/helm-charts
10+
511
---
612
title: "Customize your Helm Chart before upgrading it."
713
level: 4
@@ -18,57 +24,63 @@ ref: helm-master-install
1824
replacement:
1925
k8sonline: |
2026
21-
Invoke the following ``helm`` command:
27+
Install :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`.
28+
The following command installs the |k8s-crds| and the |k8s-op-short|
29+
in the current namespace named ``default``.
2230
2331
.. code-block:: sh
2432
25-
helm install <chart-name> helm_chart \
26-
--values helm_chart/values.yaml
33+
helm install enterprise-operator mongodb/enterprise-operator
2734
2835
To learn about optional |k8s-op-short| installation settings, see
2936
:ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
3037
31-
k8soffline: |
32-
33-
Invoke the following ``helm`` command:
38+
You can specify a different namespace with:
3439
3540
.. code-block:: sh
3641
37-
helm install <chart-name> helm_chart \
38-
--values helm_chart/values.yaml \
39-
--set registry.pullPolicy=IfNotPresent
42+
helm install enterprise-operator mongodb/enterprise-operator --namespace mongodb [--create-namespace]
43+
44+
k8soffline: |
4045
46+
Install :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`
47+
and set the value of ``registry.pullPolicy`` to ``IfNotPresent``.
4148
To learn about optional |k8s-op-short| installation settings, see
4249
:ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
4350
44-
osonline: |
51+
.. code-block:: sh
4552
46-
.. include:: /includes/install/install-os-311-helm.rst
53+
helm install enterprise-operator mongodb/enterprise-operator \
54+
--set registry.pullPolicy='IfNotPresent'
4755
48-
Invoke the following ``helm`` command:
56+
osonline: |
57+
58+
Install :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`:
4959
5060
.. code-block:: sh
5161
52-
helm install <chart-name> helm_chart \
53-
--values helm_chart/values-openshift.yaml
62+
helm install enterprise-operator mongodb/enterprise-operator \
63+
--values https://raw.githubusercontent.com/mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml
5464
55-
To learn about optional |k8s-op-short| installation settings, see
56-
:ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
65+
Use the :github-raw:`values-openshift.yaml </mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml>`
66+
settings. To learn about optional |k8s-op-short| installation settings,
67+
see :ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
5768
5869
osoffline: |
5970
60-
.. include:: /includes/install/install-os-311-helm.rst
61-
62-
Invoke the following ``helm`` command:
71+
Install :mdb-github:`MongoDB Helm Charts for Kubernetes </helm-charts>`:
6372
6473
.. code-block:: sh
6574
66-
helm install <chart-name> helm_chart \
67-
--values helm_chart/values-openshift.yaml \
68-
--set registry.pullPolicy=IfNotPresent \
69-
--set registry.imagePullSecrets=<openshift-pull-secret>
75+
helm install enterprise-operator mongodb/enterprise-operator \
76+
--set registry.pullPolicy='IfNotPresent' \
77+
--set registry.imagePullSecrets='<openshift-pull-secret>' \
78+
--values https://raw.githubusercontent.com/mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml
7079
71-
To learn about optional |k8s-op-short| installation settings, see
80+
Use the :github-raw:`values-openshift.yaml </mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml>`
81+
settings, ``registry.pullPolicy=IfNotPresent``, and
82+
``registry.imagePullSecrets=<openshift-pull-secret>``. To learn
83+
about optional |k8s-op-short| installation settings, see
7284
:ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
7385
7486
k8sonlineupgrade: |
@@ -77,86 +89,50 @@ replacement:
7789
7890
.. code-block:: sh
7991
80-
helm upgrade <chart-name> helm_chart \
81-
--values helm_chart/values.yaml
82-
83-
84-
k8sonlineupgradev161: |
85-
86-
Invoke the following ``helm`` command:
87-
88-
.. code-block:: sh
89-
90-
helm upgrade <chart-name> helm_chart \
91-
--values helm_chart/values.yaml
92+
helm upgrade enterprise-operator mongodb/enterprise-operator
9293
9394
k8sofflineupgrade: |
9495
95-
Invoke the following ``helm`` command to upgrade with modified pull
96-
policy values:
97-
98-
.. code-block:: sh
99-
100-
helm upgrade <chart-name> helm_chart \
101-
--values helm_chart/values.yaml \
102-
--set registry.pullPolicy=IfNotPresent
103-
104-
k8sofflineupgradev161: |
105-
106-
Invoke the following ``helm`` command to upgrade with modified pull
107-
policy values:
96+
Invoke the following ``helm upgrade`` command.
97+
Use the ``registry.pullPolicy=IfNotPresent`` setting. To learn
98+
about optional |k8s-op-short| installation settings, see
99+
:ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
108100
109101
.. code-block:: sh
110102
111-
helm upgrade <chart-name> helm_chart \
112-
--values helm_chart/values.yaml \
113-
--set registry.pullPolicy=IfNotPresent
103+
helm upgrade enterprise-operator mongodb/enterprise-operator \
104+
--set registry.pullPolicy='IfNotPresent'
114105
115106
osonlineupgrade: |
116107
117-
.. include:: /includes/install/install-os-311-helm.rst
118-
119-
Invoke the following ``helm`` command:
120-
121-
.. code-block:: sh
122-
123-
helm upgrade <chart-name> helm_chart \
124-
--values helm_chart/values-openshift.yaml
125-
126-
osonlineupgradev161: |
127-
128-
Invoke the following ``helm`` command:
108+
Invoke the following ``helm upgrade`` command.
109+
Use :github-raw:`values-openshift.yaml </mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml>` settings. To learn
110+
about optional |k8s-op-short| installation settings, see
111+
:ref:`Operator Helm Installation Settings<meko-op-install-settings-helm>`.
129112
130113
.. code-block:: sh
131114
132-
helm upgrade <chart-name> helm_chart \
133-
--values helm_chart/values-openshift.yaml
115+
helm upgrade enterprise-operator mongodb/enterprise-operator \
116+
--values https://raw.githubusercontent.com/mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml
134117
135118
osofflineupgrade: |
136119
137-
.. include:: /includes/install/install-os-311-helm.rst
138120
139-
Invoke the following ``helm`` command with
140-
modified pull policy values:
121+
Invoke the following ``helm upgrade`` command:
141122
142123
.. code-block:: sh
143124
144-
helm upgrade <chart-name> helm_chart \
145-
--values helm_chart/values-openshift.yaml \
146-
--set registry.pullPolicy=IfNotPresent \
147-
--set registry.imagePullSecrets=<openshift-pull-secret>
148-
149-
osofflineupgradev161: |
150-
151-
Invoke the following ``helm`` command with
152-
modified pull policy values:
125+
helm upgrade enterprise-operator mongodb/enterprise-operator \
126+
--set registry.pullPolicy='IfNotPresent' \
127+
--set registry.imagePullSecrets='<openshift-pull-secret>' \
128+
--values https://raw.githubusercontent.com/mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml
153129
154-
.. code-block:: sh
130+
Use the :github-raw:`values-openshift.yaml </mongodb/helm-charts/main/charts/enterprise-operator/values-openshift.yaml>`
131+
settings, ``registry.pullPolicy=IfNotPresent``, and
132+
``registry.imagePullSecrets=<openshift-pull-secret>``. To learn
133+
about optional |k8s-op-short| installation settings, see
134+
:ref:`Operator Helm Installation Settings <meko-op-install-settings-helm>`.
155135
156-
helm upgrade <chart-name> helm_chart \
157-
--values helm_chart/values-openshift.yaml \
158-
--set registry.pullPolicy=IfNotPresent \
159-
--set registry.imagePullSecrets=<openshift-pull-secret>
160136
---
161137
title: "Connect to the internet."
162138
level: 4
@@ -165,24 +141,6 @@ ref: helm-master-connect-internet
165141
title: "Disconnect from the internet."
166142
level: 4
167143
ref: helm-master-disconnect-internet
168-
---
169-
title: "Add your OpenShift Pull Secret to the OpenShift Values file."
170-
level: 4
171-
ref: helm-master-openshift-pull-secret
172-
content: |
173-
174-
Add the name of your ``<openshift-pull-secret>`` to the
175-
``registry.imagePullSecrets`` setting in the
176-
``helm_chart/values-openshift.yaml`` file.
177-
To learn more, see the ``registry.imagePullSecrets`` setting in the
178-
:doc:`Helm installation settings </reference/helm-operator-settings>`.
179-
180-
.. code-block:: sh
181-
:emphasize-lines: 3
182-
183-
registry:
184-
# The pull secret must be specified
185-
imagePullSecrets: <openshift-pull-secret>
186144

187145
---
188146
title: "Export the |k8s-op-short| images as ``.tar`` archive files:"

source/includes/steps-install-k8s-offline-helm-host.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,19 @@ content: |
4141
{{quayimport}}
4242
4343
{{versions}}
44+
---
45+
ref: helm-k8s-online-install
46+
inherit:
47+
file: steps-helm-master.yaml
48+
ref: install-helm-charts
49+
stepnum: 5
4450

4551
---
4652
ref: helm-k8s-offline-install-host
4753
inherit:
4854
file: steps-helm-master.yaml
4955
ref: helm-master-install
50-
stepnum: 5
56+
stepnum: 6
5157
replacement:
5258
method: "Install the |k8s-op-short| with modified pull policy values using the following ``helm`` command:"
5359
content: |

source/includes/steps-install-k8s-online-helm.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
---
2-
ref: helm-k8s-online-cd
2+
ref: helm-k8s-online-install
33
inherit:
44
file: steps-helm-master.yaml
5-
ref: helm-master-cd
5+
ref: install-helm-charts
66
stepnum: 1
7+
78
---
8-
ref: helm-k8s-online-install
9+
ref: helm-k8s-online-install-crds
910
inherit:
1011
file: steps-helm-master.yaml
1112
ref: helm-master-install
1213
stepnum: 2
1314
replacement:
14-
method: "Install the |k8s-op-short| using the following ``helm`` command:"
15+
method: "Install the |k8s-op-short|:"
1516
content: |
1617
1718
{{k8sonline}}

0 commit comments

Comments
 (0)