fe2c93e9c91eb62a70dcdb8c4217e1f882b68728: update public repo contents

Author: Anton Lisovenko

crds.yaml

@@ -1,5 +1,7 @@
 ---
 # Source: mongodb-enterprise-operator/templates/crds.yaml
+
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -410,8 +412,9 @@ spec:
             shardCount:
               minimum: 1
               type: integer
+
+
 ---
-# Source: mongodb-enterprise-operator/templates/crds.yaml
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -492,7 +495,6 @@ spec:
               - username
               - db
 ---
-# Source: mongodb-enterprise-operator/templates/crds.yaml
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -832,7 +834,6 @@ spec:
 # prevent you from applying a variety of invalid resource definitions. The
 # validating webhooks are optional so this can be removed if necessary.
 ---
-# Source: mongodb-enterprise-operator/templates/crds.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -847,3 +848,5 @@ rules:
   - create
   - update
   - delete
+
+

helm_chart/templates/operator.yaml

@@ -61,7 +61,7 @@ spec:
         - name: IMAGE_PULL_POLICY
           value: {{ .Values.registry.pullPolicy }}
         - name: OPS_MANAGER_IMAGE_REPOSITORY
-          value: {{ .Values.registry.opsManager }}
+          value: {{ .Values.registry.opsManager }}/{{ .Values.opsManager.name }}
         - name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
           value: {{ .Values.registry.initOpsManager }}/{{ .Values.initOpsManager.name }}
         - name: INIT_OPS_MANAGER_VERSION
@@ -73,7 +73,7 @@ spec:
         - name: OPS_MANAGER_IMAGE_PULL_POLICY
           value: {{ .Values.registry.pullPolicy }}
         - name: APPDB_IMAGE_REPOSITORY
-          value: {{ .Values.registry.appDb }}
+          value: {{ .Values.registry.appDb }}/{{ .Values.appDb.name }}
 
 {{- if .Values.registry.imagePullSecrets }}
         - name: IMAGE_PULL_SECRETS

mongodb-enterprise-openshift.yaml

@@ -1,58 +1,14 @@
 ---
 # Source: mongodb-enterprise-operator/templates/operator-roles.yaml
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: enterprise-operator
   namespace: mongodb
+
+
 ---
-# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: enterprise-operator-mongodb-certs
-rules:
-- apiGroups:
-  - certificates.k8s.io
-  resources:
-  - certificatesigningrequests
-  verbs:
-  - get
-  - create
-  - list
-  - watch
----
-# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: enterprise-operator-mongodb-webhook-binding
-  namespace: mongodb
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: mongodb-enterprise-operator-mongodb-webhook
-subjects:
-- kind: ServiceAccount
-  name: enterprise-operator
-  namespace: mongodb
----
-# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: enterprise-operator-mongodb-certs-binding
-  namespace: mongodb
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: enterprise-operator-mongodb-certs
-subjects:
-- kind: ServiceAccount
-  name: enterprise-operator
-  namespace: mongodb
----
-# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
 kind:  Role 
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -102,7 +58,21 @@ rules:
 # definitions. The validating webhooks are optional so this can be removed if
 # necessary.
 ---
-# Source: mongodb-enterprise-operator/templates/operator-roles.yaml
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: enterprise-operator-mongodb-webhook-binding
+  namespace: mongodb
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: mongodb-enterprise-operator-mongodb-webhook
+subjects:
+- kind: ServiceAccount
+  name: enterprise-operator
+  namespace: mongodb
+
+---
 kind:  RoleBinding 
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -119,22 +89,55 @@ subjects:
 
 # This ClusterRole is needed if the user wants to use the Kubernetes CA
 # infrastructure to generate certificates.
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: enterprise-operator-mongodb-certs
+rules:
+- apiGroups:
+  - certificates.k8s.io
+  resources:
+  - certificatesigningrequests
+  verbs:
+  - get
+  - create
+  - list
+  - watch
+
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: enterprise-operator-mongodb-certs-binding
+  namespace: mongodb
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: enterprise-operator-mongodb-certs
+subjects:
+- kind: ServiceAccount
+  name: enterprise-operator
+  namespace: mongodb
+
+
 ---
 # Source: mongodb-enterprise-operator/templates/database-roles.yaml
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: mongodb-enterprise-appdb
   namespace: mongodb
+
 ---
-# Source: mongodb-enterprise-operator/templates/database-roles.yaml
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: mongodb-enterprise-database-pods
   namespace: mongodb
+
 ---
-# Source: mongodb-enterprise-operator/templates/database-roles.yaml
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -147,8 +150,8 @@ rules:
       - configmaps
     verbs:
       - get
+
 ---
-# Source: mongodb-enterprise-operator/templates/database-roles.yaml
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -162,8 +165,10 @@ subjects:
   - kind: ServiceAccount
     name: mongodb-enterprise-appdb
     namespace: mongodb
+
 ---
 # Source: mongodb-enterprise-operator/templates/operator.yaml
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -209,7 +214,7 @@ spec:
         - name: IMAGE_PULL_POLICY
           value: Always
         - name: OPS_MANAGER_IMAGE_REPOSITORY
-          value: registry.connect.redhat.com/mongodb
+          value: registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager
         - name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
           value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager
         - name: INIT_OPS_MANAGER_VERSION
@@ -221,4 +226,4 @@ spec:
         - name: OPS_MANAGER_IMAGE_PULL_POLICY
           value: Always
         - name: APPDB_IMAGE_REPOSITORY
-          value: registry.connect.redhat.com/mongodb
+          value: registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb