Skip to content

Commit 71f9777

Browse files
author
Anton Lisovenko
committed
94bc858d0c169b728da9c969b3f42e3616797265: update public repo contents
1 parent 6105d02 commit 71f9777

File tree

6 files changed

+20
-113
lines changed

6 files changed

+20
-113
lines changed

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ If you have installed the Helm client locally then you can run (note that `helm
7474
helm template public/helm_chart > operator.yaml
7575
kubectl apply -f operator.yaml
7676

77-
You can customize installation by simple overriding of helm variables, for example use `--set operator.env="dev"` to run the Operator in development mode
77+
You can customize installation by simple overriding of helm variables, for example use `--set operator.env="dev"` to run the Operator in development mode
78+
(this will turn logging level to `Debug` and will make logging output as non-json)
7879

7980
Check the end of the page for instructions on how to remove the Operator.
8081

@@ -135,19 +136,17 @@ If you have a correctly created Project with the name `my-project` and Credentia
135136
### Correct order of Operator/Namespace removal
136137

137138
It's important to keep correct order or removal operations. The simple rule is: **never remove Operator before mongodb resources**!
138-
The reason is that, starting from version `0.6`, the Operator adds a finalizer header to each mongodb resource, preventing
139-
them from removal until a controller removes this header. As the MongoDB Operator is the only controller that can do this,
140-
removing it before removing the mongodb resources is an error.
139+
The reason is that the Operator cleans state in Ops Manager on deletion of the MongoDB resource in Kubernetes.
141140

142-
These are the correct steps to clean up any MongoDB Operator resources:
141+
These are the correct steps to remove any MongoDB Operator resources:
143142

144143
```bash
145144
# these three operations must be called first!
146145
kubectl delete mst --all -n <namespace>
147146
kubectl delete mrs --all -n <namespace>
148147
kubectl delete msc --all -n <namespace>
149148

150-
# any of the following commands must be called removing all existing mongodb resources
149+
# any of the following commands must be called after removing all existing mongodb resources
151150
kubectl delete namespace <namespace>
152151
kubectl delete deployment mongodb-enterprise-operator -n <namespace>
153152
kubectl delete crd --all

helm_chart/Chart.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: mongodb-enterprise-operator
22
description: MongoDB Kubernetes Enterprise Operator
3-
version: 0.1
4-
kubeVersion: ">=1.9"
3+
version: '0.8'
4+
kubeVersion: '>=1.11'
55
keywords:
6-
- mongodb
7-
- database
8-
- nosql
6+
- mongodb
7+
- database
8+
- nosql
99
home: https://github.com/mongodb/mongodb-enterprise-kubernetes
1010
maintainers:
11-
- name: Cloud Team
11+
- name: Cloud Team

helm_chart/templates/roles.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
kind: Role
2+
kind: {{ if .Values.operator.watchNamespace }} {{ if (eq .Values.operator.watchNamespace "*") }} ClusterRole {{ else }} Role {{ end }} {{ else }} Role {{ end }}
33
apiVersion: rbac.authorization.k8s.io/v1
44
metadata:
55
name: {{ .Values.operator.name }}
@@ -33,7 +33,7 @@ rules:
3333
- "*"
3434

3535
---
36-
kind: RoleBinding
36+
kind: {{ if .Values.operator.watchNamespace }} {{ if (eq .Values.operator.watchNamespace "*") }} ClusterRoleBinding {{ else }} RoleBinding {{ end }} {{ else }} RoleBinding {{ end }}
3737
apiVersion: rbac.authorization.k8s.io/v1
3838
metadata:
3939
name: {{ .Values.operator.name }}
@@ -42,7 +42,7 @@ metadata:
4242
{{ end }}
4343
roleRef:
4444
apiGroup: rbac.authorization.k8s.io
45-
kind: Role
45+
kind: {{ if .Values.operator.watchNamespace }} {{ if (eq .Values.operator.watchNamespace "*") }} ClusterRole {{ else }} Role {{ end }} {{ else }} Role {{ end }}
4646
name: {{ .Values.operator.name }}
4747
subjects:
4848
- kind: ServiceAccount

helm_chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ operator:
1616
name: mongodb-enterprise-operator
1717

1818
# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
19-
version: '0.7'
19+
version: '0.8'
2020

2121
registry:
2222
# Specify if images are pulled from private repository

mongodb-enterprise-openshift.yaml

Lines changed: 0 additions & 92 deletions
This file was deleted.

mongodb-enterprise.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# Source: mongodb-enterprise-operator/templates/roles.yaml
33
---
4-
kind: Role
4+
kind: Role
55
apiVersion: rbac.authorization.k8s.io/v1
66
metadata:
77
name: mongodb-enterprise-operator
@@ -35,7 +35,7 @@ rules:
3535
- "*"
3636

3737
---
38-
kind: RoleBinding
38+
kind: RoleBinding
3939
apiVersion: rbac.authorization.k8s.io/v1
4040
metadata:
4141
name: mongodb-enterprise-operator
@@ -44,7 +44,7 @@ metadata:
4444

4545
roleRef:
4646
apiGroup: rbac.authorization.k8s.io
47-
kind: Role
47+
kind: Role
4848
name: mongodb-enterprise-operator
4949
subjects:
5050
- kind: ServiceAccount
@@ -85,7 +85,7 @@ spec:
8585
serviceAccountName: mongodb-enterprise-operator
8686
containers:
8787
- name: mongodb-enterprise-operator
88-
image: quay.io/mongodb/mongodb-enterprise-operator:0.7
88+
image: quay.io/mongodb/mongodb-enterprise-operator:0.8
8989
imagePullPolicy: Always
9090

9191
env:
@@ -99,7 +99,7 @@ spec:
9999

100100

101101
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
102-
value: quay.io/mongodb/mongodb-enterprise-database:0.7
102+
value: quay.io/mongodb/mongodb-enterprise-database:0.8
103103
- name: IMAGE_PULL_POLICY
104104
value: Always
105105

0 commit comments

Comments
 (0)