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 4eedf29

Browse files
committedFeb 15, 2021
Fix broken unit test
1 parent d681daf commit 4eedf29

7 files changed

+71
-74
lines changed
 

‎config/samples/arbitrary_statefulset_configuration/mongodb.com_v1_custom_volume_cr.yaml

+11-10
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ spec:
2222
scramCredentialsSecretName: my-scram
2323

2424
statefulSet:
25-
spec:
26-
template:
27-
spec:
28-
volumes:
25+
serviceName: example-openshift-mongodb-svc
26+
selector: {}
27+
template:
28+
spec:
29+
volumes:
30+
- name: custom-volume
31+
emptyDir: {}
32+
containers:
33+
- name: mongodb-agent
34+
volumeMounts:
2935
- name: custom-volume
30-
emptyDir: {}
31-
containers:
32-
- name: mongodb-agent
33-
volumeMounts:
34-
- name: custom-volume
35-
mountPath: /my-custom-version/mount-path
36+
mountPath: /my-custom-version/mount-path

‎config/samples/mongodb.com_v1_mongodbcommunity_openshift_cr.yaml

+13-12
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,19 @@ spec:
2222
db: admin
2323
scramCredentialsSecretName: my-scram
2424
statefulSet:
25-
spec:
26-
template:
27-
spec:
28-
containers:
29-
- name: "mongodb-agent"
30-
env:
31-
- name: MANAGED_SECURITY_CONTEXT
32-
value: "true"
33-
- name: "mongod"
34-
env:
35-
- name: MANAGED_SECURITY_CONTEXT
36-
value: "true"
25+
serviceName: example-openshift-mongodb-svc
26+
selector: {}
27+
template:
28+
spec:
29+
containers:
30+
- name: "mongodb-agent"
31+
env:
32+
- name: MANAGED_SECURITY_CONTEXT
33+
value: "true"
34+
- name: "mongod"
35+
env:
36+
- name: MANAGED_SECURITY_CONTEXT
37+
value: "true"
3738

3839
# the user credentials will be generated from this secret
3940
# once the credentials are generated, this secret is no longer required

‎controllers/testdata/change_data_volume.yaml

+8-9
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ spec:
2121
- name: userAdminAnyDatabase
2222
db: admin
2323
statefulSet:
24-
spec:
25-
volumeClaimTemplates:
26-
- metadata:
27-
name: data-volume
28-
spec:
29-
accessModes: [ "ReadWriteOnce", "ReadWriteMany" ]
30-
resources:
31-
requests:
32-
storage: 50Gi
24+
volumeClaimTemplates:
25+
- metadata:
26+
name: data-volume
27+
spec:
28+
accessModes: [ "ReadWriteOnce", "ReadWriteMany" ]
29+
resources:
30+
requests:
31+
storage: 50Gi

‎controllers/testdata/custom_storage_class.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ spec:
88
version: "4.2.6"
99
persistent: true
1010
statefulSet:
11-
spec:
12-
volumeClaimTemplates:
13-
- metadata:
14-
name: data-volume
15-
spec:
16-
accessModes: [ "ReadWriteOnce" ]
17-
storageClassName: "my-storage-class"
18-
resources:
19-
requests:
20-
storage: 1Gi
11+
volumeClaimTemplates:
12+
- metadata:
13+
name: data-volume
14+
spec:
15+
accessModes: [ "ReadWriteOnce" ]
16+
storageClassName: "my-storage-class"
17+
resources:
18+
requests:
19+
storage: 1Gi

‎controllers/testdata/openshift_mdb.yaml

+11-12
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ spec:
2020
- name: userAdminAnyDatabase
2121
db: admin
2222
statefulSet:
23-
spec:
24-
template:
25-
spec:
26-
containers:
27-
- name: "mongodb-agent"
28-
env:
29-
- name: MANAGED_SECURITY_CONTEXT
30-
value: "true"
31-
- name: "mongod"
32-
env:
33-
- name: MANAGED_SECURITY_CONTEXT
34-
value: "true"
23+
template:
24+
spec:
25+
containers:
26+
- name: "mongodb-agent"
27+
env:
28+
- name: MANAGED_SECURITY_CONTEXT
29+
value: "true"
30+
- name: "mongod"
31+
env:
32+
- name: MANAGED_SECURITY_CONTEXT
33+
value: "true"

‎controllers/testdata/tolerations_example.yaml

+11-12
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ spec:
88
version: "4.2.6"
99
persistent: true
1010
statefulSet:
11-
spec:
12-
template:
13-
spec:
14-
containers:
15-
- name: mongodb-agent
16-
tolerations:
17-
- key: "example-key"
18-
operator: "Exists"
19-
effect: "NoSchedule"
20-
- key: "example-key-2"
21-
operator: "Equal"
22-
effect: "NoExecute"
11+
template:
12+
spec:
13+
containers:
14+
- name: mongodb-agent
15+
tolerations:
16+
- key: "example-key"
17+
operator: "Exists"
18+
effect: "NoSchedule"
19+
- key: "example-key-2"
20+
operator: "Equal"
21+
effect: "NoExecute"

‎controllers/testdata/volume_claim_templates_mdb.yaml

+8-9
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ spec:
88
version: "4.2.6"
99
persistent: true
1010
statefulSet:
11-
spec:
12-
volumeClaimTemplates:
13-
- metadata:
14-
name: volume-claim-templates
15-
spec:
16-
accessModes: [ "ReadWriteOnce" ]
17-
resources:
18-
requests:
19-
storage: 1Gi
11+
volumeClaimTemplates:
12+
- metadata:
13+
name: volume-claim-templates
14+
spec:
15+
accessModes: [ "ReadWriteOnce" ]
16+
resources:
17+
requests:
18+
storage: 1Gi

0 commit comments

Comments
 (0)
Please sign in to comment.