860c4d6a7b0759784a062cdd59faace755d11ebf: update public repo contents

Author: Anton Lisovenko

README.md

@@ -2,6 +2,8 @@
 
 Welcome to the MongoDB Enterprise Kubernetes Operator. The Operator enables easy deploys of MongoDB into Kubernetes clusters, using our management, monitoring and backup platforms, Ops Manager and Cloud Manager. By installing this integration, you will be able to deploy MongoDB instances with a single simple command.
 
+Also the Operator allows to deploy Ops Manager into Kubernetes. Note, that currently this feature is **alpha**. See more information below.
+
 You can discuss this integration in our [Slack](https://community-slack.mongodb.com) - join the [#enterprise-kubernetes](https://mongo-db.slack.com/messages/CB323LCG5/) channel.
 
 ## Documentation ##
@@ -77,7 +79,11 @@ You can customize installation by simple overriding of helm variables, for examp
 
 Check the end of the page for instructions on how to remove the Operator.
 
-## Adding Ops Manager Credentials ##
+## MongoDB object ##
+
+*This section describes how to create the MongoDB resource. Follow the next section on how to work with Ops Manager resource.* 
+
+### Adding Ops Manager Credentials ###
 
 For the Operator to work, you will need the following information:
 
@@ -131,7 +137,34 @@ If you have a correctly created Project with the name `my-project` and Credentia
 
     kubectl apply -f samples/minimal/replicaset.yaml
 
-### Correct order of Operator/Namespace removal
+## Ops Manager object (alpha) ##
+
+This section describes how to create the Ops Manager object in Kubernetes.
+
+*Disclaimer: this is an early release of Ops Manager - so it's not recommended to use it in production *
+
+### Create Admin Credentials Secret ###
+
+Before creating the Ops Manager object you need to prepare the information about the admin user which will be created automatically. You can use the following command to do it:
+
+```bash
+$ kubectl create secret generic ops-manager-admin-secret  --from-literal=Username="[email protected]" --from-literal=Password="Passw0rd."  --from-literal=FirstName="Jane" --from-literal=LastName="Doe" -n <namespace>
+```
+
+Note, that the secret is needed only during the initialization of the Ops Manager object - you can remove it or clean the password field after the Ops Manager object was created
+
+### Create Ops Manager object ###
+
+Use the file `samples/ops-manager/ops-manager.yaml`. Edit the fields and create the object in Kubernetes:
+
+```bash
+$ kubectl apply -f samples/ops-manager/ops-manager.yaml
+```
+
+Note, that it takes up to 10 minutes to initialize the Application Database and start Ops Manager.
+ 
+
+## Deleting the Operator ##
 
 It's important to keep correct order or removal operations. The simple rule is: **never remove Operator before mongodb resources**!
 The reason is that the Operator cleans state in Ops Manager on deletion of the MongoDB resource in Kubernetes.

crds.yaml

@@ -45,7 +45,7 @@ spec:
                 type: string
               version:
                 type: string
-                pattern: "^[0-9]+.[0-9]+.[0-9]+(-ent)?$"
+                pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
               logLevel:
                 type: string
                 enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
@@ -91,7 +91,7 @@ spec:
                 type: string
               version:
                 type: string
-                pattern: "^[0-9]+.[0-9]+.[0-9]+(-ent)?$"
+                pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
               logLevel:
                 type: string
                 enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
@@ -151,7 +151,7 @@ spec:
                 type: string
               version:
                 type: string
-                pattern: "^[0-9]+.[0-9]+.[0-9]+(-ent)?$"
+                pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
               logLevel:
                 type: string
                 enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
@@ -239,4 +239,73 @@ spec:
               - username
               - db
               - project
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: opsmanagers.mongodb.com
+spec:
+  group: mongodb.com
+  version: v1
+  scope: Namespaced
+  names:
+    kind: MongoDBOpsManager
+    plural: opsmanagers
+    shortNames:
+    - om
+    singular: opsmanager
+  additionalPrinterColumns:
+    - name: Version
+      type: string
+      description: The version of MongoDBOpsManager.
+      JSONPath: .spec.version
+    - name: Version (DB)
+      type: string
+      description: The version of Application Database  .
+      JSONPath: .spec.applicationDatabase.version
+    - name: State
+      type: string
+      description: The current state of the MongoDBOpsManager.
+      JSONPath: .status.opsManager.phase
+    - name: State (DB)
+      type: string
+      description: The current state of the MongoDBOpsManager Application Database.
+      JSONPath: .status.applicationDatabase.phase
+    - name: Age
+      type: date
+      description: The time since the MongoDBOpsManager resource was created.
+      JSONPath: .metadata.creationTimestamp
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          properties:
+            version:
+              type: string
+            applicationDatabase:
+              type: object
+              properties:
+                members:
+                  maximum: 50
+                  minimum: 3
+                  type: integer
+                version:
+                  type: string
+                  pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
+                logLevel:
+                  type: string
+                  enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
+                type:
+                  type: string
+                  enum: ["ReplicaSet"]
+                exposedExternally:
+                  type: boolean
+              required:
+                - version
+                - type
+                - members
+          required:
+            - version
+            - applicationDatabase
+
 

helm_chart/Chart.yaml

@@ -1,6 +1,6 @@
 name: mongodb-enterprise-operator
 description: MongoDB Kubernetes Enterprise Operator
-version: '1.1'
+version: '1.2'
 kubeVersion: '>=1.11'
 keywords:
 - mongodb

helm_chart/templates/crds.yaml

@@ -43,7 +43,7 @@ spec:
                 type: string
               version:
                 type: string
-                pattern: "^[0-9]+.[0-9]+.[0-9]+(-ent)?$"
+                pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
               logLevel:
                 type: string
                 enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
@@ -89,7 +89,7 @@ spec:
                 type: string
               version:
                 type: string
-                pattern: "^[0-9]+.[0-9]+.[0-9]+(-ent)?$"
+                pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
               logLevel:
                 type: string
                 enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
@@ -149,7 +149,7 @@ spec:
                 type: string
               version:
                 type: string
-                pattern: "^[0-9]+.[0-9]+.[0-9]+(-ent)?$"
+                pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
               logLevel:
                 type: string
                 enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
@@ -237,4 +237,73 @@ spec:
               - username
               - db
               - project
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: opsmanagers.mongodb.com
+spec:
+  group: mongodb.com
+  version: v1
+  scope: Namespaced
+  names:
+    kind: MongoDBOpsManager
+    plural: opsmanagers
+    shortNames:
+    - om
+    singular: opsmanager
+  additionalPrinterColumns:
+    - name: Version
+      type: string
+      description: The version of MongoDBOpsManager.
+      JSONPath: .spec.version
+    - name: Version (DB)
+      type: string
+      description: The version of Application Database  .
+      JSONPath: .spec.applicationDatabase.version
+    - name: State
+      type: string
+      description: The current state of the MongoDBOpsManager.
+      JSONPath: .status.opsManager.phase
+    - name: State (DB)
+      type: string
+      description: The current state of the MongoDBOpsManager Application Database.
+      JSONPath: .status.applicationDatabase.phase
+    - name: Age
+      type: date
+      description: The time since the MongoDBOpsManager resource was created.
+      JSONPath: .metadata.creationTimestamp
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          properties:
+            version:
+              type: string
+            applicationDatabase:
+              type: object
+              properties:
+                members:
+                  maximum: 50
+                  minimum: 3
+                  type: integer
+                version:
+                  type: string
+                  pattern: "^[0-9]+.[0-9]+.[0-9]+(-.+)?$"
+                logLevel:
+                  type: string
+                  enum: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
+                type:
+                  type: string
+                  enum: ["ReplicaSet"]
+                exposedExternally:
+                  type: boolean
+              required:
+                - version
+                - type
+                - members
+          required:
+            - version
+            - applicationDatabase
+
 {{end}}

helm_chart/templates/operator.yaml

@@ -42,6 +42,10 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
 {{ end }}
+        - name: CURRENT_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
 {{ if eq .Values.managedSecurityContext true }}
         - name: MANAGED_SECURITY_CONTEXT
           value: 'true'
@@ -50,6 +54,11 @@ spec:
           value: {{ .Values.registry.repository }}/{{ .Values.database.name }}:{{ .Values.operator.version }}
         - name: IMAGE_PULL_POLICY
           value: {{ .Values.registry.pullPolicy }}
+        - name: OPS_MANAGER_IMAGE_REPOSITORY
+          value: {{ .Values.registry.repository }}/{{ .Values.opsManager.name }}
+        - name: OPS_MANAGER_IMAGE_PULL_POLICY
+          value: {{ .Values.registry.pullPolicy }}
+
 {{ if .Values.registry.imagePullSecrets }}
         - name: IMAGE_PULL_SECRETS
           value: {{ .Values.registry.imagePullSecrets }}

helm_chart/templates/roles.yaml

@@ -37,6 +37,8 @@ rules:
   - mongodb
   - mongodb/finalizers
   - mongodbusers
+  - opsmanagers
+  - opsmanagers/finalizers
   verbs:
   - get
   - list

helm_chart/values.yaml

@@ -16,11 +16,14 @@ operator:
   name: mongodb-enterprise-operator
 
   # Version of mongodb-enterprise-operator and mongodb-enterprise-database images
-  version: '1.1'
+  version: '1.2'
 
 database:
   name: mongodb-enterprise-database
 
+opsManager:
+  name: mongodb-enterprise-ops-manager
+
 registry:
   # Specify if images are pulled from private repository
   imagePullSecrets:

mongodb-enterprise.yaml

@@ -39,6 +39,8 @@ rules:
   - mongodb
   - mongodb/finalizers
   - mongodbusers
+  - opsmanagers
+  - opsmanagers/finalizers
   verbs:
   - get
   - list
@@ -139,7 +141,7 @@ spec:
 
       containers:
       - name: mongodb-enterprise-operator
-        image: quay.io/mongodb/mongodb-enterprise-operator:1.1
+        image: quay.io/mongodb/mongodb-enterprise-operator:1.2
         imagePullPolicy: Always
 
         env:
@@ -151,11 +153,20 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
 
+        - name: CURRENT_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
 
         - name: MONGODB_ENTERPRISE_DATABASE_IMAGE
-          value: quay.io/mongodb/mongodb-enterprise-database:1.1
+          value: quay.io/mongodb/mongodb-enterprise-database:1.2
         - name: IMAGE_PULL_POLICY
           value: Always
+        - name: OPS_MANAGER_IMAGE_REPOSITORY
+          value: quay.io/mongodb/mongodb-enterprise-ops-manager
+        - name: OPS_MANAGER_IMAGE_PULL_POLICY
+          value: Always
+
 
 
 

samples/kubernetes-clients/python/__pycache__/mongodb_kube_client.cpython-36.pyc

@@ -9,7 +9,7 @@ metadata:
   name: my-replica-set
 spec:
   members: 3
-  version: 4.0.0
+  version: 4.0.10
   type: ReplicaSet
 
   project: my-project

samples/kubernetes-clients/python/__pycache__/test_mongodb_kube_client.cpython-27-PYTEST.pyc

@@ -0,0 +1,17 @@
+apiVersion: mongodb.com/v1
+kind: MongoDBOpsManager
+metadata:
+  name: ops-manager
+spec:
+  version: 4.2.0
+  adminCredentials: ops-manager-admin
+  configuration:
+    mms.fromEmailAddr: "[email protected]"
+
+  applicationDatabase:
+    members: 3
+    version: 4.2.0
+    persistent: true
+    type: ReplicaSet
+    podSpec:
+      cpu: '0.25'