Skip to content

Commit 5ed7b95

Browse files
LouisPlissoLouisPlisso
committed
32ede544215c4640f8ed52c9f27bfdd993f8c84b: update public repo contents
1 parent 7602f64 commit 5ed7b95

18 files changed

+181
-31
lines changed

‎crds.yaml‎

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ spec:
9090

9191
additionalMongodConfig:
9292
type: object
93-
9493
exposedExternally:
9594
type: boolean
9695

@@ -174,7 +173,16 @@ spec:
174173
properties:
175174
mode:
176175
type: string
177-
enum: ["SCRAM", "X509"]
176+
enum: ["SCRAM", "X509", "LDAP"]
177+
automationUsername:
178+
type: string
179+
automationPasswordSecretRef:
180+
type: object
181+
properties:
182+
name:
183+
type: string
184+
key:
185+
type: string
178186
required:
179187
- mode
180188
enabled:
@@ -209,7 +217,9 @@ spec:
209217
bindQueryUser:
210218
type: string
211219
servers:
212-
type: string
220+
type: array
221+
items:
222+
type: string
213223
transportSecurity:
214224
type: string
215225
enum: ["none", "tls"]
@@ -224,6 +234,70 @@ spec:
224234
type: string
225235
userToDNMapping:
226236
type: string
237+
roles:
238+
type: array
239+
description: "List of roles not bounded to specific users"
240+
items:
241+
type: object
242+
properties:
243+
role:
244+
type: string
245+
description: "The name of the role"
246+
db:
247+
type: string
248+
description: "The db the role belongs to"
249+
roles:
250+
type: array
251+
description: "List of roles this role inherits from"
252+
items:
253+
type: object
254+
properties:
255+
db:
256+
type: string
257+
description: "The db the role belongs to"
258+
role:
259+
type: string
260+
description: "The name of the role"
261+
authenticationRestrictions:
262+
type: array
263+
description: "List of restriction for users authenticating to this role"
264+
items:
265+
type: object
266+
properties:
267+
clientSource:
268+
type: array
269+
description: "List of IP addresses or CIDR ranges allowed the user can connect from"
270+
items:
271+
type: string
272+
serverAddress:
273+
type: array
274+
description: "List of IP addresses or CIDR ranges allowed the user can connect to"
275+
items:
276+
type: string
277+
privileges:
278+
type: array
279+
description: "List of privileges granted to this role"
280+
items:
281+
type: object
282+
properties:
283+
actions:
284+
type: array
285+
description: "List of actions allowed to this role"
286+
items:
287+
type: string
288+
resource:
289+
type: object
290+
description: "Resource on which the privileges are granted"
291+
properties:
292+
db:
293+
type: string
294+
description: "Name of the database"
295+
collection:
296+
type: string
297+
description: "Name of the collection"
298+
cluster:
299+
type: boolean
300+
description: "True for cluster-wide privileges"
227301

228302
# Sharded Cluster properties
229303
shardPodSpec:
@@ -451,7 +525,6 @@ spec:
451525
properties:
452526
additionalMongodConfig:
453527
type: object
454-
455528
---
456529
apiVersion: apiextensions.k8s.io/v1beta1
457530
kind: CustomResourceDefinition

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

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

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ spec:
9090

9191
additionalMongodConfig:
9292
type: object
93-
9493
exposedExternally:
9594
type: boolean
9695

