Skip to content

Commit d330cc9

Browse files
JunaidChaudryJunaidChaudry
authored
Merge branch 'main' into feature/community-operator-supports-extraManifests
2 parents 6c9f51e + 450c93b commit d330cc9

22 files changed

+1305
-343
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ private/
55
.DS_Store
66
.idea
77
*.iml
8+
9+
# ignoring generated charts and chart locks
10+
Chart.lock
11+
crds

‎charts/atlas-operator-crds/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: mongodb-atlas-operator-crds
33
description: MongoDB Atlas Operator CRDs - Helm chart for installing and upgrading Custom Resource Definitions (CRDs) for the Atlas Operator.
44
type: application
5-
version: 1.6.1
6-
appVersion: 1.6.1
5+
version: 1.7.3
6+
appVersion: 1.7.3
77
kubeVersion: ">=1.15.0-0"
88
keywords:
99
- mongodb

‎charts/atlas-operator-crds/templates/atlas.mongodb.com_atlasbackupschedules.yaml

+39-4
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,53 @@ spec:
4545
snapshots to the AWS bucket. You must also define the export policy
4646
using export. If omitted, defaults to false.
4747
type: boolean
48+
copySettings:
49+
description: Copy backups to other regions for increased resiliency
50+
and faster restores.
51+
items:
52+
properties:
53+
cloudProvider:
54+
default: AWS
55+
description: Identifies the cloud provider that stores the snapshot
56+
copy.
57+
enum:
58+
- AWS
59+
- GCP
60+
- AZURE
61+
type: string
62+
frequencies:
63+
description: List that describes which types of snapshots to
64+
copy.
65+
items:
66+
type: string
67+
minItems: 1
68+
type: array
69+
regionName:
70+
description: Target region to copy snapshots belonging to replicationSpecId
71+
to.
72+
type: string
73+
replicationSpecId:
74+
description: Unique identifier that identifies the replication
75+
object for a zone in a cluster.
76+
type: string
77+
shouldCopyOplogs:
78+
description: Flag that indicates whether to copy the oplogs
79+
to the target region.
80+
type: boolean
81+
type: object
82+
type: array
4883
export:
4984
description: Export policy for automatically exporting cloud backup
5085
snapshots to AWS bucket.
5186
properties:
5287
exportBucketId:
53-
description: Unique identifier of the AWS bucket to export the
54-
cloud backup snapshot to.
88+
description: Unique Atlas identifier of the AWS bucket which was
89+
granted access to export backup snapshot
5590
type: string
5691
frequencyType:
57-
default: MONTHLY
92+
default: monthly
5893
enum:
59-
- MONTHLY
94+
- monthly
6095
type: string
6196
required:
6297
- exportBucketId

‎charts/atlas-operator-crds/templates/atlas.mongodb.com_atlasdeployments.yaml

+20-6
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,9 @@ spec:
259259
object.
260260
properties:
261261
autoIndexingEnabled:
262-
description: Flag that indicates whether autopilot mode for
263-
Performance Advisor is enabled. The default is false.
262+
description: 'Deprecated: This flag is not supported anymore.
263+
Flag that indicates whether autopilot mode for Performance
264+
Advisor is enabled. The default is false.'
264265
type: boolean
265266
compute:
266267
description: Collection of settings that configure how a deployment
@@ -427,8 +428,9 @@ spec:
427428
can scale.
428429
properties:
429430
autoIndexingEnabled:
430-
description: Flag that indicates whether autopilot mode
431-
for Performance Advisor is enabled. The default is false.
431+
description: 'Deprecated: This flag is not supported anymore.
432+
Flag that indicates whether autopilot mode for Performance
433+
Advisor is enabled. The default is false.'
432434
type: boolean
433435
compute:
434436
description: Collection of settings that configure how
@@ -656,8 +658,9 @@ spec:
656658
can scale.
657659
properties:
658660
autoIndexingEnabled:
659-
description: Flag that indicates whether autopilot mode
660-
for Performance Advisor is enabled. The default is false.
661+
description: 'Deprecated: This flag is not supported anymore.
662+
Flag that indicates whether autopilot mode for Performance
663+
Advisor is enabled. The default is false.'
661664
type: boolean
662665
compute:
663666
description: Collection of settings that configure how
@@ -917,6 +920,17 @@ spec:
917920
reconciliation of the resource.
918921
format: int64
919922
type: integer
923+
replicaSets:
924+
items:
925+
properties:
926+
id:
927+
type: string
928+
zoneName:
929+
type: string
930+
required:
931+
- id
932+
type: object
933+
type: array
920934
serverlessPrivateEndpoints:
921935
items:
922936
properties:

