089dc203dba040da8a86036a57cf1c883f332800: update public repo contents

Author: Anton Lisovenko

README.md

@@ -97,10 +97,10 @@ in OpsManager directly). If omitted the name of the MongoDB resource will be use
 * (optionally) Organization ID - the ID of the organization which the Project belongs to. The Operator will create
 an Organization with the same name as the Project if Organization ID is omitted.
 * API Credentials. This can be any pair of:
-** Public and Private Programmatic API keys. They correspond to `user` and `publicApiKey` fields in the Secret storing 
+  * Public and Private Programmatic API keys. They correspond to `user` and `publicApiKey` fields in the Secret storing 
 credentials. More information about the way to create them using Ops Manager UI can be found 
 [here](https://docs.opsmanager.mongodb.com/current/tutorial/configure-public-api-access/#programmatic-api-keys)
-** Username and Public API key. More information about the way to create them using Ops Manager UI can be found
+  * Username and Public API key. More information about the way to create them using Ops Manager UI can be found
  [here](https://docs.opsmanager.mongodb.com/current/tutorial/configure-public-api-access/#personal-api-keys-deprecated)
 
 Note that you must whitelist the IP 
@@ -122,20 +122,22 @@ metadata:
   name: my-project
   namespace: mongodb
 data:
-  projectName: myProjectName
+  projectName: myProjectName # this is an optional parameter
   orgId: 5b890e0feacf0b76ff3e7183 # this is an optional parameter
   baseUrl: https://my-ops-manager-or-cloud-manager-url
 ```
 > Note, that if `orgId` is skipped then the new organization named `projectName` will be automatically created and new
 project will be added there.
+> If `projectName` is skipped the project created in Ops Manager will get the same name as the MongoDB object
 
 Apply this file to create the new `Project`:
 
     kubectl apply -f my-project.yaml
 
 ### Credentials ###
 
-For a user to be able to create or update objects in this Ops Manager Project they need a Public API Key. These will be held by Kubernetes as a `Secret` object. You can create this Secret with the following command:
+For a user to be able to create or update objects in this Ops Manager Project they need either a Public API Key or a 
+Programmatic API Key. These will be held by Kubernetes as a `Secret` object. You can create this Secret with the following command:
 
 ``` bash
 $ kubectl -n mongodb create secret generic my-credentials --from-literal="[email protected]" --from-literal="publicApiKey=my-public-api-key"
@@ -154,7 +156,7 @@ If you have a correctly created Project with the name `my-project` and Credentia
 This section describes how to create the Ops Manager object in Kubernetes. Note, that this requires all
 the CRDs and the Operator application to be installed as described above.
 
-*Disclaimer: this is an early release of Ops Manager - so it's not recommended to use it in production*
+*Disclaimer: this is a Beta release of Ops Manager - so it's not recommended to use it in production*
 
 ### Create Admin Credentials Secret ###
 

helm_chart/templates/database-roles.yaml

@@ -0,0 +1,63 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: mongodb-enterprise-appdb
+  {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+  namespace: {{ .Values.operator.watchNamespace }}
+  {{- else }}
+  namespace: {{ .Values.namespace }}
+  {{- end }}
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: mongodb-enterprise-database-pods
+  {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+  namespace: {{ .Values.operator.watchNamespace }}
+  {{- else }}
+  namespace: {{ .Values.namespace }}
+  {{- end }}
+
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: mongodb-enterprise-appdb
+  {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+  namespace: {{ .Values.operator.watchNamespace }}
+  {{- else }}
+  namespace: {{ .Values.namespace }}
+  {{- end }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: mongodb-enterprise-appdb
+  {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+  namespace: {{ .Values.operator.watchNamespace }}
+  {{- else }}
+  namespace: {{ .Values.namespace }}
+  {{- end }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: mongodb-enterprise-appdb
+subjects:
+  - kind: ServiceAccount
+    name: mongodb-enterprise-appdb
+    {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+    namespace: {{ .Values.operator.watchNamespace }}
+    {{- else }}
+    namespace: {{ .Values.namespace }}
+    {{- end }}
+

helm_chart/templates/roles.yaml helm_chart/templates/operator-roles.yamlhelm_chart/templates/roles.yaml renamed to helm_chart/templates/operator-roles.yaml

@@ -1,11 +1,23 @@
 ---
-kind: {{ if .Values.operator.watchNamespace }} {{ if (eq .Values.operator.watchNamespace "*") }} ClusterRole {{ else }} Role {{ end }} {{ else }} Role {{ end }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.operator.name }}
+  {{- if .Values.namespace }}
+  namespace: {{ .Values.namespace }}
+  {{- end }}
+
+
+---
+kind: {{ if eq (.Values.operator.watchNamespace | default "") "*" }} ClusterRole {{ else }} Role {{ end }}
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Values.operator.name }}
-{{ if .Values.namespace }}
+  {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+  namespace: {{ .Values.operator.watchNamespace }}
+  {{- else }}
   namespace: {{ .Values.namespace }}
-{{ end }}
+  {{- end }}
 rules:
 - apiGroups:
   - ""
@@ -47,27 +59,29 @@ rules:
   - update
 
 ---
-kind: {{ if .Values.operator.watchNamespace }} {{ if (eq .Values.operator.watchNamespace "*") }} ClusterRoleBinding {{ else }} RoleBinding {{ end }} {{ else }} RoleBinding {{ end }}
+kind: {{ if eq (.Values.operator.watchNamespace | default "") "*" }} ClusterRoleBinding {{ else }} RoleBinding {{ end }}
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Values.operator.name }}
-{{ if .Values.namespace }}
+  {{- if not (eq (.Values.operator.watchNamespace | default "*") "*") }}
+  namespace: {{ .Values.operator.watchNamespace }}
+  {{- else }}
   namespace: {{ .Values.namespace }}
-{{ end }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: {{ if .Values.operator.watchNamespace }} {{ if (eq .Values.operator.watchNamespace "*") }} ClusterRole {{ else }} Role {{ end }} {{ else }} Role {{ end }}
+  kind: {{ if eq (.Values.operator.watchNamespace | default "") "*" }} ClusterRole {{ else }} Role {{ end }}
   name: {{ .Values.operator.name }}
 subjects:
 - kind: ServiceAccount
   name: {{ .Values.operator.name }}
-{{ if .Values.namespace }}
+  {{- if .Values.namespace }}
   namespace: {{ .Values.namespace }}
-{{ end }}
+  {{- end }}
 
 # This ClusterRole is needed if the user wants to use the Kubernetes CA
 # infrastructure to generate certificates.
-{{ if .Values.needsCAInfrastructure }}
+{{- if .Values.needsCAInfrastructure }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -99,40 +113,6 @@ subjects:
   name: {{ .Values.operator.name }}
   namespace: {{ .Values.namespace }}
 
-{{ end }}
+{{- end }}
 
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: mongodb-enterprise-appdb
-{{ if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{ end }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - get
-
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: mongodb-enterprise-appdb
-{{ if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{ end }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: mongodb-enterprise-appdb
-subjects:
-  - kind: ServiceAccount
-    name: mongodb-enterprise-appdb
-{{ if .Values.namespace }}
-    namespace: {{ .Values.namespace }}
-{{ end }}
 

helm_chart/templates/operator.yaml

@@ -3,9 +3,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.operator.name }}
-{{ if .Values.namespace }}
+{{- if .Values.namespace }}
   namespace: {{ .Values.namespace }}
-{{ end }}
+{{- end }}
 spec:
   replicas: 1
   selector:
@@ -17,15 +17,15 @@ spec:
         app: {{ .Values.operator.name }}
     spec:
       serviceAccountName: {{ .Values.operator.name }}
-{{ if not .Values.managedSecurityContext }}
+{{- if not .Values.managedSecurityContext }}
       securityContext:
         runAsNonRoot: true
         runAsUser: 2000
-{{ end }}
-{{ if .Values.registry.imagePullSecrets}}
+{{- end }}
+{{- if .Values.registry.imagePullSecrets}}
       imagePullSecrets:
       - name: {{ .Values.registry.imagePullSecrets }}
-{{ end }}
+{{- end }}
 
       containers:
       - name: {{ .Values.operator.name }}
@@ -35,21 +35,21 @@ spec:
         - name: OPERATOR_ENV
           value: {{ .Values.operator.env }}
         - name: WATCH_NAMESPACE
-{{ if .Values.operator.watchNamespace}}
+{{- if .Values.operator.watchNamespace}}
           value: "{{ .Values.operator.watchNamespace }}"
-{{ else }}
+{{- else }}
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-{{ end }}
+{{- end }}
         - name: CURRENT_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-{{ if eq .Values.managedSecurityContext true }}
+{{- if eq .Values.managedSecurityContext true }}
         - name: MANAGED_SECURITY_CONTEXT
           value: 'true'
-{{ end }}
+{{- end }}
         - name: MONGODB_ENTERPRISE_DATABASE_IMAGE
           value: {{ .Values.registry.repository }}/{{ .Values.database.name }}:{{ .Values.operator.version }}
         - name: IMAGE_PULL_POLICY
@@ -61,12 +61,12 @@ spec:
         - name: APP_DB_IMAGE_REPOSITORY
           value: {{ .Values.registry.repository }}/{{ .Values.appDb.name }}
 
-{{ if .Values.registry.imagePullSecrets }}
+{{- if .Values.registry.imagePullSecrets }}
         - name: IMAGE_PULL_SECRETS
           value: {{ .Values.registry.imagePullSecrets }}
-{{ end }}
+{{- end }}
 
-{{ if .Values.debug }}
+{{- if .Values.debug }}
 ---
 apiVersion: v1
 kind: Service
@@ -80,4 +80,4 @@ spec:
       protocol: TCP
   selector:
     app: {{ .Values.operator.name }}
-{{ end }}
+{{- end }}