20d3d37abc73a8e32b41354d47b00d8adc8e22ba: update public repo contents

mongodb · Jan 15, 2021 · f31538c · f31538c
1 parent 8dfe120
commit f31538c
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ to see which Kubernetes and Openshift versions the Operator is compatible with
 To work with MongoDB resource this Operator requires [Ops Manager](https://docs.opsmanager.mongodb.com/current/) (Ops Manager can
 be installed into the same Kubernetes cluster by the Operator or installed outside of the cluster manually)
 or [Cloud Manager](https://cloud.mongodb.com/user#/cloud/login).
-> If this is your first time trying the Operator, Cloud Manager is easier to get started
+> 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.
 
 
 ## Installation

diff --git a/helm_chart/Chart.yaml b/helm_chart/Chart.yaml
@@ -1,6 +1,6 @@
 name: mongodb-enterprise-operator
 description: MongoDB Kubernetes Enterprise Operator
-version: 1.9.0
+version: 1.9.1
 kubeVersion: '>=1.13-0'
 keywords:
 - mongodb

diff --git a/helm_chart/templates/operator-roles.yaml b/helm_chart/templates/operator-roles.yaml
@@ -26,12 +26,21 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - configmaps
-  - secrets
   - services
   verbs:
   - get
   - list
+  - watch
+  - create
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  - configmaps
+  verbs:
+  - get
+  - list
   - create
   - update
   - delete

diff --git a/helm_chart/templates/operator.yaml b/helm_chart/templates/operator.yaml
@@ -19,10 +19,6 @@ spec:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: {{ .Values.operator.name }}
         app.kubernetes.io/instance: {{ .Values.operator.name }}
-      annotations:
-        # lets promethues know to scrape the operator pod and where to scrape them
-        loadtest.io/scrape_port: "8080"
-        loadtest.io/should_be_scraped: "true"
     spec:
       serviceAccountName: {{ .Values.operator.name }}
 {{- if not .Values.managedSecurityContext }}
@@ -48,10 +44,10 @@ spec:
         {{- end }}
         resources:
           limits:
-            cpu: 300m
+            cpu: 1100m
             memory: 1Gi
           requests:
-            cpu: 200m
+            cpu: 500m
             memory: 200Mi
         env:
         - name: OPERATOR_ENV
@@ -93,6 +89,8 @@ spec:
         # AppDB
         - name: APPDB_IMAGE_REPOSITORY
           value: {{ .Values.registry.appDb }}/{{ .Values.appDb.name }}
+        - name: APPDB_AGENT_VERSION
+          value: {{ .Values.appDb.version }}
         - name: INIT_APPDB_IMAGE_REPOSITORY
           value: {{ .Values.registry.initAppDb }}/{{ .Values.initAppDb.name }}
         - name: INIT_APPDB_VERSION

diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml
@@ -15,7 +15,7 @@ operator:
   deployment_name: mongodb-enterprise-operator
 
   # Version of mongodb-enterprise-operator and mongodb-enterprise-database images
-  version: 1.9.0
+  version: 1.9.1
 
   # The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
   watchedResources:
@@ -30,7 +30,7 @@ database:
 
 initDatabase:
   name: mongodb-enterprise-init-database
-  version: 1.0.1
+  version: 1.0.2
 
 ## Ops Manager
 opsManager:
@@ -43,10 +43,11 @@ initOpsManager:
 ## Application Database
 appDb:
   name: mongodb-enterprise-appdb
+  version: 10.2.15.5958-1_4.2.11-ent
 
 initAppDb:
   name: mongodb-enterprise-init-appdb
-  version: 1.0.5
+  version: 1.0.6
 
 ## Registry
 registry:

diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml
@@ -18,7 +18,7 @@ operator:
   deployment_name: mongodb-enterprise-operator
 
   # Version of mongodb-enterprise-operator and mongodb-enterprise-database images
-  version: 1.9.0
+  version: 1.9.1
 
   # The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
   watchedResources:
@@ -33,7 +33,7 @@ database:
 
 initDatabase:
   name: mongodb-enterprise-init-database
-  version: 1.0.1
+  version: 1.0.2
 
 ## Ops Manager
 opsManager:
@@ -46,10 +46,11 @@ initOpsManager:
 ## Application Database
 appDb:
   name: mongodb-enterprise-appdb
+  version: 10.2.15.5958-1_4.2.11-ent
 
 initAppDb:
   name: mongodb-enterprise-init-appdb
-  version: 1.0.5
+  version: 1.0.6
 
 ## Registry
 registry:

diff --git a/mongodb-enterprise-openshift.yaml b/mongodb-enterprise-openshift.yaml
@@ -62,12 +62,21 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - configmaps
-  - secrets
   - services
   verbs:
   - get
   - list
+  - watch
+  - create
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  - configmaps
+  verbs:
+  - get
+  - list
   - create
   - update
   - delete
@@ -206,7 +215,7 @@ spec:
       serviceAccountName: enterprise-operator
       containers:
       - name: mongodb-enterprise-operator
-        image: registry.connect.redhat.com/mongodb/enterprise-operator:1.9.0
+        image: registry.connect.redhat.com/mongodb/enterprise-operator:1.9.1
         imagePullPolicy: Always
         args:
           - "-watch-resource=mongodb"
@@ -216,10 +225,10 @@ spec:
           - "/usr/local/bin/mongodb-enterprise-operator"
         resources:
           limits:
-            cpu: 300m
+            cpu: 1100m
             memory: 1Gi
           requests:
-            cpu: 200m
+            cpu: 500m
             memory: 200Mi
         env:
         - name: OPERATOR_ENV
@@ -242,7 +251,7 @@ spec:
         - name: INIT_DATABASE_IMAGE_REPOSITORY
           value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
         - name: INIT_DATABASE_VERSION
-          value: 1.0.1
+          value: 1.0.2
         - name: DATABASE_VERSION
           value: 2.0.0
         # Ops Manager
@@ -255,9 +264,11 @@ spec:
         # AppDB
         - name: APPDB_IMAGE_REPOSITORY
           value: registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb
+        - name: APPDB_AGENT_VERSION
+          value: 10.2.15.5958-1_4.2.11-ent
         - name: INIT_APPDB_IMAGE_REPOSITORY
           value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb
         - name: INIT_APPDB_VERSION
-          value: 1.0.5
+          value: 1.0.6
         - name: OPS_MANAGER_IMAGE_PULL_POLICY
           value: Always
diff --git a/mongodb-enterprise.yaml b/mongodb-enterprise.yaml
@@ -62,12 +62,21 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - configmaps
-  - secrets
   - services
   verbs:
   - get
   - list
+  - watch
+  - create
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  - configmaps
+  verbs:
+  - get
+  - list
   - create
   - update
   - delete
@@ -209,7 +218,7 @@ spec:
         runAsUser: 2000
       containers:
       - name: mongodb-enterprise-operator
-        image: quay.io/mongodb/mongodb-enterprise-operator:1.9.0
+        image: quay.io/mongodb/mongodb-enterprise-operator:1.9.1
         imagePullPolicy: Always
         args:
           - "-watch-resource=mongodb"
@@ -219,10 +228,10 @@ spec:
           - "/usr/local/bin/mongodb-enterprise-operator"
         resources:
           limits:
-            cpu: 300m
+            cpu: 1100m
             memory: 1Gi
           requests:
-            cpu: 200m
+            cpu: 500m
             memory: 200Mi
         env:
         - name: OPERATOR_ENV
@@ -243,7 +252,7 @@ spec:
         - name: INIT_DATABASE_IMAGE_REPOSITORY
           value: quay.io/mongodb/mongodb-enterprise-init-database
         - name: INIT_DATABASE_VERSION
-          value: 1.0.1
+          value: 1.0.2
         - name: DATABASE_VERSION
           value: 2.0.0
         # Ops Manager
@@ -256,9 +265,11 @@ spec:
         # AppDB
         - name: APPDB_IMAGE_REPOSITORY
           value: quay.io/mongodb/mongodb-enterprise-appdb
+        - name: APPDB_AGENT_VERSION
+          value: 10.2.15.5958-1_4.2.11-ent
         - name: INIT_APPDB_IMAGE_REPOSITORY
           value: quay.io/mongodb/mongodb-enterprise-init-appdb
         - name: INIT_APPDB_VERSION
-          value: 1.0.5
+          value: 1.0.6
         - name: OPS_MANAGER_IMAGE_PULL_POLICY
           value: Always
diff --git a/samples/mongodb/pod-template/replica-set-pod-template.yaml b/samples/mongodb/pod-template/replica-set-pod-template.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-replica-set-pod-template
 spec:
   members: 3
-  version: 4.2.2-ent
+  version: 4.2.11-ent
   type: ReplicaSet
 
   opsManager:

diff --git a/samples/mongodb/pod-template/standalone-pod-template.yaml b/samples/mongodb/pod-template/standalone-pod-template.yaml
@@ -3,7 +3,7 @@ kind: MongoDB
 metadata:
   name: my-standalone-pod-template
 spec:
-  version: 4.2.2-ent
+  version: 4.2.11-ent
   type: Standalone
   opsManager:
     configMapRef:

diff --git a/samples/ops-manager/ops-manager-scram.yaml b/samples/ops-manager/ops-manager-scram.yaml
@@ -14,7 +14,7 @@ spec:
     members: 3
     # it's possible to omit 'version' completely - the bundled MongoDB binary will be used in this case
     # and no MongoDB binary will be downloaded from the Internet
-    # version: 4.2.2-ent
+    # version: 4.2.11-ent
     persistent: true
     podSpec:
       cpu: '0.25'