Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4ae9146

Browse files
LouisPlissoLouisPlisso
committedJul 16, 2020
7dc24ee1e333991517143df70fc4e262a4ec908c: update public repo contents
1 parent 2031b48 commit 4ae9146

File tree

11 files changed

+198
-9
lines changed

11 files changed

+198
-9
lines changed
 

‎crds.yaml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ spec:
183183
type: array
184184
items:
185185
type: string
186-
enum: ["SCRAM", "X509"]
186+
enum: ["SCRAM", "X509", "LDAP"]
187187
ignoreUnknownUsers:
188188
type: boolean
189189
tls:
@@ -193,11 +193,34 @@ spec:
193193
type: boolean
194194
ca:
195195
type: string
196+
secretRef:
197+
type: object
198+
properties:
199+
name:
200+
type: string
196201
additionalCertificateDomains:
197202
type: array
198203
items:
199204
type: string
200205

206+
ldap:
207+
type: object
208+
properties:
209+
bindQueryUser:
210+
type: string
211+
servers:
212+
type: string
213+
transportSecurity:
214+
type: string
215+
enum: ["none", "tls"]
216+
bindQueryPasswordSecretRef:
217+
type: object
218+
properties:
219+
name:
220+
type: string
221+
caConfigMapRef:
222+
type: object
223+
201224
# Sharded Cluster properties
202225
shardPodSpec:
203226
type: object

‎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.5.5
3+
version: 1.6.0
44
kubeVersion: '>=1.13-0'
55
keywords:
66
- mongodb

‎helm_chart/crds/mongodb.mongodb.com.yaml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ spec:
183183
type: array
184184
items:
185185
type: string
186-
enum: ["SCRAM", "X509"]
186+
enum: ["SCRAM", "X509", "LDAP"]
187187
ignoreUnknownUsers:
188188
type: boolean
189189
tls:
@@ -193,11 +193,34 @@ spec:
193193
type: boolean
194194
ca:
195195
type: string
196+
secretRef:
197+
type: object
198+
properties:
199+
name:
200+
type: string
196201
additionalCertificateDomains:
197202
type: array
198203
items:
199204
type: string
200205

206+
ldap:
207+
type: object
208+
properties:
209+
bindQueryUser:
210+
type: string
211+
servers:
212+
type: string
213+
transportSecurity:
214+
type: string
215+
enum: ["none", "tls"]
216+
bindQueryPasswordSecretRef:
217+
type: object
218+
properties:
219+
name:
220+
type: string
221+
caConfigMapRef:
222+
type: object
223+
201224
# Sharded Cluster properties
202225
shardPodSpec:
203226
type: object

‎helm_chart/values-openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ operator:
1515
deployment_name: mongodb-enterprise-operator
1616

1717
# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
18-
version: 1.5.5
18+
version: 1.6.0
1919

2020
# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
2121
watchedResources:

‎helm_chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ operator:
1616
deployment_name: mongodb-enterprise-operator
1717

1818
# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
19-
version: 1.5.5
19+
version: 1.6.0
2020

2121
# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
2222
watchedResources:

‎mongodb-enterprise-openshift.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ spec:
188188
serviceAccountName: enterprise-operator
189189
containers:
190190
- name: mongodb-enterprise-operator
191-
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.5.5
191+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.6.0
192192
imagePullPolicy: Always
193193
args:
194194
- "-watch-resource=mongodb"
@@ -210,7 +210,7 @@ spec:
210210
- name: MANAGED_SECURITY_CONTEXT
211211
value: 'true'
212212
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
213-
value: registry.connect.redhat.com/mongodb/enterprise-database:1.5.5
213+
value: registry.connect.redhat.com/mongodb/enterprise-database:1.6.0
214214
- name: IMAGE_PULL_POLICY
215215
value: Always
216216
- name: OPS_MANAGER_IMAGE_REPOSITORY

‎mongodb-enterprise.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ spec:
191191
runAsUser: 2000
192192
containers:
193193
- name: mongodb-enterprise-operator
194-
image: quay.io/mongodb/mongodb-enterprise-operator:1.5.5
194+
image: quay.io/mongodb/mongodb-enterprise-operator:1.6.0
195195
imagePullPolicy: Always
196196
args:
197197
- "-watch-resource=mongodb"
@@ -211,7 +211,7 @@ spec:
211211
fieldRef:
212212
fieldPath: metadata.namespace
213213
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
214-
value: quay.io/mongodb/mongodb-enterprise-database:1.5.5
214+
value: quay.io/mongodb/mongodb-enterprise-database:1.6.0
215215
- name: IMAGE_PULL_POLICY
216216
value: Always
217217
- name: OPS_MANAGER_IMAGE_REPOSITORY