‎charts/atlas-operator-crds/templates/atlas.mongodb.com_atlasprojects.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ spec:
277277
name:
278278
description: Name is the name of the Kubernetes Resource
279279
type: string
280+
namespace:
281+
description: Namespace is the namespace of the Kubernetes Resource
282+
type: string
280283
required:
281284
- name
282285
type: object
@@ -768,6 +771,8 @@ spec:
768771
type: boolean
769772
isDataExplorerEnabled:
770773
type: boolean
774+
isExtendedStorageSizesEnabled:
775+
type: boolean
771776
isPerformanceAdvisorEnabled:
772777
type: boolean
773778
isRealtimePerformancePanelEnabled:

‎charts/atlas-operator/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: mongodb-atlas-operator
33
description: |-
44
MongoDB Atlas Operator - a Helm chart for installing and upgrading Atlas Operator: the official Kubernetes operator allowing to manage MongoDB Atlas resources from Kubernetes
55
type: application
6-
version: 1.6.1
7-
appVersion: 1.6.1
6+
version: 1.7.3
7+
appVersion: 1.7.3
88
kubeVersion: ">=1.15.0-0"
99
keywords:
1010
- mongodb
@@ -19,6 +19,6 @@ maintainers:
1919
email: support@mongodb.com
2020
dependencies:
2121
- name: mongodb-atlas-operator-crds
22-
version: "1.6.1"
22+
version: "1.7.3"
2323
repository: "https://mongodb.github.io/helm-charts"
2424
condition: mongodb-atlas-operator-crds.enabled

‎charts/atlas-operator/templates/roles.yaml

+11-1
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,19 @@ metadata:
7373
rules:
7474
- apiGroups:
7575
- ""
76-
- coordination.k8s.io
7776
resources:
7877
- configmaps
78+
verbs:
79+
- get
80+
- list
81+
- watch
82+
- create
83+
- update
84+
- patch
85+
- delete
86+
- apiGroups:
87+
- coordination.k8s.io
88+
resources:
7989
- leases
8090
verbs:
8191
- get

‎charts/community-operator-crds/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: community-operator-crds
33
description: MongoDB Kubernetes Community Operator - CRDs
44
type: application
5-
version: 0.7.8
6-
appVersion: 0.7.8
5+
version: 0.8.0
6+
appVersion: 0.8.0
77
kubeVersion: '>=1.16-0'
88
keywords:
99
- mongodb

‎charts/community-operator-crds/templates/mongodbcommunity.mongodb.com_mongodbcommunity.yaml

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
8-
service.binding/type: 'mongodb'
9-
service.binding/provider: 'community'
10-
service.binding: 'path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret'
11-
service.binding/connectionString: 'path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret,sourceKey=connectionString.standardSrv'
12-
service.binding/username: 'path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret,sourceKey=username'
13-
service.binding/password: 'path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret,sourceKey=password'
6+
controller-gen.kubebuilder.io/version: v0.11.3
7+
service.binding: path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret
8+
service.binding/connectionString: path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret,sourceKey=connectionString.standardSrv
9+
service.binding/password: path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret,sourceKey=password
10+
service.binding/provider: community
11+
service.binding/type: mongodb
12+
service.binding/username: path={.metadata.name}-{.spec.users[0].db}-{.spec.users[0].name},objectType=Secret,sourceKey=username
1413
creationTimestamp: null
1514
name: mongodbcommunity.mongodbcommunity.mongodb.com
1615
spec:
@@ -60,6 +59,15 @@ spec:
6059
nullable: true
6160
type: object
6261
x-kubernetes-preserve-unknown-fields: true
62+
agent:
63+
description: AgentConfiguration sets options for the MongoDB automation
64+
agent
65+
properties:
66+
logLevel:
67+
type: string
68+
maxLogFileDurationHours:
69+
type: integer
70+
type: object
6371
arbiters:
6472
description: 'Arbiters is the number of arbiters to add to the Replica
6573
Set. It is not recommended to have more than one arbiter per Replica
@@ -277,6 +285,7 @@ spec:
277285
TODO: Add other useful fields. apiVersion, kind, uid?'
278286
type: string
279287
type: object
288+
x-kubernetes-map-type: atomic
280289
caConfigMapRef:
281290
description: CaConfigMap is a reference to a ConfigMap containing
282291
the certificate for the CA which signed the server certificates
@@ -289,6 +298,7 @@ spec:
289298
TODO: Add other useful fields. apiVersion, kind, uid?'
290299
type: string
291300
type: object
301+
x-kubernetes-map-type: atomic
292302
certificateKeySecretRef:
293303
description: CertificateKeySecret is a reference to a Secret
294304
containing a private key and certificate to use for TLS.
@@ -306,6 +316,7 @@ spec:
306316
TODO: Add other useful fields. apiVersion, kind, uid?'
307317
type: string
308318
type: object
319+
x-kubernetes-map-type: atomic
309320
enabled:
310321
type: boolean
311322
optional:
@@ -434,9 +445,3 @@ spec:
434445
storage: true
435446
subresources:
436447
status: {}
437-
status:
438-
acceptedNames:
439-
kind: ""
440-
plural: ""
441-
conditions: []
442-
storedVersions: []

