Skip to content

Commit

Permalink
6309ef0f4a0e27867736c9d0c61bbbdb44814783: update public repo contents
Browse files Browse the repository at this point in the history
  • Loading branch information
chatton committed May 29, 2020
1 parent dac8c2a commit 965d580
Show file tree
Hide file tree
Showing 7 changed files with 133 additions and 116 deletions.
7 changes: 4 additions & 3 deletions crds.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
# Source: mongodb-enterprise-operator/templates/crds.yaml

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -410,8 +412,8 @@ spec:
shardCount:
minimum: 1
type: integer

---
# Source: mongodb-enterprise-operator/templates/crds.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -491,8 +493,8 @@ spec:
required:
- username
- db

---
# Source: mongodb-enterprise-operator/templates/crds.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -833,7 +835,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:
Expand Down
2 changes: 1 addition & 1 deletion helm_chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: mongodb-enterprise-operator
description: MongoDB Kubernetes Enterprise Operator
version: 1.5.2
version: 1.5.3
kubeVersion: '>=1.13'
keywords:
- mongodb
Expand Down
2 changes: 1 addition & 1 deletion helm_chart/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
- name: {{ .Values.registry.imagePullSecrets }}
{{- end }}
containers:
- name: {{ .Values.operator.name }}
- name: {{ .Values.operator.deployment_name }}
image: {{ .Values.registry.operator }}/{{ .Values.operator.name }}:{{ .Values.operator.version }}
imagePullPolicy: {{ .Values.registry.pullPolicy }}
{{- if .Values.operator.watchedResources }}
Expand Down
5 changes: 4 additions & 1 deletion helm_chart/values-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ operator:
# Name that will be assigned to most of internal Kubernetes objects like Deployment, ServiceAccount, Role etc.
name: enterprise-operator

# Name of the deployment of the operator pod
deployment_name: mongodb-enterprise-operator

# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
version: 1.5.2
version: 1.5.3

# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
watchedResources:
Expand Down
5 changes: 4 additions & 1 deletion helm_chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ operator:
# Name that will be assigned to most of internal Kubernetes objects like Deployment, ServiceAccount, Role etc.
name: mongodb-enterprise-operator

# Name of the deployment of the operator pod
deployment_name: mongodb-enterprise-operator

# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
version: 1.5.2
version: 1.5.3

# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
watchedResources:
Expand Down
115 changes: 60 additions & 55 deletions mongodb-enterprise-openshift.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -101,7 +57,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:
Expand All @@ -118,29 +88,62 @@ 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
apiVersion: v1
kind: ServiceAccount
metadata:
name: mongodb-enterprise-ops-manager
namespace: mongodb

---
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand All @@ -153,8 +156,8 @@ rules:
- configmaps
verbs:
- get

---
# Source: mongodb-enterprise-operator/templates/database-roles.yaml
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand All @@ -168,8 +171,10 @@ subjects:
- kind: ServiceAccount
name: mongodb-enterprise-appdb
namespace: mongodb

---
# Source: mongodb-enterprise-operator/templates/operator.yaml
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -187,8 +192,8 @@ spec:
spec:
serviceAccountName: enterprise-operator
containers:
- name: enterprise-operator
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.5.2
- name: mongodb-enterprise-operator
image: registry.connect.redhat.com/mongodb/enterprise-operator:1.5.3
imagePullPolicy: Always
args:
- "-watch-resource=mongodb"
Expand All @@ -210,7 +215,7 @@ spec:
- name: MANAGED_SECURITY_CONTEXT
value: 'true'
- name: MONGODB_ENTERPRISE_DATABASE_IMAGE
value: registry.connect.redhat.com/mongodb/enterprise-database:1.5.2
value: registry.connect.redhat.com/mongodb/enterprise-database:1.5.3
- name: IMAGE_PULL_POLICY
value: Always
- name: OPS_MANAGER_IMAGE_REPOSITORY
Expand Down
Loading

0 comments on commit 965d580

Please sign in to comment.