c1eb59bf9118a9663c14a56cd705c3e31f14a4c0: update public repo contents

mongodb · Jul 2, 2020 · 51dd2c7 · 51dd2c7
1 parent 068acc6
commit 51dd2c7
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 34 deletions.
diff --git a/crds.yaml b/crds.yaml
@@ -90,16 +90,6 @@ spec:
 
             additionalMongodConfig:
               type: object
-              properties:
-                net:
-                  type: object
-                  properties:
-                    ssl:
-                      type: object
-                      properties:
-                        mode:
-                          type: string
-                          enum: ["disabled", "allowSSL", "preferSSL", "requireSSL", "allowTLS", "preferTLS", "requireTLS"]
 
             exposedExternally:
               type: boolean
@@ -408,15 +398,33 @@ spec:
                             labelSelector:
                               type: object
             configServerCount:
+              minimum: 1
               type: integer
             mongodsPerShardCount:
+              minimum: 1
               type: integer
             mongosCount:
               minimum: 1
               type: integer
             shardCount:
               minimum: 1
               type: integer
+            mongos:
+              type: object
+              properties:
+                additionalMongodConfig:
+                  type: object
+            configSrv:
+              type: object
+              properties:
+                additionalMongodConfig:
+                  type: object
+            shard:
+              type: object
+              properties:
+                additionalMongodConfig:
+                  type: object
+
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -832,7 +840,6 @@ spec:
           required:
             - version
             - applicationDatabase
-
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1

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.5.4
+version: 1.5.5
 kubeVersion: '>=1.13'
 keywords:
 - mongodb

diff --git a/helm_chart/crds/mongodb.mongodb.com.yaml b/helm_chart/crds/mongodb.mongodb.com.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -89,16 +90,6 @@ spec:
 
             additionalMongodConfig:
               type: object
-              properties:
-                net:
-                  type: object
-                  properties:
-                    ssl:
-                      type: object
-                      properties:
-                        mode:
-                          type: string
-                          enum: ["disabled", "allowSSL", "preferSSL", "requireSSL", "allowTLS", "preferTLS", "requireTLS"]
 
             exposedExternally:
               type: boolean
@@ -407,12 +398,30 @@ spec:
                             labelSelector:
                               type: object
             configServerCount:
+              minimum: 1
               type: integer
             mongodsPerShardCount:
+              minimum: 1
               type: integer
             mongosCount:
               minimum: 1
               type: integer
             shardCount:
               minimum: 1
               type: integer
+            mongos:
+              type: object
+              properties:
+                additionalMongodConfig:
+                  type: object
+            configSrv:
+              type: object
+              properties:
+                additionalMongodConfig:
+                  type: object
+            shard:
+              type: object
+              properties:
+                additionalMongodConfig:
+                  type: object
+
diff --git a/helm_chart/crds/mongodbusers.mongodb.com.yaml b/helm_chart/crds/mongodbusers.mongodb.com.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/helm_chart/crds/opsmanagers.mongodb.com.yaml b/helm_chart/crds/opsmanagers.mongodb.com.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/helm_chart/crds/webhook-cluster-role.yaml b/helm_chart/crds/webhook-cluster-role.yaml
@@ -1,3 +1,4 @@
+---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/helm_chart/templates/database-roles.yaml b/helm_chart/templates/database-roles.yaml
@@ -8,6 +8,10 @@ metadata:
   {{- else }}
   namespace: {{ .Values.namespace }}
   {{- end }}
+{{- if .Values.registry.imagePullSecrets}}
+imagePullSecrets:
+  - name: {{ .Values.registry.imagePullSecrets }}
+{{- end }}
 
 ---
 apiVersion: v1
@@ -19,6 +23,10 @@ metadata:
   {{- else }}
   namespace: {{ .Values.namespace }}
   {{- end }}
+{{- if .Values.registry.imagePullSecrets}}
+imagePullSecrets:
+  - name: {{ .Values.registry.imagePullSecrets }}
+{{- end }}
 
 ---
 apiVersion: v1
@@ -30,6 +38,10 @@ metadata:
   {{- else }}
   namespace: {{ .Values.namespace }}
   {{- end }}
+{{- if .Values.registry.imagePullSecrets}}
+imagePullSecrets:
+  - name: {{ .Values.registry.imagePullSecrets }}
+{{- end }}
 
 ---
 kind: Role

diff --git a/helm_chart/templates/operator-roles.yaml b/helm_chart/templates/operator-roles.yaml
@@ -6,6 +6,10 @@ metadata:
   {{- if .Values.namespace }}
   namespace: {{ .Values.namespace }}
   {{- end }}
+{{- if .Values.registry.imagePullSecrets}}
+imagePullSecrets:
+  - name: {{ .Values.registry.imagePullSecrets }}
+{{- end }}
 
 
 ---

diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml
@@ -1,6 +1,3 @@
-# Create the CustomerResourceDefinition for MongoDB custom types.
-createCrds: true
-
 # Name of the Namespace to use
 namespace: mongodb
 
