Skip to content

Commit f57009b

Browse files
chattonchatton
committed
cb3282cda2e391019a686d7f038526325cb1e490: update public repo contents
1 parent 1a3814d commit f57009b

18 files changed

+345
-48
lines changed

‎crds.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ spec:
191191
type: string
192192
automationLdapGroupDN:
193193
type: string
194+
clientCertificateSecretRef:
195+
type: object
196+
properties:
197+
name:
198+
type: string
194199
required:
195200
- mode
196201
enabled:
@@ -202,6 +207,8 @@ spec:
202207
enum: ["SCRAM", "X509", "LDAP"]
203208
ignoreUnknownUsers:
204209
type: boolean
210+
requireClientTLSAuthentication:
211+
type: boolean
205212
tls:
206213
type: object
207214
properties:
@@ -700,13 +707,13 @@ spec:
700707
tls:
701708
type: object
702709
properties:
710+
ca:
711+
type: string
703712
secretRef:
704713
type: object
705714
properties:
706715
name:
707716
type: string
708-
ca:
709-
type: string
710717
required:
711718
- name
712719

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ spec:
191191
type: string
192192
automationLdapGroupDN:
193193
type: string
194+
clientCertificateSecretRef:
195+
type: object
196+
properties:
197+
name:
198+
type: string
194199
required:
195200
- mode
196201
enabled:
@@ -202,6 +207,8 @@ spec:
202207
enum: ["SCRAM", "X509", "LDAP"]
203208
ignoreUnknownUsers:
204209
type: boolean
210+
requireClientTLSAuthentication:
211+
type: boolean
205212
tls:
206213
type: object
207214
properties:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ spec:
7070
tls:
7171
type: object
7272
properties:
73+
ca:
74+
type: string
7375
secretRef:
7476
type: object
7577
properties:
7678
name:
7779
type: string
78-
ca:
79-
type: string
8080
required:
8181
- name
8282

‎helm_chart/templates/operator.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ spec:
1010
replicas: 1
1111
selector:
1212
matchLabels:
13-
controller: {{ .Values.operator.name }}
13+
app.kubernetes.io/component: controller
14+
app.kubernetes.io/name: {{ .Values.operator.name }}
15+
app.kubernetes.io/instance: {{ .Values.operator.name }}
1416
template:
1517
metadata:
1618
labels:
17-
controller: {{ .Values.operator.name }}
19+
app.kubernetes.io/component: controller
20+
app.kubernetes.io/name: {{ .Values.operator.name }}
21+
app.kubernetes.io/instance: {{ .Values.operator.name }}
1822
spec:
1923
serviceAccountName: {{ .Values.operator.name }}
2024
{{- if not .Values.managedSecurityContext }}
@@ -57,24 +61,33 @@ spec:
5761
- name: MANAGED_SECURITY_CONTEXT
5862
value: 'true'
5963
{{- end }}
60-
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
61-
value: {{ .Values.registry.operator }}/{{ .Values.database.name }}:{{ .Values.operator.version }}
6264
- name: IMAGE_PULL_POLICY
6365
value: {{ .Values.registry.pullPolicy }}
66+
# Database
67+
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
68+
value: {{ .Values.registry.database }}/{{ .Values.database.name }}
69+
- name: INIT_DATABASE_IMAGE_REPOSITORY
70+
value: {{ .Values.registry.initDatabase }}/{{ .Values.initDatabase.name }}
71+
- name: INIT_DATABASE_VERSION
72+
value: {{ .Values.initDatabase.version }}
73+
- name: DATABASE_VERSION
74+
value: {{ .Values.database.version }}
75+
# Ops Manager
6476
- name: OPS_MANAGER_IMAGE_REPOSITORY
6577
value: {{ .Values.registry.opsManager }}/{{ .Values.opsManager.name }}
6678
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
6779
value: {{ .Values.registry.initOpsManager }}/{{ .Values.initOpsManager.name }}
6880
- name: INIT_OPS_MANAGER_VERSION
6981
value: {{ .Values.initOpsManager.version }}
82+
# AppDB
83+
- name: APPDB_IMAGE_REPOSITORY
84+
value: {{ .Values.registry.appDb }}/{{ .Values.appDb.name }}
7085
- name: INIT_APPDB_IMAGE_REPOSITORY
7186
value: {{ .Values.registry.initAppDb }}/{{ .Values.initAppDb.name }}
7287
- name: INIT_APPDB_VERSION
7388
value: {{ .Values.initAppDb.version }}
7489
- name: OPS_MANAGER_IMAGE_PULL_POLICY
7590
value: {{ .Values.registry.pullPolicy }}
76-
- name: APPDB_IMAGE_REPOSITORY
77-
value: {{ .Values.registry.appDb }}/{{ .Values.appDb.name }}
7891
{{- if .Values.registry.imagePullSecrets }}
7992
- name: IMAGE_PULL_SECRETS
8093
value: {{ .Values.registry.imagePullSecrets }}

‎helm_chart/values-openshift.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,47 @@ operator:
1515
deployment_name: mongodb-enterprise-operator
1616

1717
# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
18-
version: 1.7.1
18+
version: 1.8.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:
2222
- mongodb
2323
- opsmanagers
2424
- mongodbusers
2525

26+
## Database
2627
database:
2728
name: enterprise-database
29+
version: 2.0.0
2830

31+
initDatabase:
32+
name: mongodb-enterprise-init-database
33+
version: 1.0.0
34+
35+
## Ops Manager
2936
opsManager:
3037
name: mongodb-enterprise-ops-manager
3138

3239
initOpsManager:
3340
name: mongodb-enterprise-init-ops-manager
34-
version: 1.0.1
41+
version: 1.0.2
3542

43+
## Application Database
3644
appDb:
3745
name: mongodb-enterprise-appdb
3846

3947
initAppDb:
4048
name: mongodb-enterprise-init-appdb
4149
version: 1.0.3
4250

51+
## Registry
4352
registry:
4453
# The pull secret must be specified
4554
imagePullSecrets:
4655
pullPolicy: Always
56+
database: registry.connect.redhat.com/mongodb
4757
operator: registry.connect.redhat.com/mongodb
58+
initDatabase: registry.connect.redhat.com/mongodb
4859
initOpsManager: registry.connect.redhat.com/mongodb
4960
opsManager: registry.connect.redhat.com/mongodb
5061
initAppDb: registry.connect.redhat.com/mongodb

‎helm_chart/values.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Name of the Namespace to use
22
namespace: mongodb
33

4+
## Operator
5+
46
# Set this to true if your cluster is managing SecurityContext for you.
57
# If running OpenShift (Cloud, Minishift, etc.), set this to true.
68
managedSecurityContext: false
@@ -16,37 +18,48 @@ operator:
1618
deployment_name: mongodb-enterprise-operator
1719

1820
# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
19-
version: 1.7.1
21+
version: 1.8.0
2022

2123
# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
2224
watchedResources:
2325
- mongodb
2426
- opsmanagers
2527
- mongodbusers
2628

29+
## Database
2730
database:
2831
name: mongodb-enterprise-database
32+
version: 2.0.0
33+
34+
initDatabase:
35+
name: mongodb-enterprise-init-database
36+
version: 1.0.0
2937

38+
## Ops Manager
3039
opsManager:
3140
name: mongodb-enterprise-ops-manager
3241

3342
initOpsManager:
3443
name: mongodb-enterprise-init-ops-manager
35-
version: 1.0.1
44+
version: 1.0.2
3645

46+
## Application Database
3747
appDb:
3848
name: mongodb-enterprise-appdb
3949

4050
initAppDb:
4151
name: mongodb-enterprise-init-appdb
4252
version: 1.0.3
4353

54+
## Registry
4455
registry:
4556
imagePullSecrets:
4657
# TODO: specify for each image and move there?
4758
pullPolicy: Always
4859
# Specify if images are pulled from private registry
4960
operator: quay.io/mongodb
61+
database: quay.io/mongodb
62+
initDatabase: quay.io/mongodb
5063
initOpsManager: quay.io/mongodb
5164
opsManager: quay.io/mongodb
5265
initAppDb: quay.io/mongodb

