Skip to content

Commit 625a5cc

Browse files
mms-build-accountmms-build-account
authored
Updated (#347)
1 parent 8718841 commit 625a5cc

File tree

9 files changed

+1219
-27
lines changed

9 files changed

+1219
-27
lines changed

‎charts/enterprise-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: enterprise-operator
33
description: MongoDB Kubernetes Enterprise Operator
4-
version: 1.27.0
4+
version: 1.28.0
55
kubeVersion: '>=1.16-0'
66
type: application
77
keywords:

‎charts/enterprise-operator/crds/mongodb.com_mongodb.yaml

Lines changed: 938 additions & 3 deletions
Large diffs are not rendered by default.

‎charts/enterprise-operator/crds/mongodb.com_mongodbmulticluster.yaml

Lines changed: 91 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ spec:
424424
type: object
425425
type: object
426426
memberConfig:
427-
description: MemberConfig
427+
description: MemberConfig allows to specify votes, priorities
428+
and tags for each of the mongodb process.
428429
items:
429430
properties:
430431
priority:
@@ -437,10 +438,63 @@ spec:
437438
type: integer
438439
type: object
439440
type: array
440-
x-kubernetes-preserve-unknown-fields: true
441441
members:
442442
description: Amount of members for this MongoDB Replica Set
443443
type: integer
444+
podSpec:
445+
properties:
446+
persistence:
447+
description: Note, that this field is used by MongoDB resources
448+
only, let's keep it here for simplicity
449+
properties:
450+
multiple:
451+
properties:
452+
data:
453+
properties:
454+
labelSelector:
455+
type: object
456+
x-kubernetes-preserve-unknown-fields: true
457+
storage:
458+
type: string
459+
storageClass:
460+
type: string
461+
type: object
462+
journal:
463+
properties:
464+
labelSelector:
465+
type: object
466+
x-kubernetes-preserve-unknown-fields: true
467+
storage:
468+
type: string
469+
storageClass:
470+
type: string
471+
type: object
472+
logs:
473+
properties:
474+
labelSelector:
475+
type: object
476+
x-kubernetes-preserve-unknown-fields: true
477+
storage:
478+
type: string
479+
storageClass:
480+
type: string
481+
type: object
482+
type: object
483+
single:
484+
properties:
485+
labelSelector:
486+
type: object
487+
x-kubernetes-preserve-unknown-fields: true
488+
storage:
489+
type: string
490+
storageClass:
491+
type: string
492+
type: object
493+
type: object
494+
podTemplate:
495+
type: object
496+
x-kubernetes-preserve-unknown-fields: true
497+
type: object
444498
service:
445499
description: this is an optional service, it will get the name
446500
"<rsName>-service" in case not provided
@@ -831,6 +885,15 @@ spec:
831885
required:
832886
- spec
833887
type: object
888+
topology:
889+
description: |-
890+
Topology sets the desired cluster topology of MongoDB resources
891+
It defaults (if empty or not set) to SingleCluster. If MultiCluster specified,
892+
then clusterSpecList field is mandatory and at least one member cluster has to be specified.
893+
enum:
894+
- SingleCluster
895+
- MultiCluster
896+
type: string
834897
type:
835898
enum:
836899
- Standalone
@@ -882,6 +945,18 @@ spec:
882945
type: integer
883946
phase:
884947
type: string
948+
pvc:
949+
items:
950+
properties:
951+
phase:
952+
type: string
953+
statefulsetName:
954+
type: string
955+
required:
956+
- phase
957+
- statefulsetName
958+
type: object
959+
type: array
885960
resourcesNotReady:
886961
items:
887962
description: ResourceNotReady describes the dependent
@@ -918,6 +993,8 @@ spec:
918993
type: object
919994
type: array
920995
type: object
996+
featureCompatibilityVersion:
997+
type: string
921998
lastTransition:
922999
type: string
9231000
link:
@@ -929,6 +1006,18 @@ spec:
9291006
type: integer
9301007
phase:
9311008
type: string
1009+
pvc:
1010+
items:
1011+
properties:
1012+
phase:
1013+
type: string
1014+
statefulsetName:
1015+
type: string
1016+
required:
1017+
- phase
1018+
- statefulsetName
1019+
type: object
1020+
type: array
9321021
resourcesNotReady:
9331022
items:
9341023
description: ResourceNotReady describes the dependent resource which

‎charts/enterprise-operator/crds/mongodb.com_mongodbusers.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,18 @@ spec:
107107
type: string
108108
project:
109109
type: string
110+
pvc:
111+
items:
112+
properties:
113+
phase:
114+
type: string
115+
statefulsetName:
116+
type: string
117+
required:
118+
- phase
119+
- statefulsetName
120+
type: object
121+
type: array
110122
resourcesNotReady:
111123
items:
112124
description: ResourceNotReady describes the dependent resource which

‎charts/enterprise-operator/crds/mongodb.com_opsmanagers.yaml

Lines changed: 116 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,8 @@ spec:
393393
type: object
394394
type: object
395395
memberConfig:
396-
description: MemberConfig
396+
description: MemberConfig allows to specify votes, priorities
397+
and tags for each of the mongodb process.
397398
items:
398399
properties:
399400
priority:
@@ -406,11 +407,64 @@ spec:
406407
type: integer
407408
type: object
408409
type: array
409-
x-kubernetes-preserve-unknown-fields: true
410410
members:
411411
description: Amount of members for this MongoDB Replica
412412
Set
413413
type: integer
414+
podSpec:
415+
properties:
416+
persistence:
417+
description: Note, that this field is used by MongoDB
418+
resources only, let's keep it here for simplicity
419+
properties:
420+
multiple:
421+
properties:
422+
data:
423+
properties:
424+
labelSelector:
425+
type: object
426+
x-kubernetes-preserve-unknown-fields: true
427+
storage:
428+
type: string
429+
storageClass:
430+
type: string
431+
type: object
432+
journal:
433+
properties:
434+
labelSelector:
435+
type: object
436+
x-kubernetes-preserve-unknown-fields: true
437+
storage:
438+
type: string
439+
storageClass:
440+
type: string
441+
type: object
442+
logs:
443+
properties:
444+
labelSelector:
445+
type: object
446+
x-kubernetes-preserve-unknown-fields: true
447+
storage:
448+
type: string
449+
storageClass:
450+
type: string
451+
type: object
452+
type: object
453+
single:
454+
properties:
455+
labelSelector:
456+
type: object
457+
x-kubernetes-preserve-unknown-fields: true
458+
storage:
459+
type: string
460+
storageClass:
461+
type: string
462+
type: object
463+
type: object
464+
podTemplate:
465+
type: object
466+
x-kubernetes-preserve-unknown-fields: true
467+
type: object
414468
service:
415469
description: this is an optional service, it will get the
416470
name "<rsName>-service" in case not provided
@@ -474,16 +528,9 @@ spec:
474528
type: string
475529
featureCompatibilityVersion:
476530
type: string
477-
logLevel:
478-
enum:
479-
- DEBUG
480-
- INFO
481-
- WARN
482-
- ERROR
483-
- FATAL
484-
type: string
485531
memberConfig:
486-
description: MemberConfig
532+
description: MemberConfig allows to specify votes, priorities
533+
and tags for each of the mongodb process.
487534
items:
488535
properties:
489536
priority:
@@ -540,6 +587,8 @@ spec:
540587
podSpec:
541588
properties:
542589
persistence:
590+
description: Note, that this field is used by MongoDB resources
591+
only, let's keep it here for simplicity
543592
properties:
544593
multiple:
545594
properties:
@@ -1611,6 +1660,8 @@ spec:
16111660
type: array
16121661
configServerCount:
16131662
type: integer
1663+
featureCompatibilityVersion:
1664+
type: string
16141665
lastTransition:
16151666
type: string
16161667
link:
@@ -1628,6 +1679,18 @@ spec:
16281679
type: integer
16291680
phase:
16301681
type: string
1682+
pvc:
1683+
items:
1684+
properties:
1685+
phase:
1686+
type: string
1687+
statefulsetName:
1688+
type: string
1689+
required:
1690+
- phase
1691+
- statefulsetName
1692+
type: object
1693+
type: array
16311694
resourcesNotReady:
16321695
items:
16331696
description: ResourceNotReady describes the dependent resource
@@ -1657,6 +1720,24 @@ spec:
16571720
type: array
16581721
shardCount:
16591722
type: integer
1723+
sizeStatusInClusters:
1724+
description: MongodbShardedSizeStatusInClusters describes the
1725+
number and sizes of replica sets members deployed across member
1726+
clusters
1727+
properties:
1728+
configServerMongodsInClusters:
1729+
additionalProperties:
1730+
type: integer
1731+
type: object
1732+
mongosCountInClusters:
1733+
additionalProperties:
1734+
type: integer
1735+
type: object
1736+
shardMongodsInClusters:
1737+
additionalProperties:
1738+
type: integer
1739+
type: object
1740+
type: object
16601741
version:
16611742
type: string
16621743
warnings:
@@ -1687,6 +1768,18 @@ spec:
16871768
type: integer
16881769
phase:
16891770
type: string
1771+
pvc:
1772+
items:
1773+
properties:
1774+
phase:
1775+
type: string
1776+
statefulsetName:
1777+
type: string
1778+
required:
1779+
- phase
1780+
- statefulsetName
1781+
type: object
1782+
type: array
16901783
resourcesNotReady:
16911784
items:
16921785
description: ResourceNotReady describes the dependent resource
@@ -1743,6 +1836,18 @@ spec:
17431836
type: integer
17441837
phase:
17451838
type: string
1839+
pvc:
1840+
items:
1841+
properties:
1842+
phase:
1843+
type: string
1844+
statefulsetName:
1845+
type: string
1846+
required:
1847+
- phase
1848+
- statefulsetName
1849+
type: object
1850+
type: array
17461851
replicas:
17471852
type: integer
17481853
resourcesNotReady:

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,19 @@ rules:
9090
- list
9191
- watch
9292
{{- end}}
93-
93+
{{ if .Values.operator.enablePVCResize }}
94+
- apiGroups:
95+
- ''
96+
resources:
97+
- persistentvolumeclaims
98+
verbs:
99+
- get
100+
- delete
101+
- list
102+
- watch
103+
- patch
104+
- update
105+
{{- end}}
94106
{{- range $idx, $namespace := $watchNamespace }}
95107

96108
{{- $namespaceBlock := "" }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,11 @@ spec:
149149
- name: MONGODB_REPO_URL
150150
value: {{ .Values.mongodb.repo }}
151151
- name: MDB_IMAGE_TYPE
152+
{{- if eq .Values.operator.mdbDefaultArchitecture "static" }}
153+
value: "ubi9"
154+
{{- else }}
152155
value: {{ .Values.mongodb.imageType }}
156+
{{- end }}
153157
{{- if eq .Values.mongodb.appdbAssumeOldFormat true }}
154158
- name: MDB_APPDB_ASSUME_OLD_FORMAT
155159
value: 'true'

0 commit comments

Comments
 (0)