Skip to content

Commit 8c87ad6

Browse files
author
Rodrigo Valin
committed
f9d72422f0d0712db2c51ef569cf2d45e9b686f7: update public repo contents
1 parent 0b8d206 commit 8c87ad6

File tree

9 files changed

+34
-31
lines changed

9 files changed

+34
-31
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This Operator requires Ops Manager or Cloud Manager. In this document, when we r
3030

3131

3232

33-
## Installation install ##
33+
## Installation ##
3434

3535
This operator can also be installed using yaml files, in case you are not using Helm. You may apply the config directly from github clone this repo, and apply the file
3636

@@ -119,4 +119,4 @@ A MongoDB object in Kubernetes can be a MongoDBStandalone, a MongoDBReplicaSet o
119119

120120
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.
121121

122-
kubectl apply -f samples/minimal/replica-set.yaml
122+
kubectl apply -f samples/minimal/replicaset.yaml

helm_chart/templates/operator.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,31 @@
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
5-
name: {{ .Values.name }}
5+
name: {{ .Values.operator.name }}
66
namespace: {{ .Values.namespace }}
77
spec:
88
replicas: 1
99
selector:
1010
matchLabels:
11-
app: {{ .Values.name }}
11+
app: {{ .Values.operator.name }}
1212
template:
1313
metadata:
1414
labels:
15-
app: {{ .Values.name }}
15+
app: {{ .Values.operator.name }}
1616
spec:
17-
serviceAccountName: {{ .Values.name }}
17+
serviceAccountName: {{ .Values.operator.name }}
1818
containers:
19-
- name: {{ .Values.name }}
20-
image: {{ .Values.operator.image }}
19+
- name: {{ .Values.operator.name }}
20+
image: {{ .Values.registry.repository }}/mongodb-enterprise-operator:{{ .Values.operator.version }}
2121
imagePullPolicy: {{ .Values.operator.pullPolicy }}
2222
env:
2323
- name: OPERATOR_ENV
24-
value: {{ .Values.env }}
24+
value: {{ .Values.operator.env }}
2525
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
26-
value: {{ .Values.database.image }}
26+
value: {{ .Values.registry.repository }}/mongodb-enterprise-database:{{ .Values.operator.version }}
2727
- name: IMAGE_PULL_POLICY
28-
value: {{ .Values.database.pullPolicy }}
28+
value: {{ .Values.registry.pullPolicy }}
2929
- name: IMAGE_PULL_SECRETS
30-
value: {{ .Values.imagePullSecrets }}
30+
value: {{ .Values.registry.imagePullSecrets }}
31+
imagePullSecrets:
32+
- name: {{ .Values.registry.imagePullSecrets }}

helm_chart/templates/roles.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kind: ClusterRole
33
apiVersion: rbac.authorization.k8s.io/v1
44
metadata:
5-
name: {{ .Values.name }}
5+
name: {{ .Values.operator.name }}
66
rules:
77
- apiGroups:
88
- ""
@@ -42,13 +42,13 @@ rules:
4242
kind: ClusterRoleBinding
4343
apiVersion: rbac.authorization.k8s.io/v1
4444
metadata:
45-
name: {{ .Values.name }}
45+
name: {{ .Values.operator.name }}
4646
namespace: {{ .Values.namespace }}
4747
roleRef:
4848
apiGroup: rbac.authorization.k8s.io
4949
kind: ClusterRole
50-
name: {{ .Values.name }}
50+
name: {{ .Values.operator.name }}
5151
subjects:
5252
- kind: ServiceAccount
53-
name: {{ .Values.name }}
53+
name: {{ .Values.operator.name }}
5454
namespace: {{ .Values.namespace }}

helm_chart/templates/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
apiVersion: v1
33
kind: ServiceAccount
44
metadata:
5-
name: {{ .Values.name }}
5+
name: {{ .Values.operator.name }}
66
namespace: {{ .Values.namespace }}

helm_chart/values.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
namespace: mongodb
2-
name: mongodb-enterprise-operator
3-
4-
env: dev
5-
operator:
6-
image: quay.io/mongodb/mongodb-enterprise-operator:0.1
7-
pullPolicy: Always
8-
database:
9-
image: quay.io/mongodb/mongodb-enterprise-database:0.1
10-
pullPolicy: Always
112
createNamespace: true
3+
registry:
4+
repository: quay.io/mongodb
5+
pullPolicy: Always
6+
imagePullSecrets:
7+
operator:
8+
name: mongodb-enterprise-operator
9+
version: 0.2
10+
env: dev

mongodb-enterprise.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,16 @@ spec:
8585
serviceAccountName: mongodb-enterprise-operator
8686
containers:
8787
- name: mongodb-enterprise-operator
88-
image: quay.io/mongodb/mongodb-enterprise-operator:0.1
88+
image: quay.io/mongodb/mongodb-enterprise-operator:0.2
8989
imagePullPolicy: Always
9090
env:
9191
- name: OPERATOR_ENV
9292
value: "local"
9393
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
94-
value: quay.io/mongodb/mongodb-enterprise-database:0.1
94+
value: quay.io/mongodb/mongodb-enterprise-database:0.2
9595
- name: IMAGE_PULL_POLICY
9696
value: Always
9797
- name: IMAGE_PULL_SECRETS
9898
value: ""
99+
imagePullSecrets:
100+
- name: ""

samples/minimal/replica-set.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ spec:
2222
# This flag allows the creation of pods without persistent volumes. This is for
2323
# testing only, and must not be used in production. 'false' will disable
2424
# Persistent Volume Claims. The default is 'true'
25-
persistent: true
25+
persistent: false

samples/minimal/sharded-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ spec:
2525
# This flag allows the creation of pods without persistent volumes. This is for
2626
# testing only, and must not be used in production. 'false' will disable
2727
# Persistent Volume Claims. The default is 'true'
28-
persistent: true
28+
persistent: false

samples/minimal/standalone.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ spec:
2121
# This flag allows the creation of pods without persistent volumes. This is for
2222
# testing only, and must not be used in production. 'false' will disable
2323
# Persistent Volume Claims. The default is 'true'
24-
persistent: true
24+
persistent: false

0 commit comments

Comments
 (0)