Skip to content

Commit ee25212

Browse files
author
Rodrigo Valin
authored
Reverts 1.15 update. (#215)
1 parent 3c7d0de commit ee25212

File tree

3 files changed

+55
-99
lines changed

3 files changed

+55
-99
lines changed

‎crds.yaml

Lines changed: 23 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -581,25 +581,21 @@ spec:
581581
created already.
582582
type: string
583583
enabled:
584-
description: DEPRECATED please enable TLS by setting `security.certsSecretPrefix`
585-
or `security.tls.secretRef.prefix`. Enables TLS for this
586-
resource. This will make the operator try to mount a Secret
587-
with a defined name (<resource-name>-cert). This is only
588-
used when enabling TLS on a MongoDB resource, and not on
589-
the AppDB, where TLS is configured by setting `secretRef.Name`.
584+
description: Enables TLS for this resource. This will make
585+
the operator try to mount a Secret with a defined name (<resource-name>-cert).
586+
This is only used when enabling TLS on a MongoDB resource,
587+
and not on the AppDB, where TLS is configured by setting
588+
`secretRef.Name`.
590589
type: boolean
591590
secretRef:
592-
description: DEPRECATED please use security.certsSecretPrefix
593-
instead SecretRef points to a Secret object containing the
594-
certificates to use when enabling TLS.
591+
description: SecretRef points to a Secret object containing
592+
the certificates to use when enabling TLS.
595593
properties:
596594
name:
597-
description: DEPRECATED please use security.certsSecretPrefix
595+
description: DEPRECATED please use security.tls.secretRef.prefix
598596
instead
599597
type: string
600598
prefix:
601-
description: DEPRECATED please use security.certsSecretPrefix
602-
instead
603599
type: string
604600
type: object
605601
type: object
@@ -1153,25 +1149,21 @@ spec:
11531149
created already.
11541150
type: string
11551151
enabled:
1156-
description: DEPRECATED please enable TLS by setting `security.certsSecretPrefix`
1157-
or `security.tls.secretRef.prefix`. Enables TLS for this
1158-
resource. This will make the operator try to mount a Secret
1159-
with a defined name (<resource-name>-cert). This is only
1160-
used when enabling TLS on a MongoDB resource, and not on
1161-
the AppDB, where TLS is configured by setting `secretRef.Name`.
1152+
description: Enables TLS for this resource. This will make
1153+
the operator try to mount a Secret with a defined name (<resource-name>-cert).
1154+
This is only used when enabling TLS on a MongoDB resource,
1155+
and not on the AppDB, where TLS is configured by setting
1156+
`secretRef.Name`.
11621157
type: boolean
11631158
secretRef:
1164-
description: DEPRECATED please use security.certsSecretPrefix
1165-
instead SecretRef points to a Secret object containing the
1166-
certificates to use when enabling TLS.
1159+
description: SecretRef points to a Secret object containing
1160+
the certificates to use when enabling TLS.
11671161
properties:
11681162
name:
1169-
description: DEPRECATED please use security.certsSecretPrefix
1163+
description: DEPRECATED please use security.tls.secretRef.prefix
11701164
instead
11711165
type: string
11721166
prefix:
1173-
description: DEPRECATED please use security.certsSecretPrefix
1174-
instead
11751167
type: string
11761168
type: object
11771169
type: object
@@ -1575,29 +1567,6 @@ spec:
15751567
type: string
15761568
type: object
15771569
type: object
1578-
automationConfig:
1579-
description: AutomationConfigOverride holds any fields that will
1580-
be merged on top of the Automation Config that the operator
1581-
creates for the AppDB. Currently only the process.disabled field
1582-
is recognized.
1583-
properties:
1584-
processes:
1585-
items:
1586-
description: OverrideProcess contains fields that we can
1587-
override on the AutomationConfig processes.
1588-
properties:
1589-
disabled:
1590-
type: boolean
1591-
name:
1592-
type: string
1593-
required:
1594-
- disabled
1595-
- name
1596-
type: object
1597-
type: array
1598-
required:
1599-
- processes
1600-
type: object
16011570
cloudManager:
16021571
properties:
16031572
configMapRef:
@@ -1934,26 +1903,21 @@ spec:
19341903
the certificates created already.
19351904
type: string
19361905
enabled:
1937-
description: DEPRECATED please enable TLS by setting `security.certsSecretPrefix`
1938-
or `security.tls.secretRef.prefix`. Enables TLS for
1939-
this resource. This will make the operator try to mount
1940-
a Secret with a defined name (<resource-name>-cert).
1941-
This is only used when enabling TLS on a MongoDB resource,
1942-
and not on the AppDB, where TLS is configured by setting
1943-
`secretRef.Name`.
1906+
description: Enables TLS for this resource. This will
1907+
make the operator try to mount a Secret with a defined
1908+
name (<resource-name>-cert). This is only used when
1909+
enabling TLS on a MongoDB resource, and not on the AppDB,
1910+
where TLS is configured by setting `secretRef.Name`.
19441911
type: boolean
19451912
secretRef:
1946-
description: DEPRECATED please use security.certsSecretPrefix
1947-
instead SecretRef points to a Secret object containing
1913+
description: SecretRef points to a Secret object containing
19481914
the certificates to use when enabling TLS.
19491915
properties:
19501916
name:
1951-
description: DEPRECATED please use security.certsSecretPrefix
1917+
description: DEPRECATED please use security.tls.secretRef.prefix
19521918
instead
19531919
type: string
19541920
prefix:
1955-
description: DEPRECATED please use security.certsSecretPrefix
1956-
instead
19571921
type: string
19581922
type: object
19591923
type: object
@@ -2074,16 +2038,6 @@ spec:
20742038
- name
20752039
type: object
20762040
type: array
2077-
queryableBackupSecretRef:
2078-
description: QueryableBackupSecretRef references the secret which
2079-
contains the pem file which is used for queryable backup. This
2080-
will be mounted into the Ops Manager pod.
2081-
properties:
2082-
name:
2083-
type: string
2084-
required:
2085-
- name
2086-
type: object
20872041
s3OpLogStores:
20882042
description: S3OplogStoreConfigs describes the list of s3 oplog
20892043
store configs used for backup.

‎mongodb-enterprise-openshift.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
2-
# Source: enterprise-operator/templates/operator-roles.yaml
2+
# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:
66
name: mongodb-enterprise-operator
77
namespace: mongodb
88
---
9-
# Source: enterprise-operator/templates/operator-roles.yaml
9+
# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
1010
kind: ClusterRoleBinding
1111
apiVersion: rbac.authorization.k8s.io/v1
1212
metadata:
1313
name: mongodb-enterprise-operator-mongodb-webhook-binding
14+
namespace: mongodb
1415
roleRef:
1516
apiGroup: rbac.authorization.k8s.io
1617
kind: ClusterRole
@@ -20,7 +21,7 @@ subjects:
2021
name: mongodb-enterprise-operator
2122
namespace: mongodb
2223
---
23-
# Source: enterprise-operator/templates/operator-roles.yaml
24+
# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
2425
kind: Role
2526
apiVersion: rbac.authorization.k8s.io/v1
2627
metadata:
@@ -93,7 +94,7 @@ rules:
9394
# definitions. The validating webhooks are optional so this can be removed if
9495
# necessary.
9596
---
96-
# Source: enterprise-operator/templates/operator-roles.yaml
97+
# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
9798
kind: RoleBinding
9899
apiVersion: rbac.authorization.k8s.io/v1
99100
metadata:
@@ -108,28 +109,28 @@ subjects:
108109
name: mongodb-enterprise-operator
109110
namespace: mongodb
110111
---
111-
# Source: enterprise-operator/templates/database-roles.yaml
112+
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
112113
apiVersion: v1
113114
kind: ServiceAccount
114115
metadata:
115116
name: mongodb-enterprise-appdb
116117
namespace: mongodb
117118
---
118-
# Source: enterprise-operator/templates/database-roles.yaml
119+
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
119120
apiVersion: v1
120121
kind: ServiceAccount
121122
metadata:
122123
name: mongodb-enterprise-database-pods
123124
namespace: mongodb
124125
---
125-
# Source: enterprise-operator/templates/database-roles.yaml
126+
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
126127
apiVersion: v1
127128
kind: ServiceAccount
128129
metadata:
129130
name: mongodb-enterprise-ops-manager
130131
namespace: mongodb
131132
---
132-
# Source: enterprise-operator/templates/database-roles.yaml
133+
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
133134
kind: Role
134135
apiVersion: rbac.authorization.k8s.io/v1
135136
metadata:
@@ -151,7 +152,7 @@ rules:
151152
- delete
152153
- get
153154
---
154-
# Source: enterprise-operator/templates/database-roles.yaml
155+
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
155156
kind: RoleBinding
156157
apiVersion: rbac.authorization.k8s.io/v1
157158
metadata:
@@ -166,7 +167,7 @@ subjects:
166167
name: mongodb-enterprise-appdb
167168
namespace: mongodb
168169
---
169-
# Source: enterprise-operator/templates/operator.yaml
170+
# Source: mongodb-enterprise-operator/templates/operator.yaml
170171
apiVersion: apps/v1
171172
kind: Deployment
172173
metadata:
@@ -189,7 +190,7 @@ spec:
189190
serviceAccountName: mongodb-enterprise-operator
190191
containers:
191192
- name: mongodb-enterprise-operator
192-
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.15.0
193+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.14.0
193194
imagePullPolicy: Always
194195
args:
195196
- "-watch-resource=mongodb"
@@ -225,7 +226,7 @@ spec:
225226
- name: INIT_DATABASE_IMAGE_REPOSITORY
226227
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
227228
- name: INIT_DATABASE_VERSION
228-
value: 1.0.7
229+
value: 1.0.6
229230
- name: DATABASE_VERSION
230231
value: 2.0.2
231232
# Ops Manager
@@ -234,16 +235,16 @@ spec:
234235
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
235236
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager
236237
- name: INIT_OPS_MANAGER_VERSION
237-
value: 1.0.6
238+
value: 1.0.5
238239
# AppDB
239240
- name: INIT_APPDB_IMAGE_REPOSITORY
240241
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb
241242
- name: INIT_APPDB_VERSION
242-
value: 1.0.9
243+
value: 1.0.8
243244
- name: OPS_MANAGER_IMAGE_PULL_POLICY
244245
value: Always
245246
- name: AGENT_IMAGE
246-
value: "registry.connect.redhat.com/mongodb/mongodb-agent:11.0.11.7036-1"
247+
value: "registry.connect.redhat.com/mongodb/mongodb-agent:11.0.5.6963-1"
247248
- name: MONGODB_IMAGE
248249
value: mongodb-enterprise-appdb-database
249250
- name: MONGODB_REPO_URL

0 commit comments

Comments
 (0)