‎mongodb-enterprise-openshift.yaml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,20 @@ spec:
179179
replicas: 1
180180
selector:
181181
matchLabels:
182-
controller: enterprise-operator
182+
app.kubernetes.io/component: controller
183+
app.kubernetes.io/name: enterprise-operator
184+
app.kubernetes.io/instance: enterprise-operator
183185
template:
184186
metadata:
185187
labels:
186-
controller: enterprise-operator
188+
app.kubernetes.io/component: controller
189+
app.kubernetes.io/name: enterprise-operator
190+
app.kubernetes.io/instance: enterprise-operator
187191
spec:
188192
serviceAccountName: enterprise-operator
189193
containers:
190194
- name: mongodb-enterprise-operator
191-
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.7.1
195+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.8.0
192196
imagePullPolicy: Always
193197
args:
194198
- "-watch-resource=mongodb"
@@ -209,21 +213,30 @@ spec:
209213
fieldPath: metadata.namespace
210214
- name: MANAGED_SECURITY_CONTEXT
211215
value: 'true'
212-
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
213-
value: registry.connect.redhat.com/mongodb/enterprise-database:1.7.1
214216
- name: IMAGE_PULL_POLICY
215217
value: Always
218+
# Database
219+
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
220+
value: registry.connect.redhat.com/mongodb/enterprise-database
221+
- name: INIT_DATABASE_IMAGE_REPOSITORY
222+
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
223+
- name: INIT_DATABASE_VERSION
224+
value: 1.0.0
225+
- name: DATABASE_VERSION
226+
value: 2.0.0
227+
# Ops Manager
216228
- name: OPS_MANAGER_IMAGE_REPOSITORY
217229
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager
218230
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
219231
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager
220232
- name: INIT_OPS_MANAGER_VERSION
221-
value: 1.0.1
233+
value: 1.0.2
234+
# AppDB
235+
- name: APPDB_IMAGE_REPOSITORY
236+
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb
222237
- name: INIT_APPDB_IMAGE_REPOSITORY
223238
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb
224239
- name: INIT_APPDB_VERSION
225240
value: 1.0.3
226241
- name: OPS_MANAGER_IMAGE_PULL_POLICY
227242
value: Always
228-
- name: APPDB_IMAGE_REPOSITORY
229-
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb

‎mongodb-enterprise.yaml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,19 +179,23 @@ spec:
179179
replicas: 1
180180
selector:
181181
matchLabels:
182-
controller: mongodb-enterprise-operator
182+
app.kubernetes.io/component: controller
183+
app.kubernetes.io/name: mongodb-enterprise-operator
184+
app.kubernetes.io/instance: mongodb-enterprise-operator
183185
template:
184186
metadata:
185187
labels:
186-
controller: mongodb-enterprise-operator
188+
app.kubernetes.io/component: controller
189+
app.kubernetes.io/name: mongodb-enterprise-operator
190+
app.kubernetes.io/instance: mongodb-enterprise-operator
187191
spec:
188192
serviceAccountName: mongodb-enterprise-operator
189193
securityContext:
190194
runAsNonRoot: true
191195
runAsUser: 2000
192196
containers:
193197
- name: mongodb-enterprise-operator
194-
image: quay.io/mongodb/mongodb-enterprise-operator:1.7.1
198+
image: quay.io/mongodb/mongodb-enterprise-operator:1.8.0
195199
imagePullPolicy: Always
196200
args:
197201
- "-watch-resource=mongodb"
@@ -210,21 +214,30 @@ spec:
210214
valueFrom:
211215
fieldRef:
212216
fieldPath: metadata.namespace
213-
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
214-
value: quay.io/mongodb/mongodb-enterprise-database:1.7.1
215217
- name: IMAGE_PULL_POLICY
216218
value: Always
219+
# Database
220+
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
221+
value: quay.io/mongodb/mongodb-enterprise-database
222+
- name: INIT_DATABASE_IMAGE_REPOSITORY
223+
value: quay.io/mongodb/mongodb-enterprise-init-database
224+
- name: INIT_DATABASE_VERSION
225+
value: 1.0.0
226+
- name: DATABASE_VERSION
227+
value: 2.0.0
228+
# Ops Manager
217229
- name: OPS_MANAGER_IMAGE_REPOSITORY
218230
value: quay.io/mongodb/mongodb-enterprise-ops-manager
219231
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
220232
value: quay.io/mongodb/mongodb-enterprise-init-ops-manager
221233
- name: INIT_OPS_MANAGER_VERSION
222-
value: 1.0.1
234+
value: 1.0.2
235+
# AppDB
236+
- name: APPDB_IMAGE_REPOSITORY
237+
value: quay.io/mongodb/mongodb-enterprise-appdb
223238
- name: INIT_APPDB_IMAGE_REPOSITORY
224239
value: quay.io/mongodb/mongodb-enterprise-init-appdb
225240
- name: INIT_APPDB_VERSION
226241
value: 1.0.3
227242
- name: OPS_MANAGER_IMAGE_PULL_POLICY
228243
value: Always
229-
- name: APPDB_IMAGE_REPOSITORY
230-
value: quay.io/mongodb/mongodb-enterprise-appdb

0 commit comments

Comments
 (0)