@@ -174,7 +173,16 @@ spec:
174173
properties:
175174
mode:
176175
type: string
177-
enum: ["SCRAM", "X509"]
176+
enum: ["SCRAM", "X509", "LDAP"]
177+
automationUsername:
178+
type: string
179+
automationPasswordSecretRef:
180+
type: object
181+
properties:
182+
name:
183+
type: string
184+
key:
185+
type: string
178186
required:
179187
- mode
180188
enabled:
@@ -209,7 +217,9 @@ spec:
209217
bindQueryUser:
210218
type: string
211219
servers:
212-
type: string
220+
type: array
221+
items:
222+
type: string
213223
transportSecurity:
214224
type: string
215225
enum: ["none", "tls"]
@@ -224,6 +234,70 @@ spec:
224234
type: string
225235
userToDNMapping:
226236
type: string
237+
roles:
238+
type: array
239+
description: "List of roles not bounded to specific users"
240+
items:
241+
type: object
242+
properties:
243+
role:
244+
type: string
245+
description: "The name of the role"
246+
db:
247+
type: string
248+
description: "The db the role belongs to"
249+
roles:
250+
type: array
251+
description: "List of roles this role inherits from"
252+
items:
253+
type: object
254+
properties:
255+
db:
256+
type: string
257+
description: "The db the role belongs to"
258+
role:
259+
type: string
260+
description: "The name of the role"
261+
authenticationRestrictions:
262+
type: array
263+
description: "List of restriction for users authenticating to this role"
264+
items:
265+
type: object
266+
properties:
267+
clientSource:
268+
type: array
269+
description: "List of IP addresses or CIDR ranges allowed the user can connect from"
270+
items:
271+
type: string
272+
serverAddress:
273+
type: array
274+
description: "List of IP addresses or CIDR ranges allowed the user can connect to"
275+
items:
276+
type: string
277+
privileges:
278+
type: array
279+
description: "List of privileges granted to this role"
280+
items:
281+
type: object
282+
properties:
283+
actions:
284+
type: array
285+
description: "List of actions allowed to this role"
286+
items:
287+
type: string
288+
resource:
289+
type: object
290+
description: "Resource on which the privileges are granted"
291+
properties:
292+
db:
293+
type: string
294+
description: "Name of the database"
295+
collection:
296+
type: string
297+
description: "Name of the collection"
298+
cluster:
299+
type: boolean
300+
description: "True for cluster-wide privileges"
227301

228302
# Sharded Cluster properties
229303
shardPodSpec:
@@ -451,4 +525,3 @@ spec:
451525
properties:
452526
additionalMongodConfig:
453527
type: object
454-

‎helm_chart/templates/operator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ spec:
1010
replicas: 1
1111
selector:
1212
matchLabels:
13-
app: {{ .Values.operator.name }}
13+
controller: {{ .Values.operator.name }}
1414
template:
1515
metadata:
1616
labels:
17-
app: {{ .Values.operator.name }}
17+
controller: {{ .Values.operator.name }}
1818
spec:
1919
serviceAccountName: {{ .Values.operator.name }}
2020
{{- if not .Values.managedSecurityContext }}

‎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.6.1
18+
version: 1.7.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.6.1
19+
version: 1.7.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,16 @@ spec:
179179
replicas: 1
180180
selector:
181181
matchLabels:
182-
app: enterprise-operator
182+
controller: enterprise-operator
183183
template:
184184
metadata:
185185
labels:
186-
app: enterprise-operator
186+
controller: enterprise-operator
187187
spec:
188188
serviceAccountName: enterprise-operator
189189
containers:
190190
- name: mongodb-enterprise-operator
191-
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.6.1
191+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.7.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.6.1
213+
value: registry.connect.redhat.com/mongodb/enterprise-database:1.7.0
214214
- name: IMAGE_PULL_POLICY
215215
value: Always
216216
- name: OPS_MANAGER_IMAGE_REPOSITORY

‎mongodb-enterprise.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,19 +179,19 @@ spec:
179179
replicas: 1
180180
selector:
181181
matchLabels:
182-
app: mongodb-enterprise-operator
182+
controller: mongodb-enterprise-operator
183183
template:
184184
metadata:
185185
labels:
186-
app: mongodb-enterprise-operator
186+
controller: mongodb-enterprise-operator
187187
spec:
188188
serviceAccountName: mongodb-enterprise-operator
189189
securityContext:
190190
runAsNonRoot: true
191191
runAsUser: 2000
192192
containers:
193193
- name: mongodb-enterprise-operator
194-
image: quay.io/mongodb/mongodb-enterprise-operator:1.6.1
194+
image: quay.io/mongodb/mongodb-enterprise-operator:1.7.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.6.1
214+
value: quay.io/mongodb/mongodb-enterprise-database:1.7.0
215215
- name: IMAGE_PULL_POLICY
216216
value: Always
217217
- name: OPS_MANAGER_IMAGE_REPOSITORY

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ spec:
2626
ldap:
2727
# Specify the hostname:port combination of one or
2828
# more LDAP servers
29-
servers: "<ldap-servers>"
29+
servers:
30+
- "<ldap-server0>"
31+
- "<ldap-server1>"
3032

3133
# Set to "tls" to use LDAP over TLS. Leave blank if
3234
# LDAP server does not accept TLS.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ spec:
2929
ldap:
3030
# Specify the hostname:port combination of one or
3131
# more LDAP servers
32-
servers: "<ldap-servers>"
32+
servers:
33+
- "<ldap-server0>"
34+
- "<ldap-server1>"
3335

3436
# Set to "tls" to use LDAP over TLS. Leave blank if
3537
# LDAP server does not accept TLS.

0 commit comments

Comments
 (0)