Skip to content

Commit f31538c

Browse files
committed
20d3d37abc73a8e32b41354d47b00d8adc8e22ba: update public repo contents
1 parent 8dfe120 commit f31538c

File tree

11 files changed

+64
-33
lines changed

11 files changed

+64
-33
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ to see which Kubernetes and Openshift versions the Operator is compatible with
4040
To work with MongoDB resource this Operator requires [Ops Manager](https://docs.opsmanager.mongodb.com/current/) (Ops Manager can
4141
be installed into the same Kubernetes cluster by the Operator or installed outside of the cluster manually)
4242
or [Cloud Manager](https://cloud.mongodb.com/user#/cloud/login).
43-
> If this is your first time trying the Operator, Cloud Manager is easier to get started
43+
> If this is your first time trying the Operator, Cloud Manager is easier to get started. Log in, and create 'Cloud Manager' Organizations and Projects to use with the Operator.
4444
4545

4646
## Installation

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

helm_chart/templates/operator-roles.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,21 @@ rules:
2626
- apiGroups:
2727
- ""
2828
resources:
29-
- configmaps
30-
- secrets
3129
- services
3230
verbs:
3331
- get
3432
- list
33+
- watch
34+
- create
35+
- update
36+
- apiGroups:
37+
- ""
38+
resources:
39+
- secrets
40+
- configmaps
41+
verbs:
42+
- get
43+
- list
3544
- create
3645
- update
3746
- delete

helm_chart/templates/operator.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ spec:
1919
app.kubernetes.io/component: controller
2020
app.kubernetes.io/name: {{ .Values.operator.name }}
2121
app.kubernetes.io/instance: {{ .Values.operator.name }}
22-
annotations:
23-
# lets promethues know to scrape the operator pod and where to scrape them
24-
loadtest.io/scrape_port: "8080"
25-
loadtest.io/should_be_scraped: "true"
2622
spec:
2723
serviceAccountName: {{ .Values.operator.name }}
2824
{{- if not .Values.managedSecurityContext }}
@@ -48,10 +44,10 @@ spec:
4844
{{- end }}
4945
resources:
5046
limits:
51-
cpu: 300m
47+
cpu: 1100m
5248
memory: 1Gi
5349
requests:
54-
cpu: 200m
50+
cpu: 500m
5551
memory: 200Mi
5652
env:
5753
- name: OPERATOR_ENV
@@ -93,6 +89,8 @@ spec:
9389
# AppDB
9490
- name: APPDB_IMAGE_REPOSITORY
9591
value: {{ .Values.registry.appDb }}/{{ .Values.appDb.name }}
92+
- name: APPDB_AGENT_VERSION
93+
value: {{ .Values.appDb.version }}
9694
- name: INIT_APPDB_IMAGE_REPOSITORY
9795
value: {{ .Values.registry.initAppDb }}/{{ .Values.initAppDb.name }}
9896
- name: INIT_APPDB_VERSION

helm_chart/values-openshift.yaml

Lines changed: 4 additions & 3 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.9.0
18+
version: 1.9.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:
@@ -30,7 +30,7 @@ database:
3030

3131
initDatabase:
3232
name: mongodb-enterprise-init-database
33-
version: 1.0.1
33+
version: 1.0.2
3434

3535
## Ops Manager
3636
opsManager:
@@ -43,10 +43,11 @@ initOpsManager:
4343
## Application Database
4444
appDb:
4545
name: mongodb-enterprise-appdb
46+
version: 10.2.15.5958-1_4.2.11-ent
4647

4748
initAppDb:
4849
name: mongodb-enterprise-init-appdb
49-
version: 1.0.5
50+
version: 1.0.6
5051

5152
## Registry
5253
registry:

helm_chart/values.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ operator:
1818
deployment_name: mongodb-enterprise-operator
1919

2020
# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
21-
version: 1.9.0
21+
version: 1.9.1
2222

2323
# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
2424
watchedResources:
@@ -33,7 +33,7 @@ database:
3333

3434
initDatabase:
3535
name: mongodb-enterprise-init-database
36-
version: 1.0.1
36+
version: 1.0.2
3737

3838
## Ops Manager
3939
opsManager:
@@ -46,10 +46,11 @@ initOpsManager:
4646
## Application Database
4747
appDb:
4848
name: mongodb-enterprise-appdb
49+
version: 10.2.15.5958-1_4.2.11-ent
4950

5051
initAppDb:
5152
name: mongodb-enterprise-init-appdb
52-
version: 1.0.5
53+
version: 1.0.6
5354

5455
## Registry
5556
registry:

mongodb-enterprise-openshift.yaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,21 @@ rules:
6262
- apiGroups:
6363
- ""
6464
resources:
65-
- configmaps
66-
- secrets
6765
- services
6866
verbs:
6967
- get
7068
- list
69+
- watch
70+
- create
71+
- update
72+
- apiGroups:
73+
- ""
74+
resources:
75+
- secrets
76+
- configmaps
77+
verbs:
78+
- get
79+
- list
7180
- create
7281
- update
7382
- delete
@@ -206,7 +215,7 @@ spec:
206215
serviceAccountName: enterprise-operator
207216
containers:
208217
- name: mongodb-enterprise-operator
209-
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.9.0
218+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.9.1
210219
imagePullPolicy: Always
211220
args:
212221
- "-watch-resource=mongodb"
@@ -216,10 +225,10 @@ spec:
216225
- "/usr/local/bin/mongodb-enterprise-operator"
217226
resources:
218227
limits:
219-
cpu: 300m
228+
cpu: 1100m
220229
memory: 1Gi
221230
requests:
222-
cpu: 200m
231+
cpu: 500m
223232
memory: 200Mi
224233
env:
225234
- name: OPERATOR_ENV
@@ -242,7 +251,7 @@ spec:
242251
- name: INIT_DATABASE_IMAGE_REPOSITORY
243252
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
244253
- name: INIT_DATABASE_VERSION
245-
value: 1.0.1
254+
value: 1.0.2
246255
- name: DATABASE_VERSION
247256
value: 2.0.0
248257
# Ops Manager
@@ -255,9 +264,11 @@ spec:
255264
# AppDB
256265
- name: APPDB_IMAGE_REPOSITORY
257266
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb
267+
- name: APPDB_AGENT_VERSION
268+
value: 10.2.15.5958-1_4.2.11-ent
258269
- name: INIT_APPDB_IMAGE_REPOSITORY
259270
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb
260271
- name: INIT_APPDB_VERSION
261-
value: 1.0.5
272+
value: 1.0.6
262273
- name: OPS_MANAGER_IMAGE_PULL_POLICY
263274
value: Always

mongodb-enterprise.yaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,21 @@ rules:
6262
- apiGroups:
6363
- ""
6464
resources:
65-
- configmaps
66-
- secrets
6765
- services
6866
verbs:
6967
- get
7068
- list
69+
- watch
70+
- create
71+
- update
72+
- apiGroups:
73+
- ""
74+
resources:
75+
- secrets
76+
- configmaps
77+
verbs:
78+
- get
79+
- list
7180
- create
7281
- update
7382
- delete
@@ -209,7 +218,7 @@ spec:
209218
runAsUser: 2000
210219
containers:
211220
- name: mongodb-enterprise-operator
212-
image: quay.io/mongodb/mongodb-enterprise-operator:1.9.0
221+
image: quay.io/mongodb/mongodb-enterprise-operator:1.9.1
213222
imagePullPolicy: Always
214223
args:
215224
- "-watch-resource=mongodb"
@@ -219,10 +228,10 @@ spec:
219228
- "/usr/local/bin/mongodb-enterprise-operator"
220229
resources:
221230
limits:
222-
cpu: 300m
231+
cpu: 1100m
223232
memory: 1Gi
224233
requests:
225-
cpu: 200m
234+
cpu: 500m
226235
memory: 200Mi
227236
env:
228237
- name: OPERATOR_ENV
@@ -243,7 +252,7 @@ spec:
243252
- name: INIT_DATABASE_IMAGE_REPOSITORY
244253
value: quay.io/mongodb/mongodb-enterprise-init-database
245254
- name: INIT_DATABASE_VERSION
246-
value: 1.0.1
255+
value: 1.0.2
247256
- name: DATABASE_VERSION
248257
value: 2.0.0
249258
# Ops Manager
@@ -256,9 +265,11 @@ spec:
256265
# AppDB
257266
- name: APPDB_IMAGE_REPOSITORY
258267
value: quay.io/mongodb/mongodb-enterprise-appdb
268+
- name: APPDB_AGENT_VERSION
269+
value: 10.2.15.5958-1_4.2.11-ent
259270
- name: INIT_APPDB_IMAGE_REPOSITORY
260271
value: quay.io/mongodb/mongodb-enterprise-init-appdb
261272
- name: INIT_APPDB_VERSION
262-
value: 1.0.5
273+
value: 1.0.6
263274
- name: OPS_MANAGER_IMAGE_PULL_POLICY
264275
value: Always

samples/mongodb/pod-template/replica-set-pod-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: my-replica-set-pod-template
55
spec:
66
members: 3
7-
version: 4.2.2-ent
7+
version: 4.2.11-ent
88
type: ReplicaSet
99

1010
opsManager:

samples/mongodb/pod-template/standalone-pod-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: MongoDB
33
metadata:
44
name: my-standalone-pod-template
55
spec:
6-
version: 4.2.2-ent
6+
version: 4.2.11-ent
77
type: Standalone
88
opsManager:
99
configMapRef:

0 commit comments

Comments
 (0)