added 1.9 version

Author: theburi

charts/ent-operator-database/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mongodb-enterprise-database
 description: MongoDB Kubernetes Enterprise Operator- MongoDB DataBase charts
-version: 0.1.4
+version: 0.2.0
 kubeVersion: '>=1.15-0'
 keywords:
 - mongodb
@@ -14,6 +14,6 @@ maintainers:
   email: [email protected]
 dependencies:
   - name: mongodb-enterprise-operator
-    version: "0.1.*"
+    version: "0.2.*"
     repository: "https://mongodb.github.io/helm-charts"
     condition: mongodb-enterprise-operator.enabled

charts/ent-operator-database/templates/database.yaml

@@ -11,7 +11,10 @@ spec:
 
   # Using a version >= 4.0 will enable SCRAM-SHA-256 authentication
   # setting a version < 4.0 will enable SCRAM-SHA-1/MONGODB-CR authentication
-  version: 4.0.4-ent
+  version: {{ .Values.version }}
+  persistent : true
+  backup:
+    enabled: {{ .Values.backup }}
 
   opsManager:
     configMapRef:
@@ -36,7 +39,7 @@ spec:
     {{- if .Values.security.tls.enabled }}
     tls:
       enabled: {{ .Values.security.tls.enabled }}
-      ca: {{  .Values.security.tls.ca }}
+      ca: {{  .Values.security.tls.caRef }}
     {{- end }}
 
       # Optional field - ignoreUnknownUsers
@@ -45,21 +48,26 @@ spec:
 
       # If you need to manage MongoDB users directly via the mongods, set this value to true
       ignoreUnknownUsers: false # default value false
