Skip to content

Commit f7c2d5f

Browse files
author
Anton Lisovenko
committed
60aadd3c6bbcbd41e201ce21af91d541e6e7d3d9: update public repo contents
1 parent caf91de commit f7c2d5f

23 files changed

+497
-45
lines changed

‎README.md‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,20 @@ Check the end of the page for instructions on how to remove the Operator.
9191
For the Operator to work, you will need the following information:
9292

9393
* Base URL - the URL of an Ops Manager instance (for Cloud Manager use `https://cloud.mongodb.com`)
94-
* Project Name - the name of an Ops Manager Project where MongoDBs will be deployed into. It will be created by Operator
95-
if it doesn't exist (and this is the recommended way instead of reusing the project created in OpsManager directly)
96-
* (optionally) Organization ID - the ID of the organization to which the Project belongs
97-
* User - an Ops Manager username
98-
* Public API Key - an Ops Manager Public API Key. Note that you must whitelist the IP range of your Kubernetes cluster so that the Operator may make requests to Ops Manager using this API Key.
94+
* (optionally) Project Name - the name of an Ops Manager Project where MongoDBs will be deployed into. It will be
95+
created by the Operator if it doesn't exist (and this is the recommended way instead of reusing the project created
96+
in OpsManager directly). If omitted the name of the MongoDB resource will be used as a project name.
97+
* (optionally) Organization ID - the ID of the organization which the Project belongs to. The Operator will create
98+
an Organization with the same name as the Project if Organization ID is omitted.
99+
* API Credentials. This can be any pair of:
100+
** Public and Private Programmatic API keys. They correspond to `user` and `publicApiKey` fields in the Secret storing
101+
credentials. More information about the way to create them using Ops Manager UI can be found
102+
[here](https://docs.opsmanager.mongodb.com/current/tutorial/configure-public-api-access/#programmatic-api-keys)
103+
** Username and Public API key. More information about the way to create them using Ops Manager UI can be found
104+
[here](https://docs.opsmanager.mongodb.com/current/tutorial/configure-public-api-access/#personal-api-keys-deprecated)
105+
106+
Note that you must whitelist the IP
107+
range of your Kubernetes cluster so that the Operator could make API requests to Ops Manager
99108

100109
This is documented in greater detail in our [installation guide](https://docs.opsmanager.mongodb.com/current/tutorial/install-k8s-operator)
101110

‎crds.yaml‎

Lines changed: 163 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,33 @@ spec:
3939
- properties: # Standalone schema
4040
spec:
4141
properties:
42+
podSpec:
43+
type: object
44+
properties:
45+
podTemplate:
46+
type: object
47+
properties:
48+
spec:
49+
type: object
50+
properties:
51+
podAntiAffinityTopologyKey:
52+
type: string
53+
cpu:
54+
type: string
55+
cpuRequests:
56+
type: string
57+
memory:
58+
type: string
59+
memoryRequests:
60+
type: string
61+
podAffinity:
62+
type: object
63+
nodeAffinity:
64+
type: object
65+
securityContext:
66+
type: object
67+
persistence:
68+
type: object
4269
credentials:
4370
type: string
4471
project:
@@ -65,6 +92,15 @@ spec:
6592
type:
6693
type: string
6794
pattern: "^Standalone$"
95+
persistent:
96+
type: boolean
97+
clusterName:
98+
type: string
99+
format: hostname
100+
description: "DEPRECATED Use clusterDomain instead"
101+
clusterDomain:
102+
type: string
103+
format: hostname
68104
security:
69105
type: object
70106
properties:
@@ -116,6 +152,34 @@ spec:
116152
- properties: # ReplicaSet schema
117153
spec:
118154
properties:
155+
podSpec:
156+
type: object
157+
properties:
158+
podTemplate:
159+
type: object
160+
properties:
161+
spec:
162+
type: object
163+
properties:
164+
podAntiAffinityTopologyKey:
165+
type: string
166+
cpu:
167+
type: string
168+
cpuRequests:
169+
type: string
170+
memory:
171+
type: string
172+
memoryRequests:
173+
type: string
174+
podAffinity:
175+
type: object
176+
nodeAffinity:
177+
type: object
178+
securityContext:
179+
type: object
180+
persistence:
181+
type: object
182+
119183
members:
120184
maximum: 50
121185
minimum: 1
@@ -146,6 +210,15 @@ spec:
146210
type:
147211
type: string
148212
pattern: "^ReplicaSet$"
213+
persistent:
214+
type: boolean
215+
clusterName:
216+
type: string
217+
format: hostname
218+
description: "DEPRECATED Use clusterDomain instead"
219+
clusterDomain:
220+
type: string
221+
format: hostname
149222
security:
150223
type: object
151224
properties:
@@ -212,6 +285,78 @@ spec:
212285
- properties:
213286
spec:
214287
properties: # ShardedCluster schema
288+
shardPodSpec:
289+
type: object
290+
properties:
291+
spec:
292+
type: object
293+
properties:
294+
podAntiAffinityTopologyKey:
295+
type: string
296+
cpu:
297+
type: string
298+
cpuRequests:
299+
type: string
300+
memory:
301+
type: string
302+
memoryRequests:
303+
type: string
304+
podAffinity:
305+
type: object
306+
nodeAffinity:
307+
type: object
308+
securityContext:
309+
type: object
310+
persistence:
311+
type: object
312+
mongosPodSpec:
313+
type: object
314+
properties:
315+
spec:
316+
type: object
317+
properties:
318+
podAntiAffinityTopologyKey:
319+
type: string
320+
cpu:
321+
type: string
322+
cpuRequests:
323+
type: string
324+
memory:
325+
type: string
326+
memoryRequests:
327+
type: string
328+
podAffinity:
329+
type: object
330+
nodeAffinity:
331+
type: object
332+
securityContext:
333+
type: object
334+
persistence:
335+
type: object
336+
configSrvPodSpec:
337+
type: object
338+
properties:
339+
spec:
340+
type: object
341+
properties:
342+
podAntiAffinityTopologyKey:
343+
type: string
344+
cpu:
345+
type: string
346+
cpuRequests:
347+
type: string
348+
memory:
349+
type: string
350+
memoryRequests:
351+
type: string
352+
podAffinity:
353+
type: object
354+
nodeAffinity:
355+
type: object
356+
securityContext:
357+
type: object
358+
persistence:
359+
type: object
215360
configServerCount:
216361
maximum: 50
217362
minimum: 1
@@ -252,6 +397,15 @@ spec:
252397
type:
253398
type: string
254399
pattern: "^ShardedCluster$"
400+
persistent:
401+
type: boolean
402+
clusterName:
403+
type: string
404+
format: hostname
405+
description: "DEPRECATED Use clusterDomain instead"
406+
clusterDomain:
407+
type: string
408+
format: hostname
255409
security:
256410
type: object
257411
properties:
@@ -436,6 +590,13 @@ spec:
436590
replicas:
437591
minimum: 1
438592
type: integer
593+
clusterName:
594+
type: string
595+
format: hostname
596+
description: "DEPRECATED Use clusterDomain instead"
597+
clusterDomain:
598+
type: string
599+
format: hostname
439600
externalConnectivity:
440601
type: object
441602
properties:
@@ -530,7 +691,6 @@ spec:
530691

531692
required:
532693
- enabled
533-
534694
applicationDatabase:
535695
type: object
536696
properties:
@@ -549,14 +709,13 @@ spec:
549709
type: integer
550710
version:
551711
type: string
552-
pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
712+
pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$|^$"
553713
logLevel:
554714
type: string
555715
enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
556-
exposedExternally:
716+
persistent:
557717
type: boolean
558718
required:
559-
- version
560719
- members
561720
required:
562721
- version

‎helm_chart/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: mongodb-enterprise-operator
22
description: MongoDB Kubernetes Enterprise Operator
3-
version: 1.4.1
3+
version: 1.4.2
44
kubeVersion: '>=1.13'
55
keywords:
66
- mongodb

0 commit comments

Comments
 (0)