Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/k8s.io/client-go-0.31.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@hors
hors authored Sep 20, 2024
2 parents ec737a6 + fb5dbed commit a94b884
Show file tree
Hide file tree
Showing 78 changed files with 895 additions and 262 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

**Config/Logging/Testability**
- [ ] Are all needed new/changed options added to default YAML files?
- [ ] Are all needed new/changed options added to the [Helm Chart](https://github.com/percona/percona-helm-charts)?
- [ ] Did we add proper logging messages for operator actions?
- [ ] Did we ensure compatibility with the previous version or cluster upgrade process?
- [ ] Does the change support oldest and newest supported MongoDB version?
Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,15 @@ spec:
type: object
replset:
type: string
selective:
properties:
namespaces:
items:
type: string
type: array
withUsersAndRoles:
type: boolean
type: object
storageName:
type: string
type: object
Expand Down
50 changes: 50 additions & 0 deletions config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,8 @@ spec:
type: string
crVersion:
type: string
enableVolumeExpansion:
type: boolean
ignoreAnnotations:
items:
type: string
Expand Down Expand Up @@ -3374,10 +3376,24 @@ spec:
type: object
expose:
properties:
annotations:
additionalProperties:
type: string
type: object
enabled:
type: boolean
exposeType:
type: string
externalTrafficPolicy:
type: string
internalTrafficPolicy:
type: string
labels:
additionalProperties:
type: string
type: object
loadBalancerIP:
type: string
loadBalancerSourceRanges:
items:
type: string
Expand All @@ -3393,6 +3409,8 @@ spec:
additionalProperties:
type: string
type: object
type:
type: string
required:
- enabled
type: object
Expand Down Expand Up @@ -11034,10 +11052,24 @@ spec:
type: object
expose:
properties:
annotations:
additionalProperties:
type: string
type: object
enabled:
type: boolean
exposeType:
type: string
externalTrafficPolicy:
type: string
internalTrafficPolicy:
type: string
labels:
additionalProperties:
type: string
type: object
loadBalancerIP:
type: string
loadBalancerSourceRanges:
items:
type: string
Expand All @@ -11053,6 +11085,8 @@ spec:
additionalProperties:
type: string
type: object
type:
type: string
required:
- enabled
type: object
Expand Down Expand Up @@ -16448,8 +16482,22 @@ spec:
type: object
expose:
properties:
annotations:
additionalProperties:
type: string
type: object
exposeType:
type: string
externalTrafficPolicy:
type: string
internalTrafficPolicy:
type: string
labels:
additionalProperties:
type: string
type: object
loadBalancerIP:
type: string
loadBalancerSourceRanges:
items:
type: string
Expand All @@ -16467,6 +16515,8 @@ spec:
type: object
servicePerPod:
type: boolean
type:
type: string
type: object
hostAliases:
items:
Expand Down
4 changes: 4 additions & 0 deletions deploy/backup/restore.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ metadata:
spec:
clusterName: my-cluster-name
backupName: backup1
# selective:
# withUsersAndRoles: true
# namespaces:
# - "db.collection"
# pitr:
# type: date
# date: YYYY-MM-DD HH:MM:SS
Expand Down
59 changes: 59 additions & 0 deletions deploy/bundle.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,15 @@ spec:
type: object
replset:
type: string
selective:
properties:
namespaces:
items:
type: string
type: array
withUsersAndRoles:
type: boolean
type: object
storageName:
type: string
type: object
Expand Down Expand Up @@ -1071,6 +1080,8 @@ spec:
type: string
crVersion:
type: string
enableVolumeExpansion:
type: boolean
ignoreAnnotations:
items:
type: string
Expand Down Expand Up @@ -4047,10 +4058,24 @@ spec:
type: object
expose:
properties:
annotations:
additionalProperties:
type: string
type: object
enabled:
type: boolean
exposeType:
type: string
externalTrafficPolicy:
type: string
internalTrafficPolicy:
type: string
labels:
additionalProperties:
type: string
type: object
loadBalancerIP:
type: string
loadBalancerSourceRanges:
items:
type: string
Expand All @@ -4066,6 +4091,8 @@ spec:
additionalProperties:
type: string
type: object
type:
type: string
required:
- enabled
type: object
Expand Down Expand Up @@ -11707,10 +11734,24 @@ spec:
type: object
expose:
properties:
annotations:
additionalProperties:
type: string
type: object
enabled:
type: boolean
exposeType:
type: string
externalTrafficPolicy:
type: string
internalTrafficPolicy:
type: string
labels:
additionalProperties:
type: string
type: object
loadBalancerIP:
type: string
loadBalancerSourceRanges:
items:
type: string
Expand All @@ -11726,6 +11767,8 @@ spec:
additionalProperties:
type: string
type: object
type:
type: string
required:
- enabled
type: object
Expand Down Expand Up @@ -17121,8 +17164,22 @@ spec:
type: object
expose:
properties:
annotations:
additionalProperties:
type: string
type: object
exposeType:
type: string
externalTrafficPolicy:
type: string
internalTrafficPolicy:
type: string
labels:
additionalProperties:
type: string
type: object
loadBalancerIP:
type: string
loadBalancerSourceRanges:
items:
type: string
Expand All @@ -17140,6 +17197,8 @@ spec:
type: object
servicePerPod:
type: boolean
type:
type: string
type: object
hostAliases:
items:
Expand Down
30 changes: 21 additions & 9 deletions deploy/cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ metadata:
finalizers:
- percona.com/delete-psmdb-pods-in-order
# - percona.com/delete-psmdb-pvc
# - percona.com/delete-pitr-chunks
spec:
# platform: openshift
# clusterServiceDNSSuffix: svc.cluster.local
# clusterServiceDNSMode: "Internal"
# pause: true
# unmanaged: false
# enableVolumeExpansion: true
crVersion: 1.18.0
image: perconalab/percona-server-mongodb-operator:main-mongod7.0
imagePullPolicy: Always
Expand Down Expand Up @@ -197,13 +199,16 @@ spec:
# external-2: rs0-2.mycluster2.xyz
expose:
enabled: false
exposeType: ClusterIP
type: ClusterIP
# loadBalancerIP: 10.0.0.0/8
# loadBalancerSourceRanges:
# - 10.0.0.0/8
# serviceAnnotations:
# annotations:
# service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
# serviceLabels:
# labels:
# rack: rack-22
# internalTrafficPolicy: Local
# externalTrafficPolicy: Local
resources:
limits:
cpu: "300m"
Expand Down Expand Up @@ -408,13 +413,17 @@ spec:
maxUnavailable: 1
expose:
enabled: false
exposeType: ClusterIP
type: ClusterIP
# loadBalancerIP: 10.0.0.0/8
# loadBalancerSourceRanges:
# - 10.0.0.0/8
# serviceAnnotations:
# annotations:
# service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
# serviceLabels:
# labels:
# rack: rack-22
# nodePort: 32017
# internalTrafficPolicy: Local
# externalTrafficPolicy: Local
resources:
limits:
cpu: "300m"
Expand Down Expand Up @@ -516,15 +525,18 @@ spec:
cpu: "300m"
memory: "0.5G"
expose:
exposeType: ClusterIP
type: ClusterIP
# servicePerPod: true
# loadBalancerIP: 10.0.0.0/8
# loadBalancerSourceRanges:
# - 10.0.0.0/8
# serviceAnnotations:
# annotations:
# service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
# serviceLabels:
# labels:
# rack: rack-22
# nodePort: 32017
# internalTrafficPolicy: Local
# externalTrafficPolicy: Local
# hostAliases:
# - ip: "10.10.0.2"
# hostnames:
Expand Down
Loading

0 comments on commit a94b884

Please sign in to comment.