‎samples/mongodb/authentication/ldap/replica-set/replica-set-ldap-user.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
apiVersion: mongodb.com/v1
3+
kind: MongoDBUser
4+
metadata:
5+
name: my-ldap-user
6+
spec:
7+
username: my-ldap-user
8+
db: $external
9+
mongodbResourceRef:
10+
name: my-ldap-enabled-replica-set # The name of the MongoDB resource this user will be added to
11+
roles:
12+
- db: admin
13+
name: clusterAdmin
14+
- db: admin
15+
name: userAdminAnyDatabase
16+
- db: admin
17+
name: readWrite
18+
- db: admin
19+
name: userAdminAnyDatabase

‎samples/mongodb/authentication/ldap/replica-set/replica-set-ldap.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Creates a MongoDB Replica Set with LDAP Authentication Enabled.
2+
# LDAP is an Enterprise-only feature.
3+
4+
---
5+
apiVersion: mongodb.com/v1
6+
kind: MongoDB
7+
metadata:
8+
name: my-ldap-enabled-replica-set
9+
spec:
10+
type: ReplicaSet
11+
members: 3
12+
version: 4.0.4-ent
13+
14+
opsManager:
15+
configMapRef:
16+
name: my-project
17+
credentials: my-credentials
18+
19+
security:
20+
authentication:
21+
enabled: true
22+
# Enabled LDAP Authentication Mode
23+
modes: ["LDAP"]
24+
25+
# LDAP related configuration
26+
ldap:
27+
# Specify the hostname:port combination of one or
28+
# more LDAP servers
29+
servers: "<ldap-servers>"
30+
31+
# Set to "tls" to use LDAP over TLS. Leave blank if
32+
# LDAP server does not accept TLS.
33+
transportSecurity: "tls"
34+
35+
# ConfigMap containing a CA certificate that validates
36+
# the LDAP server's TLS certificate.
37+
caConfigMapRef:
38+
name: "<configmap-name>"
39+
key: "<configmap-entry-key>"
40+
41+
# Specify the LDAP Distinguished Name to which
42+
# MongoDB binds when connecting to the LDAP server
43+
bindQueryUser: "cn=admin,dc=example,dc=org"
44+
45+
# Specify the password with which MongoDB binds
46+
# when connecting to an LDAP server. This is a
47+
# reference to a Secret Kubernetes Object containing
48+
# one "password" key.
49+
bindQueryPasswordSecretRef:
50+
name: "<secret-name>"
51+

‎samples/mongodb/authentication/ldap/sharded-cluster/sharded-cluster-ldap-user.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
apiVersion: mongodb.com/v1
3+
kind: MongoDBUser
4+
metadata:
5+
name: my-ldap-user
6+
spec:
7+
username: my-ldap-user
8+
db: $external
9+
mongodbResourceRef:
10+
name: my-ldap-enabled-sharded-cluster # The name of the MongoDB resource this user will be added to
11+
roles:
12+
- db: admin
13+
name: clusterAdmin
14+
- db: admin
15+
name: userAdminAnyDatabase
16+
- db: admin
17+
name: readWrite
18+
- db: admin
19+
name: userAdminAnyDatabase

‎samples/mongodb/authentication/ldap/sharded-cluster/sharded-cluster-ldap.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
apiVersion: mongodb.com/v1
3+
kind: MongoDB
4+
metadata:
5+
name: my-ldap-enabled-sharded-cluster
6+
spec:
7+
type: ShardedCluster
8+
9+
shardCount: 2
10+
mongodsPerShardCount: 3
11+
mongosCount: 2
12+
configServerCount: 3
13+
14+
version: 4.0.4-ent
15+
16+
opsManager:
17+
configMapRef:
18+
name: my-project
19+
credentials: my-credentials
20+
21+
security:
22+
authentication:
23+
enabled: true
24+
25+
# Enabled LDAP Authentication Mode
26+
modes: ["LDAP"]
27+
28+
# LDAP related configuration
29+
ldap:
30+
# Specify the hostname:port combination of one or
31+
# more LDAP servers
32+
servers: "<ldap-servers>"
33+
34+
# Set to "tls" to use LDAP over TLS. Leave blank if
35+
# LDAP server does not accept TLS.
36+
transportSecurity: "tls"
37+
38+
# ConfigMap containing a CA certificate that validates
39+
# the LDAP server's TLS certificate.
40+
caConfigMapRef:
41+
name: "<configmap-name>"
42+
key: "<configmap-entry-key>"
43+
44+
# Specify the LDAP Distinguished Name to which
45+
# MongoDB binds when connecting to the LDAP server
46+
bindQueryUser: "cn=admin,dc=example,dc=org"
47+
48+
# Specify the password with which MongoDB binds
49+
# when connecting to an LDAP server. This is a
50+
# reference to a Secret Kubernetes Object containing
51+
# one "password" key.
52+
bindQueryPasswordSecretRef:
53+
name: "<secret-name>"
54+

0 commit comments

Comments
 (0)
Please sign in to comment.