‎charts/community-operator/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
22
name: community-operator
33
description: MongoDB Kubernetes Community Operator
4-
version: 0.7.8
4+
version: 0.8.0
55
type: application
6-
appVersion: 0.7.8
6+
appVersion: 0.8.0
77
kubeVersion: '>=1.16-0'
88
keywords:
99
- mongodb
@@ -16,6 +16,6 @@ maintainers:
1616
email: support@mongodb.com
1717
dependencies:
1818
- name: community-operator-crds
19-
version: 0.7.8
19+
version: 0.8.0
2020
repository: https://mongodb.github.io/helm-charts
2121
condition: community-operator-crds.enabled

‎charts/community-operator/templates/mongodbcommunity_cr_with_tls.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ spec:
7979
statefulSet:
8080
{{- toYaml . | nindent 4 }}
8181
{{- end}}
82-
8382
{{- with .Values.resource.users }}
8483
users:
8584
{{- toYaml . | nindent 4 }}

‎charts/community-operator/templates/operator.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ spec:
2222
labels:
2323
name: {{ .Values.operator.name }}
2424
spec:
25+
{{- with .Values.imagePullSecrets }}
26+
imagePullSecrets:
27+
{{- toYaml . | nindent 8 }}
28+
{{- end }}
2529
affinity:
2630
podAntiAffinity:
2731
requiredDuringSchedulingIgnoredDuringExecution:

‎charts/community-operator/values.yaml

+27-21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Reference to one or more secrets to be used when pulling images
2+
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
3+
imagePullSecrets: []
4+
# - name: "image-pull-secret"
5+
16
## Operator
27
operator:
38
# Name that will be assigned to most of internal Kubernetes objects like
@@ -15,7 +20,7 @@ operator:
1520
deploymentName: mongodb-kubernetes-operator
1621

1722
# Version of mongodb-kubernetes-operator
18-
version: 0.7.8
23+
version: 0.8.0
1924

2025
# Uncomment this line to watch all namespaces
2126
# watchNamespace: "*"
@@ -55,13 +60,13 @@ database:
5560

5661
agent:
5762
name: mongodb-agent
58-
version: 12.0.15.7646-1
63+
version: 12.0.21.7698-1
5964
versionUpgradeHook:
6065
name: mongodb-kubernetes-operator-version-upgrade-post-start-hook
61-
version: 1.0.6
66+
version: 1.0.7
6267
readinessProbe:
6368
name: mongodb-kubernetes-readinessprobe
64-
version: 1.0.12
69+
version: 1.0.14
6570
mongodb:
6671
name: mongo
6772
repo: docker.io
@@ -87,22 +92,6 @@ resource:
8792
members: 3
8893
tls:
8994
enabled: false
90-
# users: []
91-
# - name: my-user
92-
# db: admin
93-
# passwordSecretRef: # a reference to the secret that will be used to generate the user's password
94-
# name: my-user-password
95-
# roles:
96-
# - name: clusterAdmin
97-
# db: admin
98-
# - name: userAdminAnyDatabase
99-
# db: admin
100-
# - name: readWriteAnyDatabase
101-
# db: admin
102-
# - name: dbAdminAnyDatabase
103-
# db: admin
104-
# scramCredentialsSecretName: my-scram
105-
10695
# overwrite MDBC resource statefulset defaults
10796
# statefulSet:
10897
# spec:
@@ -130,7 +119,24 @@ resource:
130119
certManager:
131120
certDuration: 8760h # 365 days
132121
renewCertBefore: 720h # 30 days
133-
122+
users: []
123+
# if using the MongoDBCommunity Resource, list any users to be added to the resource
124+
# users:
125+
# - name: my-user
126+
# db: admin
127+
# passwordSecretRef: # a reference to the secret that will be used to generate the user's password
128+
# name: <secretName>
129+
# roles:
130+
# - name: clusterAdmin
131+
# db: admin
132+
# - name: userAdminAnyDatabase
133+
# db: admin
134+
# - name: readWriteAnyDatabase
135+
# db: admin
136+
# - name: dbAdminAnyDatabase
137+
# db: admin
138+
# scramCredentialsSecretName: my-scram
139+
134140
# -- Array of extra K8s manifests to deploy
135141
extraObjects: []
136142
# - apiVersion: secrets-store.csi.x-k8s.io/v1

0 commit comments

Comments
 (0)