-  podTemplate:
-    spec:
-      terminationGracePeriodSeconds: 10
-      topologySpreadConstraints:
-      - maxSkew: 1
-        topologyKey: zone
-        whenUnsatisfiable: DoNotSchedule
-        labelSelector:
-        matchLabels:
-          foo: bar
-        # This container will be added to each pod as a sidecar
-      containers:
-        resources:
-          {{- toYaml .Values.resources | nindent 10 }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+  podSpec:
+    podTemplate:
+      spec:
+        terminationGracePeriodSeconds: 10
+        topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: zone
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+          matchLabels:
+            foo: bar
+          # This container will be added to each pod as a sidecar
+        containers:
+          - name: mongodb-enterprise-database
+            resources:
+              {{- toYaml .Values.resources | nindent 14 }}
+        {{- with .Values.tolerations }}
+        tolerations:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
+
+    persistence:
+      {{- toYaml .Values.persistence | nindent 6 }}

charts/ent-operator-database/values.yaml

@@ -15,7 +15,10 @@ deployValidationWebhooks: true
 
 name: mdbreplset
 type: ReplicaSet
+version: 4.4.1-ent
 members: 3
+backup: false
+
 opsManager:
   # Ops Manager connection could be configured  with Values and This HELM chart will create
   # nesessary Secret and Config Map.
@@ -44,6 +47,27 @@ resources:
     memory: 1G
 tolerations: []
 
+agent:
+  startupOptions:
+    maxLogFiles: "30"
+    dialTimeoutSeconds: "40"
+
+persistence:
+  single:
+    storage: 10Gi
+#   storageClass: standard
+# multiple:
+#   data:
+#     storage: 10Gi
+#   journal:
+#     storage: 1Gi
+#     labelSelector:
+#       matchLabels:
+#         app: "my-app"
+#   logs:
+#     storage: 500M
+# storageClass: standard
+
 clusterName: cluster.local
 
 registry:

charts/ent-operator-opsmanager/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mongodb-enterprise-opsmanager
 description: MongoDB Kubernetes Enterprise Operator - Ops Manager Chart
-version: 0.1.2
+version: 0.2.0
 kubeVersion: '>=1.15-0'
 keywords:
 - opsManager
@@ -15,6 +15,6 @@ maintainers:
   email: [email protected]
 dependencies:
   - name: mongodb-enterprise-operator
-    version: "0.1.*"
+    version: "0.2.*"
     repository: "https://mongodb.github.io/helm-charts"
     condition: mongodb-enterprise-operator.enabled

charts/ent-operator-opsmanager/crds/mongodb.mongodb.com.yaml

@@ -99,6 +99,12 @@ spec:
                 startupOptions:
                   type: object
 
+            backup:
+              type: object
+              properties:
+                mode:
+                  type: string
+                  enum: ["enabled", "disabled", "terminated"]
             # Generic PodSpec configuration
             podSpec:
               type: object

charts/ent-operator-opsmanager/templates/ops-manager.yaml

@@ -16,24 +16,11 @@ spec:
 
   # For the full list of options see https://docs.opsmanager.mongodb.com/current/reference/configuration/index.html
   configuration:
-    # passing mms.ignoreInitialUiSetup=true allows to avoid the setup wizard in Ops Manager. Note, that
-    # this requires to set some mandatory configuration properties, see
-    # https://docs.opsmanager.mongodb.com/current/reference/configuration/index.html#mms.ignoreInitialUiSetup
-    mms.ignoreInitialUiSetup: "true"
-    automation.versions.source: {{ .Values.versionSource | quote }}
-    mms.adminEmailAddr: {{ .Values.mail.adminEmailAddr | quote }}
-    mms.fromEmailAddr: {{ .Values.mail.adminEmailAddr | quote }}
-    mms.replyToEmailAddr: {{ .Values.mail.adminEmailAddr | quote }}
-    mms.mail.hostname: {{ .Values.mail.hostname | quote }}
-    mms.mail.port: {{ .Values.mail.port | quote }}
-    mms.mail.ssl: {{ .Values.mail.ssl | quote }}
-    mms.mail.transport: {{ .Values.mail.transport | quote }}
-    mms.minimumTLSVersion: {{ .Values.minimumTLSVersion | quote }}
-    mms.publicApi.whitelistEnabled: {{ .Values.publicApi.whitelistEnabled | quote }}
+    {{- toYaml .Values.configuration | nindent 4 }}
 
   statefulSet:
     spec:
-      {{- if eq .Values.versionSource "local" }}
+      {{- if eq .Values.configuration.automation.versions.source "local" }}
       # the Persistent Volume Claim will be created for each Ops Manager Pod
       volumeClaimTemplates:
         - metadata:

charts/ent-operator-opsmanager/values.yaml

@@ -30,11 +30,33 @@ deployValidationWebhooks: true  # Optional configuration.
 # Deploy Ops Manager backup daemon and set it up.
 # Note: OpLogs DB needs to be provisioned separately
 deployBackupInfrastructure: true
-
-# for fully air-gapped environemnts choose "local"
-# to proxy mongodb installers download via Ops Manager choose "remote"
-versionSource: "mongodb"  # [ mongodb| local| remote ]
 installerVolumeSize: "20G"
+# Ops Manager configuration option. For a complete list of options please visit
+# https://docs.opsmanager.mongodb.com/current/reference/configuration
+configuration:
+  # for fully air-gapped environemnts choose "local"
+  # to proxy mongodb installers download via Ops Manager choose "remote"    
+  automation:
+    versions:
+      source: "mongodb"  # [ mongodb| local| remote ]
+  mms:
+    # passing mms.ignoreInitialUiSetup=true allows to avoid the setup wizard in Ops Manager. Note, that
+    # this requires to set some mandatory configuration properties, see
+    # https://docs.opsmanager.mongodb.com/current/reference/configuration/index.html#mms.ignoreInitialUiSetup
+    ignoreInitialUiSetup: "true"    
+    
+    adminEmailAddr: "[email protected]"
+    fromEmailAddr: "[email protected]"
+    
+    replyToEmailAddr: "[email protected]"
+    mail:
+      hostname: email-smtp.us-east-1.amazonaws.com"
+      port: "465"
+      ssl: "true"
+      transport: "smtp"
+    minimumTLSVersion: "TLSv1.2"
+    publicApi:
+      whitelistEnabled: "false"
 
 # Ops Manager Global Admin user name and password.
 # Ensure it complies with OpsManager password format
@@ -43,12 +65,6 @@ globalAdminPassword: "KubeTest!1"
 globalAdminFirstName: "First Name"
 globalAdminLastName: "Last Name"
 
-# enable Access Lists for Ops Manager
-publicApi:
-  whitelistEnabled: false
-
-
-minimumTLSVersion: "TLSv1.2"
 
 # This section is not managed by HELM Chart for now. OpLog DB should be provisioned as a Mongo DB CRD
 backup:
@@ -69,12 +85,7 @@ backup:
     pathStyleAccessEnabled: true
 
 # Required: SMTP Mail server set up for password recovery
-mail:
-  adminEmailAddr: "[email protected]"
-  hostname: "email-smtp.us-east-1.amazonaws.com"
-  port: "465"
-  ssl: "true"
-  transport: "smtp"
+
 resources:
   limits:
     cpu: 2

charts/ent-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mongodb-enterprise-operator
 description: MongoDB Kubernetes Enterprise Operator deployment
-version: 0.1.7
+version: 0.2.0
 kubeVersion: '>=1.15-0'
 keywords:
 - mongodb

charts/ent-operator/templates/operator-roles.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Release.Name }}-operator
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 {{- if .Values.registry.imagePullSecrets}}
 imagePullSecrets:
@@ -46,6 +46,14 @@ rules:
   - watch
   - delete
   - update
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
   {{- if eq (.Values.watchNamespace | default "") "*" }}
 - apiGroups:
   - ""
@@ -83,7 +91,7 @@ roleRef:
   name: {{ .Values.name }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Release.Name }}-operator
+  name: {{ .Release.Name }}
   {{- if .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
   {{- end }}
@@ -106,7 +114,7 @@ roleRef:
   name: {{ .Release.Name }}-{{ .Release.Namespace }}-webhook
 subjects:
 - kind: ServiceAccount
-  name: {{ .Release.Name }}-operator
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 
 ---
@@ -158,7 +166,7 @@ roleRef:
   name: {{ .Release.Name }}-{{ .Release.Namespace }}-certs
 subjects:
 - kind: ServiceAccount
-  name: {{ .Release.Name }}-operator
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 
 {{- end }}

charts/ent-operator/templates/operator.yaml

@@ -2,19 +2,27 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-operator  
+  name: {{ .Release.Name }}  
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
       matchLabels:
-        controller: {{ .Release.Name }}-operator
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/name: {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        controller: {{ .Release.Name }}-operator
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/name: {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ .Release.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: {{ .Release.Name }}-operator
+      serviceAccountName: {{ .Release.Name }}
 {{- if not .Values.managedSecurityContext }}
       securityContext:
         runAsNonRoot: true
@@ -40,6 +48,8 @@ spec:
         command:
           - "/usr/local/bin/mongodb-enterprise-operator"
         {{- end }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
         env:
         - name: OPERATOR_ENV
           value: {{ .Values.env }}