Skip to content

Commit caa5cdd

Browse files
author
Rodrigo Valin
committed
7e5eaac040da09631cadb3293c5bc5d8c0c57985: update public repo contents
1 parent 4df6ca7 commit caa5cdd

34 files changed

+351
-124
lines changed

‎README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ credentials. More information about the way to create them using Ops Manager UI
110110
* Username and Public API key. More information about the way to create them using Ops Manager UI can be found
111111
[here](https://docs.opsmanager.mongodb.com/current/tutorial/configure-public-api-access/#personal-api-keys-deprecated)
112112

113-
Note that you must whitelist the IP
114-
range of your Kubernetes cluster so that the Operator could make API requests to Ops Manager
113+
Note: that you must whitelist the Pod IP range of your Kubernetes cluster so that the Operator could make API requests to Ops Manager.
114+
You can get the Pod IP range of your kubernetes cluster by executing the command: ```kubectl cluster-info dump | grep -m 1 cluster-cidr```
115+
115116

116117
This is documented in greater detail in our [installation guide](https://docs.opsmanager.mongodb.com/current/tutorial/install-k8s-operator)
117118

@@ -147,7 +148,7 @@ For a user to be able to create or update objects in this Ops Manager Project th
147148
Programmatic API Key. These will be held by Kubernetes as a `Secret` object. You can create this Secret with the following command:
148149

149150
``` bash
150-
$ kubectl -n mongodb create secret generic my-credentials --from-literal="user=[email protected]" --from-literal="publicApiKey=my-public-api-key"
151+
$ kubectl -n mongodb create secret generic my-credentials --from-literal="user=my-public-api-key" --from-literal="publicApiKey=my-private-api-key"
151152
```
152153

153154
### Creating a MongoDB Resource ###
@@ -156,7 +157,7 @@ A MongoDB resource in Kubernetes is a MongoDB (short name `mdb`). We are going t
156157

157158
If you have a correctly created Project with the name `my-project` and Credentials stored in a secret called `my-credentials` then, after applying this file then everything should be running and a new Replica Set with 3 members should soon appear in Ops Manager UI.
158159

159-
kubectl apply -f samples/mongodb/minimal/replica-set.yaml
160+
kubectl apply -f samples/mongodb/minimal/replica-set.yaml -n mongodb
160161

161162
## MongoDBOpsManager Resource ##
162163

@@ -180,7 +181,7 @@ change the password using Ops Manager UI after the Ops Manager object was create
180181
Use the file `samples/ops-manager/ops-manager.yaml`. Edit the fields and create the object in Kubernetes:
181182

182183
```bash
183-
$ kubectl apply -f samples/ops-manager/ops-manager.yaml
184+
$ kubectl apply -f samples/ops-manager/ops-manager.yaml -n <namespace>
184185
```
185186

186187
Note, that it takes up to 8 minutes to initialize the Application Database and start Ops Manager.

‎crds.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,16 @@ spec:
114114
type: string
115115
cpu:
116116
type: string
117+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
117118
cpuRequests:
118119
type: string
120+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
119121
memory:
120122
type: string
123+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
121124
memoryRequests:
122125
type: string
126+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
123127
podAffinity:
124128
type: object
125129
nodeAffinity:
@@ -329,12 +333,16 @@ spec:
329333
type: string
330334
cpu:
331335
type: string
336+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
332337
cpuRequests:
333338
type: string
339+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
334340
memory:
335341
type: string
342+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
336343
memoryRequests:
337344
type: string
345+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
338346
podAffinity:
339347
type: object
340348
nodeAffinity:
@@ -395,12 +403,16 @@ spec:
395403
type: string
396404
cpu:
397405
type: string
406+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
398407
cpuRequests:
399408
type: string
409+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
400410
memory:
401411
type: string
412+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
402413
memoryRequests:
403414
type: string
415+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
404416
podAffinity:
405417
type: object
406418
nodeAffinity:
@@ -461,12 +473,16 @@ spec:
461473
type: string
462474
cpu:
463475
type: string
476+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
464477
cpuRequests:
465478
type: string
479+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
466480
memory:
467481
type: string
482+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
468483
memoryRequests:
469484
type: string
485+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
470486
podAffinity:
471487
type: object
472488
nodeAffinity:

‎helm_chart/Chart.yaml

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

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

+16
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,16 @@ spec:
114114
type: string
115115
cpu:
116116
type: string
117+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
117118
cpuRequests:
118119
type: string
120+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
119121
memory:
120122
type: string
123+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
121124
memoryRequests:
122125
type: string
126+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
123127
podAffinity:
124128
type: object
125129
nodeAffinity:
@@ -329,12 +333,16 @@ spec:
329333
type: string
330334
cpu:
331335
type: string
336+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
332337
cpuRequests:
333338
type: string
339+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
334340
memory:
335341
type: string
342+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
336343
memoryRequests:
337344
type: string
345+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
338346
podAffinity:
339347
type: object
340348
nodeAffinity:
@@ -395,12 +403,16 @@ spec:
395403
type: string
396404
cpu:
397405
type: string
406+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
398407
cpuRequests:
399408
type: string
409+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
400410
memory:
401411
type: string
412+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
402413
memoryRequests:
403414
type: string
415+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
404416
podAffinity:
405417
type: object
406418
nodeAffinity:
@@ -461,12 +473,16 @@ spec:
461473
type: string
462474
cpu:
463475
type: string
476+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
464477
cpuRequests:
465478
type: string
479+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
466480
memory:
467481
type: string
482+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
468483
memoryRequests:
469484
type: string
485+
description: "DEPRECATED. Please set this value using `spec.podTemplate` instead."
470486
podAffinity:
471487
type: object
472488
nodeAffinity:

‎helm_chart/templates/database-roles.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ rules:
6060
- secrets
6161
verbs:
6262
- get
63+
- apiGroups:
64+
- ""
65+
resources:
66+
- pods
67+
verbs:
68+
- patch
6369

6470
---
6571
kind: RoleBinding

‎helm_chart/templates/operator.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ 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"
2226
spec:
2327
serviceAccountName: {{ .Values.operator.name }}
2428
{{- if not .Values.managedSecurityContext }}
@@ -42,6 +46,13 @@ spec:
4246
command:
4347
- "/usr/local/bin/mongodb-enterprise-operator"
4448
{{- end }}
49+
resources:
50+
limits:
51+
cpu: 300m
52+
memory: 1Gi
53+
requests:
54+
cpu: 200m
55+
memory: 200Mi
4556
env:
4657
- name: OPERATOR_ENV
4758
value: {{ .Values.operator.env }}

‎helm_chart/values-openshift.yaml

+4-4
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.8.0
18+
version: 1.8.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,23 +30,23 @@ database:
3030

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

3535
## Ops Manager
3636
opsManager:
3737
name: mongodb-enterprise-ops-manager
3838

3939
initOpsManager:
4040
name: mongodb-enterprise-init-ops-manager
41-
version: 1.0.2
41+
version: 1.0.3
4242

4343
## Application Database
4444
appDb:
4545
name: mongodb-enterprise-appdb
4646

4747
initAppDb:
4848
name: mongodb-enterprise-init-appdb
49-
version: 1.0.4
49+
version: 1.0.5
5050

5151
## Registry
5252
registry:

‎helm_chart/values.yaml

+4-4
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.8.0
21+
version: 1.8.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,23 +33,23 @@ database:
3333

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

3838
## Ops Manager
3939
opsManager:
4040
name: mongodb-enterprise-ops-manager
4141

4242
initOpsManager:
4343
name: mongodb-enterprise-init-ops-manager
44-
version: 1.0.2
44+
version: 1.0.3
4545

4646
## Application Database
4747
appDb:
4848
name: mongodb-enterprise-appdb
4949

5050
initAppDb:
5151
name: mongodb-enterprise-init-appdb
52-
version: 1.0.4
52+
version: 1.0.5
5353

5454
## Registry
5555
registry:

‎mongodb-enterprise-openshift.yaml

+21-4
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ rules:
153153
- secrets
154154
verbs:
155155
- get
156+
- apiGroups:
157+
- ""
158+
resources:
159+
- pods
160+
verbs:
161+
- patch
156162
---
157163
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
158164
kind: RoleBinding
@@ -188,18 +194,29 @@ spec:
188194
app.kubernetes.io/component: controller
189195
app.kubernetes.io/name: enterprise-operator
190196
app.kubernetes.io/instance: enterprise-operator
197+
annotations:
198+
# lets promethues know to scrape the operator pod and where to scrape them
199+
loadtest.io/scrape_port: "8080"
200+
loadtest.io/should_be_scraped: "true"
191201
spec:
192202
serviceAccountName: enterprise-operator
193203
containers:
194204
- name: mongodb-enterprise-operator
195-
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.8.0
205+
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.8.1
196206
imagePullPolicy: Always
197207
args:
198208
- "-watch-resource=mongodb"
199209
- "-watch-resource=opsmanagers"
200210
- "-watch-resource=mongodbusers"
201211
command:
202212
- "/usr/local/bin/mongodb-enterprise-operator"
213+
resources:
214+
limits:
215+
cpu: 300m
216+
memory: 1Gi
217+
requests:
218+
cpu: 200m
219+
memory: 200Mi
203220
env:
204221
- name: OPERATOR_ENV
205222
value: prod
@@ -221,7 +238,7 @@ spec:
221238
- name: INIT_DATABASE_IMAGE_REPOSITORY
222239
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
223240
- name: INIT_DATABASE_VERSION
224-
value: 1.0.0
241+
value: 1.0.1
225242
- name: DATABASE_VERSION
226243
value: 2.0.0
227244
# Ops Manager
@@ -230,13 +247,13 @@ spec:
230247
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
231248
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager
232249
- name: INIT_OPS_MANAGER_VERSION
233-
value: 1.0.2
250+
value: 1.0.3
234251
# AppDB
235252
- name: APPDB_IMAGE_REPOSITORY
236253
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb
237254
- name: INIT_APPDB_IMAGE_REPOSITORY
238255
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb
239256
- name: INIT_APPDB_VERSION
240-
value: 1.0.4
257+
value: 1.0.5
241258
- name: OPS_MANAGER_IMAGE_PULL_POLICY
242259
value: Always

0 commit comments

Comments
 (0)