Merge pull request #9 from mongodb/ent-helm

Adding updated DataBase Chart
mongodb · Oct 30, 2020 · a8f6768 · a8f6768
2 parents 16491a1 + 58fcf86
commit a8f6768
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 41 deletions.
diff --git a/charts/ent-operator-database/templates/database-cm.yaml b/charts/ent-operator-database/templates/database-cm.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.opsManager.configMap }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -15,3 +16,4 @@ data:
   {{- if .Values.opsManager.orgid }}
   orgId: {{ .Values.opsManager.orgid | quote }}
   {{- end }}
+{{- end }}
diff --git a/charts/ent-operator-database/templates/database-secret.yaml b/charts/ent-operator-database/templates/database-secret.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.opsManager.secretRef }}
 ---
 apiVersion: v1
 kind: Secret
@@ -8,3 +9,4 @@ type: Opaque
 data:
     user: {{ .Values.opsManager.APIKey | b64enc }}
     publicApiKey: {{ .Values.opsManager.APISecret | b64enc }}
+{{- end }}
diff --git a/charts/ent-operator-database/templates/database.yaml b/charts/ent-operator-database/templates/database.yaml
@@ -3,11 +3,7 @@ apiVersion: mongodb.com/v1
 kind: MongoDB
 metadata:
   name: {{ .Values.name }}
-  {{- if not (eq (.Values.watchNamespace | default "*") "*") }}
-  namespace: {{ .Values.watchNamespace }}
-  {{- else }}
   namespace: {{ .Release.Namespace }}
-  {{- end }}
 
 spec:
   type: {{ .Values.type | quote }}
@@ -19,8 +15,16 @@ spec:
 
   opsManager:
     configMapRef:
+{{- if .Values.opsManager.configMap }}      
+      name: {{ .Values.opsManager.configMap }}
+{{- else }}
       name: {{ .Values.name }}-configmap
-  credentials: {{ .Values.name }}-crendential
+{{- end }}
+{{- if .Values.opsManager.secretRef }}
+  credentials: {{ .Values.opsManager.secretRef }}
+{{- else }}
+  credentials: {{ .Values.name }}-credential
+{{- end }}
 
   security:
     authentication:

diff --git a/charts/ent-operator-database/values.yaml b/charts/ent-operator-database/values.yaml
@@ -5,18 +5,26 @@
 managedSecurityContext: false
 
 # Section to describe components that needs to be installed
-deployOperator: true
+mongodb-enterprise-operator:
+  enabled: true
+
+
 # Optional configuration.
 deployValidationWebhooks: true
 
 name: mdbreplset
 type: ReplicaSet
 members: 3
 opsManager:
-  URL: "http://a2fbcb181660c4589afae30959c8218a-2143866689.eu-west-1.elb.amazonaws.com:8080"
-  APIKey: "UZMWOTAX"
-  APISecret: "7b9b5641-cfee-42ed-8d0e-44667d51d2ea"
-  orgid: "5f6e1653a0b3b16931c7a3ae"
+  # Ops Manager connection could be configured  with Values and This HELM chart will create
+  # nesessary Secret and Config Map.
+  URL:
+  orgid:
+  APIKey:
+  APISecret:
+  # Alternatevly an existing secret and config map could be provided directly
+  configMap: opsmanager-configmap
+  secretRef: opsmanager-org-access-key
 resources:
   limits:
     cpu: 2
@@ -29,38 +37,7 @@ tolerations: []
 clusterName: cluster.local
 
 registry:
-  # Redhat repository is registry.connect.redhat.com/mongod
-
-  operator:
-    Image: quay.io/mongodb/mongodb-enterprise-operator
-    Tag: 1.7.1
-
-  database:
-    Image: quay.io/mongodb/mongodb-enterprise-database:1.7.1
-
-  opsManager:
-    Image: quay.io/mongodb/mongodb-enterprise-ops-manager
-
-  initOpsManager:
-    Image: quay.io/mongodbmongodb-enterprise-init-ops-manager
-    Tag: 1.0.1
-
-  appDb:
-    Image: quay.io/mongodb/mongodb-enterprise-appdb
-
-  initAppDb:
-    Image: quay.io/mongodb/mongodb-enterprise-init-appdb
-    Tag: 1.0.2
-
   imagePullSecrets:
   # TODO: specify for each image and move there?
   pullPolicy: Always
   # Specify if images are pulled from private registry
-
-# Set this to true if the operator will require Kubernetes CA
-# infrastructure to generate TLS certificates.
-needsCAInfrastructure: true
-
-# Set this to false to disable subresource utilization
-# It might be required on some versions of Openshift
-subresourceEnabled: true