Skip to content

Commit 03a6c21

Browse files
author
Anton Lisovenko
committed
cad4b3570aac75693c9e3b549927e2edecfdda93: update public repo contents
1 parent c61d299 commit 03a6c21

39 files changed

+819
-114
lines changed

‎README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,25 @@ or clone this repo, make any edits you need, and apply it from your machine.
6464

6565
kubectl apply -f mongodb-enterprise.yaml
6666

67+
Use `mongodb-enterprise-openshift.yaml` if you want to install the Operator to an OpenShift cluster. You need to specify
68+
the image pull secret name to use images from RedHad Catalog.
69+
6770
Check the end of the page for instructions on how to remove the Operator.
6871

6972
### Installation using Helm Chart
7073

7174
If you have installed the Helm client locally then you can run (note that `helm install` is a less preferred way as makes upgrades more complicated.
7275
`kubectl apply` is a much clearer way of installing/upgrading):
7376

74-
helm template public/helm_chart > operator.yaml
77+
helm template helm_chart > operator.yaml
7578
kubectl apply -f operator.yaml
7679

7780
You can customize installation by simple overriding of helm variables, for example use `--set operator.env="dev"` to run the Operator in development mode
7881
(this will turn logging level to `Debug` and will make logging output as non-json)
7982

83+
Pass the `--values helm_chart/values-openshift.yaml` parameter if you want to install the Operator to an OpenShift cluster.
84+
You need to specify the image pull secret name using `--set registry.imagePullSecrets=<secret_name>`
85+
8086
Check the end of the page for instructions on how to remove the Operator.
8187

8288
## MongoDB object ##
@@ -166,7 +172,7 @@ $ kubectl apply -f samples/ops-manager/ops-manager.yaml
166172

167173
Note, that it takes up to 8 minutes to initialize the Application Database and start Ops Manager.
168174

169-
## (Optionally) Create a MongoDB object referencing the new Ops Manager
175+
### (Optionally) Create a MongoDB object referencing the new Ops Manager
170176

