Skip to content

Commit f6fe371

Browse files
(DOCSP-8235): Rename clusterName to clusterDomain configuration option (#168)
* (DOCSP-8253): Rename clusterName to clusterDomain configuration option * (DOCSP-8243): WIP * (DOCSP-8253): Change examples/mentions * (DOCSP-8235): Update OM resource * Copy review
1 parent cdac386 commit f6fe371

11 files changed

+86
-11
lines changed
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
.. warning::
22

3-
You must set :setting:`spec.clusterName` if your |k8s| cluster has a
4-
:k8sdocs:`default domain </concepts/services-networking/dns-pod-service#what-things-get-dns-names>`
5-
different from default ``cluster.local``. If you neither use the
6-
default nor set this option, the |k8s-op-short| may not function as
7-
expected.
3+
You must set :setting:`spec.clusterDomain` if your |k8s| cluster has
4+
a :k8sdocs:`default domain
5+
</concepts/services-networking/dns-pod-service#what-things-get-dns-names>`
6+
other than the default ``cluster.local``. If you neither use the
7+
default nor set the :setting:`spec.clusterDomain` option, the
8+
|k8s-op-short| might not function as expected.

source/includes/options-k8s-replica-set.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,18 @@ inherit:
7676
program: _shared
7777
file: options-k8s-shared.yaml
7878

79+
---
80+
program: k8sRsConf
81+
name: spec.clusterDomain
82+
type: string
83+
directive: setting
84+
optional: true
85+
default: cluster.local
86+
inherit:
87+
name: spec.clusterDomain
88+
program: _shared
89+
file: options-k8s-shared.yaml
90+
7991
---
8092
program: k8sRsConf
8193
name: spec.clusterName
@@ -87,6 +99,7 @@ inherit:
8799
name: spec.clusterName
88100
program: _shared
89101
file: options-k8s-shared.yaml
102+
90103
---
91104
program: k8sRsConf
92105
name: spec.credentials

source/includes/options-k8s-shared.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,36 @@ description: |
9292
users to create their custom services and lets the Operator reuse
9393
them.
9494
95+
---
96+
program: _shared
97+
name: spec.clusterDomain
98+
type: string
99+
directive: setting
100+
optional: true
101+
default: cluster.local
102+
description: |
103+
104+
Domain name of the |k8s| cluster where you deploy the Operator. When
105+
|k8s| creates a |k8s-statefulset|, the |k8s| assigns each |k8s-pod| a
106+
|fqdn|. To update |com|, the |k8s-op-short| calculates the |fqdn| for
107+
each |k8s-pod| using a provided cluster name. |k8s| doesn't provide
108+
an |api| to query these hostnames.
109+
110+
.. include:: /includes/admonitions/warning-set-cluster-name.rst
111+
95112
---
96113
program: _shared
97114
name: spec.clusterName
98115
type: string
99116
directive: setting
100117
optional: true
101118
default: cluster.local
119+
pre: |
120+
121+
.. admonition:: ``spec.clusterName`` is Deprecated
122+
:class: important
123+
124+
Use :setting:`spec.clusterDomain` instead.
102125
description: |
103126
104127
Domain name of the |k8s| cluster where you deploy the Operator. When

source/includes/options-k8s-shared_cluster.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,18 @@ inherit:
103103
program: _shared
104104
file: options-k8s-shared.yaml
105105

106+
---
107+
program: k8sScConf
108+
name: spec.clusterDomain
109+
type: string
110+
directive: setting
111+
optional: true
112+
default: cluster.local
113+
inherit:
114+
name: spec.clusterDomain
115+
program: _shared
116+
file: options-k8s-shared.yaml
117+
106118
---
107119
program: k8sScConf
108120
name: spec.clusterName
@@ -114,6 +126,7 @@ inherit:
114126
name: spec.clusterName
115127
program: _shared
116128
file: options-k8s-shared.yaml
129+
117130
---
118131
program: k8sScConf
119132
name: spec.credentials

source/includes/options-k8s-standalone.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,18 @@ inherit:
9090
program: _shared
9191
file: options-k8s-shared.yaml
9292

93+
---
94+
program: k8sSaConf
95+
name: spec.clusterDomain
96+
type: string
97+
directive: setting
98+
optional: true
99+
default: cluster.local
100+
inherit:
101+
name: spec.clusterDomain
102+
program: _shared
103+
file: options-k8s-shared.yaml
104+
93105
---
94106
program: k8sSaConf
95107
name: spec.clusterName

source/includes/steps-deploy-k8s-opsmgr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ content: |
251251
You can add any of the following optional settings to the
252252
|k8s-obj| specification file for an |onprem| deployment:
253253
254-
- ``spec.``:opsmgrkube:`~spec.clusterName`
254+
- ``spec.``:opsmgrkube:`~spec.clusterDomain`
255255
- ``spec.``:opsmgrkube:`~spec.configuration`
256256
- ``spec.applicationDatabase.``:setting:`~spec.logLevel`
257257
- ``spec.applicationDatabase.``:setting:`~spec.featureCompatibilityVersion`

source/includes/steps-source-deploy-k8s-resource.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ content: |
138138
You can also add any of the following optional settings to the
139139
|k8s-obj| specification file for a {{k8sResource}} deployment:
140140
141-
- :setting:`spec.clusterName`
141+
- :setting:`spec.clusterDomain`
142142
- :setting:`spec.featureCompatibilityVersion`
143143
- :setting:`spec.logLevel`
144144
- :setting:`spec.podSpec.cpu`
@@ -165,7 +165,7 @@ content: |
165165
|k8s-obj| specification file for a :term:`sharded cluster`
166166
deployment:
167167
168-
- :setting:`spec.clusterName`
168+
- :setting:`spec.clusterDomain`
169169
- :setting:`spec.exposedExternally`
170170
- :setting:`spec.logLevel`
171171
- :setting:`spec.featureCompatibilityVersion`

source/reference/k8s-operator-om-specification.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,23 @@ Optional |onprem| Resource Settings
351351
*Required if you enable Backup.*
352352

353353
Name of the |aws| |s3| bucket or |s3|-compatible bucket that hosts
354-
the snapshot store.
354+
the snapshot store.
355355

356+
.. opsmgrkube:: spec.clusterDomain
357+
358+
*Type*: string
359+
360+
|k8s| assigns each |k8s-pod| a |fqdn|. The |k8s-op-short| calculates
361+
the |fqdn| for each |k8s-pod| using a provided ``clusterDomain``.
362+
|k8s| does not provide an |api| to query these hostnames.
356363

357364
.. opsmgrkube:: spec.clusterName
358365

366+
.. admonition:: ``spec.clusterName`` is Deprecated
367+
:class: important
368+
369+
Use :setting:`spec.clusterDomain` instead.
370+
359371
*Type*: string
360372

361373
|k8s| assigns each |k8s-pod| a |fqdn|. The |k8s-op-short| calculates

source/reference/k8s-operator-specification.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Optional
8585
Every resource type may use the following settings:
8686

8787
.. include:: /includes/option/setting-k8sSaConf-spec.featureCompatibilityVersion.rst
88+
.. include:: /includes/option/setting-k8sSaConf-spec.clusterDomain.rst
8889
.. include:: /includes/option/setting-k8sSaConf-spec.clusterName.rst
8990
.. include:: /includes/option/setting-k8sSaConf-spec.service.rst
9091
.. include:: /includes/option/setting-k8sSaConf-spec.logLevel.rst

source/reference/k8s/shardedclusterpodspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
## Please Note: The default Kubernetes cluster name is
1616
## `cluster.local`.
1717
## If your cluster has been configured with another name, you can
18-
## specify it with the `clusterName` attribute.
18+
## specify it with the `clusterDomain` attribute.
1919

2020
opsManager: # Alias of cloudManager
2121
configMapRef:

source/reference/troubleshooting.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ To view all |k8s-mdbrsc| specifications in the provided
220220
annotations:
221221
kubectl.kubernetes.io/last-applied-configuration: |
222222
{"apiVersion":"mongodb.com/v1","kind":"MongoDB","metadata":{"annotations":{},"name":"dublin","namespace":"mongodb"},"spec":{"credentials":"alis-credentials","persistent":false,"podSpec":{"memory":"1G"},"project":"my-om-config","type":"Standalone","version":"4.0.0-ent"}}
223-
clusterName: ""
223+
clusterDomain: ""
224224
creationTimestamp: 2018-09-12T17:15:32Z
225225
generation: 1
226226
name: dublin

0 commit comments

Comments
 (0)