@@ -18,7 +15,7 @@ operator:
   deployment_name: mongodb-enterprise-operator
 
   # Version of mongodb-enterprise-operator and mongodb-enterprise-database images
-  version: 1.5.4
+  version: 1.5.5
 
   # The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
   watchedResources:

diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml
@@ -1,6 +1,3 @@
-# Create the CustomerResourceDefinition for MongoDB custom types.
-createCrds: true
-
 # Name of the Namespace to use
 namespace: mongodb
 
@@ -19,7 +16,7 @@ operator:
   deployment_name: mongodb-enterprise-operator
 
   # Version of mongodb-enterprise-operator and mongodb-enterprise-database images
-  version: 1.5.4
+  version: 1.5.5
 
   # The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
   watchedResources:

diff --git a/mongodb-enterprise-openshift.yaml b/mongodb-enterprise-openshift.yaml
@@ -188,7 +188,7 @@ spec:
       serviceAccountName: enterprise-operator
       containers:
       - name: mongodb-enterprise-operator
-        image: registry.connect.redhat.com/mongodb/enterprise-operator:1.5.4
+        image: registry.connect.redhat.com/mongodb/enterprise-operator:1.5.5
         imagePullPolicy: Always
         args:
           - "-watch-resource=mongodb"
@@ -210,7 +210,7 @@ spec:
         - name: MANAGED_SECURITY_CONTEXT
           value: 'true'
         - name: MONGODB_ENTERPRISE_DATABASE_IMAGE
-          value: registry.connect.redhat.com/mongodb/enterprise-database:1.5.4
+          value: registry.connect.redhat.com/mongodb/enterprise-database:1.5.5
         - name: IMAGE_PULL_POLICY
           value: Always
         - name: OPS_MANAGER_IMAGE_REPOSITORY

diff --git a/mongodb-enterprise.yaml b/mongodb-enterprise.yaml
@@ -191,7 +191,7 @@ spec:
         runAsUser: 2000
       containers:
       - name: mongodb-enterprise-operator
-        image: quay.io/mongodb/mongodb-enterprise-operator:1.5.4
+        image: quay.io/mongodb/mongodb-enterprise-operator:1.5.5
         imagePullPolicy: Always
         args:
           - "-watch-resource=mongodb"
@@ -211,7 +211,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: MONGODB_ENTERPRISE_DATABASE_IMAGE
-          value: quay.io/mongodb/mongodb-enterprise-database:1.5.4
+          value: quay.io/mongodb/mongodb-enterprise-database:1.5.5
         - name: IMAGE_PULL_POLICY
           value: Always
         - name: OPS_MANAGER_IMAGE_REPOSITORY

diff --git a/samples/mongodb/mongodb-options/replica-set-mongod-options.yaml b/samples/mongodb/mongodb-options/replica-set-mongod-options.yaml
@@ -0,0 +1,20 @@
+apiVersion: mongodb.com/v1
+kind: MongoDB
+metadata:
+  name: my-replica-set-options
+spec:
+  members: 3
+  version: 4.2.8-ent
+  type: ReplicaSet
+  opsManager:
+    configMapRef:
+      name: my-project
+  credentials: my-credentials
+  persistent: true
+  # optional. Allows to pass custom MongoDB process configuration
+  additionalMongodConfig:
+    systemLog:
+      logAppend: true
+      verbosity: 4
+    operationProfiling:
+      mode: slowOp
diff --git a/samples/mongodb/mongodb-options/sharded-cluster-mongod-options.yaml b/samples/mongodb/mongodb-options/sharded-cluster-mongod-options.yaml
@@ -0,0 +1,33 @@
+apiVersion: mongodb.com/v1
+kind: MongoDB
+metadata:
+  name: my-sharded-cluster-options
+spec:
+  version: 4.2.8-ent
+  type: ShardedCluster
+  opsManager:
+    configMapRef:
+      name: my-project
+  credentials: my-credentials
+  persistent: true
+  shardCount: 2
+  mongodsPerShardCount: 3
+  mongosCount: 2
+  configServerCount: 1
+  mongos:
+    # optional. Allows to pass custom configuration for mongos processes
+    additionalMongodConfig:
+      systemLog:
+        logAppend: true
+        verbosity: 4
+  configSrv:
+    # optional. Allows to pass custom configuration for Config Server mongod processes
+    additionalMongodConfig:
+      operationProfiling:
+        mode: slowOp
+  shard:
+    additionalMongodConfig:
+    # optional. Allows to pass custom configuration for Shards mongod processes
+      storage:
+        journal:
+          commitIntervalMs: 50
diff --git a/samples/ops-manager/ops-manager.yaml b/samples/ops-manager/ops-manager.yaml
@@ -33,5 +33,9 @@ spec:
     # The bundled MongoDB binary will be used if omitted and no download from the Internet will happen
     version: 4.2.6-ent
     persistent: true
+    # optional. Allows to pass custom MongoDB process configuration
+    additionalMongodConfig:
+      operationProfiling:
+        mode: slowOp
     podSpec:
       cpu: '0.25'