Skip to content

Commit 49c861e

Browse files
LouisPlissoLouisPlisso
committedSep 2, 2020
08449774a864f285d7c33ad25ef1e9b5cfa7ab94: update public repo contents
·
9.6.60.0.1-mcli
1 parent 5ed7b95 commit 49c861e

15 files changed

+129
-417
lines changed
 

‎crds.yaml

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ spec:
9393
exposedExternally:
9494
type: boolean
9595

96+
agent:
97+
type: object
98+
properties:
99+
startupOptions:
100+
type: object
101+
96102
# Generic PodSpec configuration
97103
podSpec:
98104
type: object
@@ -183,6 +189,8 @@ spec:
183189
type: string
184190
key:
185191
type: string
192+
automationLdapGroupDN:
193+
type: string
186194
required:
187195
- mode
188196
enabled:
@@ -515,16 +523,31 @@ spec:
515523
properties:
516524
additionalMongodConfig:
517525
type: object
526+
agent:
527+
type: object
528+
properties:
529+
startupOptions:
530+
type: object
518531
configSrv:
519532
type: object
520533
properties:
521534
additionalMongodConfig:
522535
type: object
536+
agent:
537+
type: object
538+
properties:
539+
startupOptions:
540+
type: object
523541
shard:
524542
type: object
525543
properties:
526544
additionalMongodConfig:
527545
type: object
546+
agent:
547+
type: object
548+
properties:
549+
startupOptions:
550+
type: object
528551
---
529552
apiVersion: apiextensions.k8s.io/v1beta1
530553
kind: CustomResourceDefinition
@@ -682,6 +705,8 @@ spec:
682705
properties:
683706
name:
684707
type: string
708+
ca:
709+
type: string
685710
required:
686711
- name
687712

@@ -786,30 +811,31 @@ spec:
786811
properties:
787812
name:
788813
type: string
789-
mongodbResourceRef:
790-
type: object
791-
properties:
792-
name:
793-
type: string
794-
required:
795-
- name
796-
mongodbUserRef:
797-
type: object
798-
properties:
799-
name:
800-
type: string
801-
required:
802-
- name
803-
pathStyleAccessEnabled:
804-
type: boolean
805-
s3BucketEndpoint:
806-
type: string
807-
s3BucketName:
808-
type: string
809-
s3SecretRef:
810-
type: object
811-
properties:
812-
name: string
814+
mongodbResourceRef:
815+
type: object
816+
properties:
817+
name:
818+
type: string
819+
required:
820+
- name
821+
mongodbUserRef:
822+
type: object
823+
properties:
824+
name:
825+
type: string
826+
required:
827+
- name
828+
pathStyleAccessEnabled:
829+
type: boolean
830+
s3BucketEndpoint:
831+
type: string
832+
s3BucketName:
833+
type: string
834+
s3SecretRef:
835+
type: object
836+
properties:
837+
name:
838+
type: string
813839
required:
814840
- name
815841
- pathStyleAccessEnabled
@@ -869,6 +895,13 @@ spec:
869895
properties:
870896
spec:
871897
type: object
898+
899+
agent:
900+
type: object
901+
properties:
902+
startupOptions:
903+
type: object
904+
872905
podSpec:
873906
type: object
874907
properties:

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

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ spec:
9393
exposedExternally:
9494
type: boolean
9595

96+
agent:
97+
type: object
98+
properties:
99+
startupOptions:
100+
type: object
101+
96102
# Generic PodSpec configuration
97103
podSpec:
98104
type: object
@@ -183,6 +189,8 @@ spec:
183189
type: string
184190
key:
185191
type: string
192+
automationLdapGroupDN:
193+
type: string
186194
required:
187195
- mode
188196
enabled:
@@ -515,13 +523,28 @@ spec:
515523
properties:
516524
additionalMongodConfig:
517525
type: object
526+
agent:
527+
type: object
528+
properties:
529+
startupOptions:
530+
type: object
518531
configSrv:
519532
type: object
520533
properties:
521534
additionalMongodConfig:
522535
type: object
536+
agent:
537+
type: object
538+
properties:
539+
startupOptions:
540+
type: object
523541
shard:
524542
type: object
525543
properties:
526544
additionalMongodConfig:
527545
type: object
546+
agent:
547+
type: object
548+
properties:
549+
startupOptions:
550+
type: object

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

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ spec:
7575
properties:
7676
name:
7777
type: string
78+
ca:
79+
type: string
7880
required:
7981
- name
8082