171177
Now you can use the Ops Manager application to create MongoDB objects. You need to follow the
172178
[instructions](https://docs.mongodb.com/kubernetes-operator/stable/tutorial/install-k8s-operator/#onprem-prerequisites)

‎crds.yaml

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,27 @@ spec:
6969
type: object
7070
properties:
7171
authentication:
72+
type: object
7273
properties:
7374
enabled:
7475
type: boolean
7576
modes:
7677
type: array
7778
items:
7879
type: string
79-
enum: ["X509"]
80+
enum: ["SCRAM", "X509"]
81+
ignoreUnknownUsers:
82+
type: boolean
8083
tls:
8184
type: object
8285
properties:
8386
enabled:
8487
type: boolean
8588
ca:
8689
type: string
90+
connectivity:
91+
not:
92+
required: ["replicaSetHorizons"]
8793
additionalMongodConfig:
8894
properties:
8995
net:
@@ -140,17 +146,20 @@ spec:
140146
type: object
141147
properties:
142148
authentication:
149+
type: object
143150
properties:
144151
enabled:
145152
type: boolean
146153
modes:
147154
type: array
148155
items:
149156
type: string
150-
enum: ["X509"]
157+
enum: ["SCRAM", "X509"]
151158
internalCluster:
152159
type: string
153160
enum: ["X509"]
161+
ignoreUnknownUsers:
162+
type: boolean
154163
tls:
155164
type: object
156165
properties:
@@ -163,6 +172,14 @@ spec:
163172
# https://docs.mongodb.com/kubernetes-operator/
164173
type: string
165174
enum: ["x509"]
175+
connectivity:
176+
properties:
177+
replicaSetHorizons:
178+
type: array
179+
items:
180+
type: object
181+
additionalProperties:
182+
type: string
166183
additionalMongodConfig:
167184
properties:
168185
net:
@@ -231,17 +248,20 @@ spec:
231248
type: object
232249
properties:
233250
authentication:
251+
type: object
234252
properties:
235253
enabled:
236254
type: boolean
237255
modes:
238256
type: array
239257
items:
240258
type: string
241-
enum: ["X509"]
259+
enum: ["SCRAM", "X509"]
242260
internalCluster:
243261
type: string
244262
enum: ["X509"]
263+
ignoreUnknownUsers:
264+
type: boolean
245265
tls:
246266
type: object
247267
properties:
@@ -254,6 +274,9 @@ spec:
254274
# https://docs.mongodb.com/kubernetes-operator/
255275
type: string
256276
enum: ["x509"]
277+
connectivity:
278+
not:
279+
required: ["replicaSetHorizons"]
257280
additionalMongodConfig:
258281
properties:
259282
net:
@@ -292,6 +315,15 @@ spec:
292315
shortNames:
293316
- mdbu
294317
singular: mongodbuser
318+
additionalPrinterColumns:
319+
- name: State
320+
type: string
321+
description: The current state of the MongoDB User
322+
JSONPath: .status.phase
323+
- name: Age
324+
type: date
325+
description: The time since the MongoDB User resource was created
326+
JSONPath: .metadata.creationTimestamp
295327
validation:
296328
openAPIV3Schema:
297329
properties:
@@ -303,9 +335,16 @@ spec:
303335
db:
304336
type: string
305337
description: "The database the user is stored in"
306-
enum: ["$external"]
307338
project:
308339
type: string
340+
description: "The project the user belongs to"
341+
passwordSecretKeyRef:
342+
type: object
343+
properties:
344+
name:
345+
type: string
346+
key:
347+
type: string
309348
description: "DEPRECATED The project the user belongs to"
310349
mongodbResourceRef:
311350
properties:
@@ -323,6 +362,12 @@ spec:
323362
db:
324363
type: string
325364
description: "The db the role can act on"
365+
passwordSecretKeyRef:
366+
properties:
367+
name:
368+
type: string
369+
key:
370+
type: string
326371
required:
327372
- name
328373
- db
@@ -345,6 +390,10 @@ spec:
345390
- om
346391
singular: opsmanager
347392
additionalPrinterColumns:
393+
- name: Replicas
394+
type: integer
395+
description: The number of replicas of MongoDBOpsManager.
396+
JSONPath: .spec.replicas
348397
- name: Version
349398
type: string
350399
description: The version of MongoDBOpsManager.
@@ -372,6 +421,9 @@ spec:
372421
properties:
373422
version:
374423
type: string
424+
replicas:
425+
minimum: 1
426+
type: integer
375427
backup:
376428
type: object
377429
properties:
@@ -403,7 +455,6 @@ spec:
403455
type: boolean
404456
required:
405457
- version
406-
- type
407458
- members
408459
required:
409460
- 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.3.0
3+
version: 1.3.1
44
kubeVersion: '>=1.13'
55
keywords:
66
- mongodb

‎helm_chart/templates/crds.yaml

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,27 @@ spec:
6767
type: object
6868
properties:
6969
authentication:
70+
type: object
7071
properties:
7172
enabled:
7273
type: boolean
7374
modes:
7475
type: array
7576
items:
7677
type: string
77-
enum: ["X509"]
78+
enum: ["SCRAM", "X509"]
79+
ignoreUnknownUsers:
80+
type: boolean
7881
tls:
7982
type: object
8083
properties:
8184
enabled:
8285
type: boolean
8386
ca:
8487
type: string
88+
connectivity:
89+
not:
90+
required: ["replicaSetHorizons"]
8591
additionalMongodConfig:
8692
properties:
8793
net:
@@ -138,17 +144,20 @@ spec:
138144
type: object
139145
properties:
140146
authentication:
147+
type: object
141148
properties:
142149
enabled:
143150
type: boolean
144151
modes:
145152
type: array
146153
items:
147154
type: string
148-
enum: ["X509"]
155+
enum: ["SCRAM", "X509"]
149156
internalCluster:
150157
type: string
151158
enum: ["X509"]
159+
ignoreUnknownUsers:
160+
type: boolean
152161
tls:
153162
type: object
154163
properties:
@@ -161,6 +170,14 @@ spec:
161170
# https://docs.mongodb.com/kubernetes-operator/
162171
type: string
163172
enum: ["x509"]
173+
connectivity:
174+
properties:
175+
replicaSetHorizons:
176+
type: array
177+
items:
178+
type: object
179+
additionalProperties:
180+
type: string
164181
additionalMongodConfig:
165182
properties:
166183
net:
@@ -229,17 +246,20 @@ spec:
229246
type: object
230247
properties:
231248
authentication:
249+
type: object
232250
properties:
233251
enabled:
234252
type: boolean
235253
modes:
236254
type: array
237255
items:
238256
type: string
239-
enum: ["X509"]
257+
enum: ["SCRAM", "X509"]
240258
internalCluster:
241259
type: string
242260
enum: ["X509"]
261+
ignoreUnknownUsers:
262+
type: boolean
243263
tls:
244264
type: object
245265
properties:
@@ -252,6 +272,9 @@ spec:
252272
# https://docs.mongodb.com/kubernetes-operator/
253273
type: string
254274
enum: ["x509"]
275+
connectivity:
276+
not:
277+
required: ["replicaSetHorizons"]
255278
additionalMongodConfig:
256279
properties:
257280
net:
@@ -290,6 +313,15 @@ spec:
290313
shortNames:
291314
- mdbu
292315
singular: mongodbuser
316+
additionalPrinterColumns:
317+
- name: State
318+
type: string
319+
description: The current state of the MongoDB User
320+
JSONPath: .status.phase
321+
- name: Age
322+
type: date
323+
description: The time since the MongoDB User resource was created
324+
JSONPath: .metadata.creationTimestamp
293325
validation:
294326
openAPIV3Schema:
295327
properties:
@@ -301,9 +333,16 @@ spec:
301333
db:
302334
type: string
303335
description: "The database the user is stored in"
304-
enum: ["$external"]
305336
project:
306337
type: string
338+
description: "The project the user belongs to"
339+
passwordSecretKeyRef:
340+
type: object
341+
properties:
342+
name:
343+
type: string
344+
key:
345+
type: string
307346
description: "DEPRECATED The project the user belongs to"
308347
mongodbResourceRef:
309348
properties:
@@ -321,6 +360,12 @@ spec:
321360
db:
322361
type: string
323362
description: "The db the role can act on"
363+
passwordSecretKeyRef:
364+
properties:
365+
name:
366+
type: string
367+
key:
368+
type: string
324369
required:
325370
- name
326371
- db
@@ -343,6 +388,10 @@ spec:
343388
- om
344389
singular: opsmanager
345390
additionalPrinterColumns:
391+
- name: Replicas
392+
type: integer
393+
description: The number of replicas of MongoDBOpsManager.
394+
JSONPath: .spec.replicas
346395
- name: Version
347396
type: string
348397
description: The version of MongoDBOpsManager.
@@ -370,6 +419,9 @@ spec:
370419
properties:
371420
version:
372421
type: string
422+
replicas:
423+
minimum: 1
424+
type: integer
373425
backup:
374426
type: object
375427
properties:
@@ -401,7 +453,6 @@ spec:
401453
type: boolean
402454
required:
403455
- version
404-
- type
405456
- members
406457
required:
407458
- version

0 commit comments

Comments
 (0)