Skip to content

Commit

Permalink
Merge pull request #19 from mongodb/1.9.1-update
Browse files Browse the repository at this point in the history
Updating Operator to new version
  • Loading branch information
theburi authored Jan 22, 2021
2 parents a35320e + 61a6288 commit e9f5902
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 23 deletions.
4 changes: 2 additions & 2 deletions charts/ent-operator-database/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ dependencies:
- name: mongodb-enterprise-operator
repository: https://mongodb.github.io/helm-charts
version: 0.1.6
digest: sha256:ba002699e7c9943839f72e7b5cc0d25c698a2a5ac57692bd2c03743d5b7579ff
generated: "2020-10-30T14:42:31.774989Z"
digest: sha256:d0d0f657fdc6794087081898553ab4ba598f05a385f0bd290b634cbc95a47d43
generated: "2021-01-22T11:51:40.757772Z"
4 changes: 2 additions & 2 deletions charts/ent-operator-database/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: mongodb-enterprise-database
description: MongoDB Kubernetes Enterprise Operator- MongoDB DataBase charts
version: 0.2.0
version: 0.2.1
kubeVersion: '>=1.15-0'
keywords:
- mongodb
Expand All @@ -14,6 +14,6 @@ maintainers:
email: [email protected]
dependencies:
- name: mongodb-enterprise-operator
version: "0.2.*"
version: "0.1.6"
repository: "https://mongodb.github.io/helm-charts"
condition: mongodb-enterprise-operator.enabled
2 changes: 1 addition & 1 deletion charts/ent-operator-database/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ deployValidationWebhooks: true

name: mdbreplset
type: ReplicaSet
version: 4.4.1-ent
version: 4.4.2-ent
members: 3
backup: false

Expand Down
4 changes: 2 additions & 2 deletions charts/ent-operator-opsmanager/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ dependencies:
- name: mongodb-enterprise-operator
repository: https://mongodb.github.io/helm-charts
version: 0.1.6
digest: sha256:ba002699e7c9943839f72e7b5cc0d25c698a2a5ac57692bd2c03743d5b7579ff
generated: "2020-10-30T14:22:12.761262Z"
digest: sha256:d0d0f657fdc6794087081898553ab4ba598f05a385f0bd290b634cbc95a47d43
generated: "2021-01-22T11:52:14.332382Z"
4 changes: 2 additions & 2 deletions charts/ent-operator-opsmanager/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: mongodb-enterprise-opsmanager
description: MongoDB Kubernetes Enterprise Operator - Ops Manager Chart
version: 0.2.1
version: 0.2.2
kubeVersion: '>=1.15-0'
keywords:
- opsManager
Expand All @@ -15,6 +15,6 @@ maintainers:
email: [email protected]
dependencies:
- name: mongodb-enterprise-operator
version: "0.2.*"
version: "0.1.6"
repository: "https://mongodb.github.io/helm-charts"
condition: mongodb-enterprise-operator.enabled
12 changes: 6 additions & 6 deletions charts/ent-operator-opsmanager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,24 @@ deployValidationWebhooks: true # Optional configuration.
# Deploy Ops Manager backup daemon and set it up.
# Note: OpLogs DB needs to be provisioned separately
deployBackupInfrastructure: true
# Provision Volume that will store MongoDB installers. Use with Version.source: local
# Provision Volume that will store MongoDB installers. Use with Version.source: local
provisionInstallersVolumeSize: "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"
# to proxy mongodb installers download via Ops Manager choose "remote"
"automation.versions.source": "remote" # [ local| hybrid| remote ]

# 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"
mms.ignoreInitialUiSetup: "true"

mms.adminEmailAddr: "[email protected]"
mms.fromEmailAddr: "[email protected]"

mms.replyToEmailAddr: "[email protected]"
mms.mail.hostname: "email-smtp.us-east-1.amazonaws.com"
mms.mail.port: "465"
Expand Down
4 changes: 2 additions & 2 deletions charts/ent-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: mongodb-enterprise-operator
description: MongoDB Kubernetes Enterprise Operator deployment
version: 0.2.0
kubeVersion: '>=1.15-0'
version: 0.3.0
kubeVersion: '>=1.16-0'
keywords:
- mongodb
- database
Expand Down
2 changes: 2 additions & 0 deletions charts/ent-operator/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ spec:
value: {{ .Values.registry.pullPolicy }}
- name: APPDB_IMAGE_REPOSITORY
value: {{ .Values.registry.appDb.Image }}
- name: APPDB_AGENT_VERSION
value: {{ .Values.registry.appDb.Tag }}
- name: IMAGE_PULL_POLICY
value: {{ .Values.registry.pullPolicy }}
{{- if .Values.registry.imagePullSecrets }}
Expand Down
13 changes: 7 additions & 6 deletions charts/ent-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: mongodb-enterprise-operator
deployment_name: mongodb-enterprise-operator

# Version of mongodb-enterprise-operator and mongodb-enterprise-database images
version: 1.9.0
version: 1.9.1

# The Custom Resources that will be watched by the Operator.
# Needs to be changed if only some of the CRDs are installed
Expand All @@ -32,26 +32,26 @@ watchNamespace: []
# - mongodb
resources:
limits:
cpu: 300m
cpu: 1100m
memory: 1G
requests:
cpu: 200m
cpu: 500m
memory: 200Mi

registry:
# Redhat repository is registry.connect.redhat.com/mongod

operator:
Image: quay.io/mongodb/mongodb-enterprise-operator
Tag: 1.9.0
Tag: 1.9.1

database:
Image: quay.io/mongodb/mongodb-enterprise-database
Tag: 2.0.0

databaseInit:
Image: quay.io/mongodb/mongodb-enterprise-init-database
Tag: 1.0.1
Tag: 1.0.2

opsManager:
Image: quay.io/mongodb/mongodb-enterprise-ops-manager
Expand All @@ -62,10 +62,11 @@ registry:

appDb:
Image: quay.io/mongodb/mongodb-enterprise-appdb
Tag: 10.2.15.5958-1_4.2.11-ent

initAppDb:
Image: quay.io/mongodb/mongodb-enterprise-init-appdb
Tag: 1.0.5
Tag: 1.0.6

imagePullSecrets:
# TODO: specify for each image and move there?
Expand Down

0 comments on commit e9f5902

Please sign in to comment.