@@ -179,30 +181,31 @@ spec:
179181
properties:
180182
name:
181183
type: string
182-
mongodbResourceRef:
183-
type: object
184-
properties:
185-
name:
186-
type: string
187-
required:
188-
- name
189-
mongodbUserRef:
190-
type: object
191-
properties:
192-
name:
193-
type: string
194-
required:
195-
- name
196-
pathStyleAccessEnabled:
197-
type: boolean
198-
s3BucketEndpoint:
199-
type: string
200-
s3BucketName:
201-
type: string
202-
s3SecretRef:
203-
type: object
204-
properties:
205-
name: string
184+
mongodbResourceRef:
185+
type: object
186+
properties:
187+
name:
188+
type: string
189+
required:
190+
- name
191+
mongodbUserRef:
192+
type: object
193+
properties:
194+
name:
195+
type: string
196+
required:
197+
- name
198+
pathStyleAccessEnabled:
199+
type: boolean
200+
s3BucketEndpoint:
201+
type: string
202+
s3BucketName:
203+
type: string
204+
s3SecretRef:
205+
type: object
206+
properties:
207+
name:
208+
type: string
206209
required:
207210
- name
208211
- pathStyleAccessEnabled
@@ -262,6 +265,13 @@ spec:
262265
properties:
263266
spec:
264267
type: object
268+
269+
agent:
270+
type: object
271+
properties:
272+
startupOptions:
273+
type: object
274+
265275
podSpec:
266276
type: object
267277
properties:

‎helm_chart/values-openshift.yaml

Lines changed: 2 additions & 2 deletions
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.7.0
18+
version: 1.7.1
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:
@@ -38,7 +38,7 @@ appDb:
3838

3939
initAppDb:
4040
name: mongodb-enterprise-init-appdb
41-
version: 1.0.2
41+
version: 1.0.3
4242

4343
registry:
4444
# The pull secret must be specified

‎helm_chart/values.yaml

Lines changed: 2 additions & 2 deletions
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.7.0
19+
version: 1.7.1
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:
@@ -39,7 +39,7 @@ appDb:
3939

4040
initAppDb:
4141
name: mongodb-enterprise-init-appdb
42-
version: 1.0.2
42+
version: 1.0.3
4343

4444
registry:
4545
imagePullSecrets:

‎mongodb-enterprise-openshift.yaml

Lines changed: 3 additions & 3 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.7.0
191+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.7.1
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.7.0
213+
value: registry.connect.redhat.com/mongodb/enterprise-database:1.7.1
214214
- name: IMAGE_PULL_POLICY
215215
value: Always
216216
- name: OPS_MANAGER_IMAGE_REPOSITORY
@@ -222,7 +222,7 @@ spec:
222222
- name: INIT_APPDB_IMAGE_REPOSITORY
223223
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb
224224
- name: INIT_APPDB_VERSION
225-
value: 1.0.2
225+
value: 1.0.3
226226
- name: OPS_MANAGER_IMAGE_PULL_POLICY
227227
value: Always
228228
- name: APPDB_IMAGE_REPOSITORY

‎mongodb-enterprise.yaml

Lines changed: 3 additions & 3 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.7.0
194+
image: quay.io/mongodb/mongodb-enterprise-operator:1.7.1
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.7.0
214+
value: quay.io/mongodb/mongodb-enterprise-database:1.7.1
215215
- name: IMAGE_PULL_POLICY
216216
value: Always
217217
- name: OPS_MANAGER_IMAGE_REPOSITORY
@@ -223,7 +223,7 @@ spec:
223223
- name: INIT_APPDB_IMAGE_REPOSITORY
224224
value: quay.io/mongodb/mongodb-enterprise-init-appdb
225225
- name: INIT_APPDB_VERSION
226-
value: 1.0.2
226+
value: 1.0.3
227227
- name: OPS_MANAGER_IMAGE_PULL_POLICY
228228
value: Always
229229
- name: APPDB_IMAGE_REPOSITORY

‎samples/kubernetes-clients/README.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎samples/kubernetes-clients/python/README.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎samples/kubernetes-clients/python/mongodb_kube_client.py

Lines changed: 0 additions & 246 deletions
This file was deleted.

‎samples/kubernetes-clients/python/mongodb_kube_operator.cfg

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎samples/kubernetes-clients/python/requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎samples/kubernetes-clients/python/test_mongodb_kube_client.py

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎support/mdb_operator_diagnostic_data.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -Eeou pipefail
4+
35
#
46
# mdb_operator_diagnostic_data.sh
57
#
@@ -68,7 +70,7 @@ if [ ${private_mode} == 0 ]; then
6870
fi
6971

7072
echo "++ Versions"
71-
mdb_operator_pod=$(kubectl -n "${namespace}" get pods -l "app=${operator_name}" -o name | cut -d'/' -f 2)
73+
mdb_operator_pod=$(kubectl -n "${namespace}" get pods -l "controller=${operator_name}" -o name | cut -d'/' -f 2)
7274
echo "+ Operator Pod: pod/${mdb_operator_pod}"
7375

7476
mdb_operator_filename="operator.yaml"
@@ -178,7 +180,7 @@ echo "+ Certificates (no private keys are captured)"
178180
csr_filename="csr.text"
179181
kubectl get csr | grep "${namespace}"
180182
echo "+ Saving Certificate state into ${csr_filename}"
181-
kubectl describe "$(kubectl get csr -o name | grep ${namespace})"
183+
kubectl describe "$(kubectl get csr -o name | grep "${namespace}")"
182184

183185
echo "++ MongoDBUser Resource Status"
184186
mdbusers_filename="mdbu.yaml"

0 commit comments

Comments
 (0)
Please sign in to comment.