Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dev/K8SPSMDB-1014
Browse files Browse the repository at this point in the history
  • Loading branch information
@pooknull
pooknull committed Apr 12, 2024
2 parents 7b359f6 + 7d3e03f commit e9699d5
Show file tree
Hide file tree
Showing 156 changed files with 1,063 additions and 163 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ help: ## Display this help.
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

generate: controller-gen ## Generate CRDs and RBAC files
$(CONTROLLER_GEN) crd:maxDescLen=0 rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
$(CONTROLLER_GEN) crd:maxDescLen=0,allowDangerousTypes=true rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
$(CONTROLLER_GEN) object paths="./..." ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

$(DEPLOYDIR)/crd.yaml: kustomize generate
Expand Down
13 changes: 13 additions & 0 deletions config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,12 @@ spec:
type: string
credentialsSecret:
type: string
debugLogLevels:
type: string
endpointUrl:
type: string
forcePathStyle:
type: boolean
insecureSkipTLSVerify:
type: boolean
maxUploadParts:
Expand All @@ -129,6 +133,15 @@ spec:
type: string
region:
type: string
retryer:
properties:
maxRetryDelay:
type: string
minRetryDelay:
type: string
numMaxRetries:
type: integer
type: object
serverSideEncryption:
properties:
kmsKeyID:
Expand Down
13 changes: 13 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 @@ -89,8 +89,12 @@ spec:
type: string
credentialsSecret:
type: string
debugLogLevels:
type: string
endpointUrl:
type: string
forcePathStyle:
type: boolean
insecureSkipTLSVerify:
type: boolean
maxUploadParts:
Expand All @@ -99,6 +103,15 @@ spec:
type: string
region:
type: string
retryer:
properties:
maxRetryDelay:
type: string
minRetryDelay:
type: string
numMaxRetries:
type: integer
type: object
serverSideEncryption:
properties:
kmsKeyID:
Expand Down
54 changes: 54 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 @@ -46,6 +46,45 @@ spec:
additionalProperties:
type: string
type: object
configuration:
properties:
backupOptions:
properties:
oplogSpanMin:
type: number
priority:
additionalProperties:
type: string
type: object
timeouts:
properties:
startingStatus:
format: int32
type: integer
type: object
required:
- oplogSpanMin
type: object
restoreOptions:
properties:
batchSize:
type: integer
downloadChunkMb:
type: integer
maxDownloadBufferMb:
type: integer
mongodLocation:
type: string
mongodLocationMap:
additionalProperties:
type: string
type: object
numDownloadWorkers:
type: integer
numInsertionWorkers:
type: integer
type: object
type: object
containerSecurityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -249,8 +288,12 @@ spec:
type: string
credentialsSecret:
type: string
debugLogLevels:
type: string
endpointUrl:
type: string
forcePathStyle:
type: boolean
insecureSkipTLSVerify:
type: boolean
maxUploadParts:
Expand All @@ -259,6 +302,15 @@ spec:
type: string
region:
type: string
retryer:
properties:
maxRetryDelay:
type: string
minRetryDelay:
type: string
numMaxRetries:
type: integer
type: object
serverSideEncryption:
properties:
kmsKeyID:
Expand Down Expand Up @@ -7640,6 +7692,8 @@ spec:
type: string
ldapSecret:
type: string
sse:
type: string
ssl:
type: string
sslInternal:
Expand Down
80 changes: 80 additions & 0 deletions deploy/bundle.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,12 @@ spec:
type: string
credentialsSecret:
type: string
debugLogLevels:
type: string
endpointUrl:
type: string
forcePathStyle:
type: boolean
insecureSkipTLSVerify:
type: boolean
maxUploadParts:
Expand All @@ -128,6 +132,15 @@ spec:
type: string
region:
type: string
retryer:
properties:
maxRetryDelay:
type: string
minRetryDelay:
type: string
numMaxRetries:
type: integer
type: object
serverSideEncryption:
properties:
kmsKeyID:
Expand Down Expand Up @@ -252,8 +265,12 @@ spec:
type: string
credentialsSecret:
type: string
debugLogLevels:
type: string
endpointUrl:
type: string
forcePathStyle:
type: boolean
insecureSkipTLSVerify:
type: boolean
maxUploadParts:
Expand All @@ -262,6 +279,15 @@ spec:
type: string
region:
type: string
retryer:
properties:
maxRetryDelay:
type: string
minRetryDelay:
type: string
numMaxRetries:
type: integer
type: object
serverSideEncryption:
properties:
kmsKeyID:
Expand Down Expand Up @@ -693,6 +719,45 @@ spec:
additionalProperties:
type: string
type: object
configuration:
properties:
backupOptions:
properties:
oplogSpanMin:
type: number
priority:
additionalProperties:
type: string
type: object
timeouts:
properties:
startingStatus:
format: int32
type: integer
type: object
required:
- oplogSpanMin
type: object
restoreOptions:
properties:
batchSize:
type: integer
downloadChunkMb:
type: integer
maxDownloadBufferMb:
type: integer
mongodLocation:
type: string
mongodLocationMap:
additionalProperties:
type: string
type: object
numDownloadWorkers:
type: integer
numInsertionWorkers:
type: integer
type: object
type: object
containerSecurityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -896,8 +961,12 @@ spec:
type: string
credentialsSecret:
type: string
debugLogLevels:
type: string
endpointUrl:
type: string
forcePathStyle:
type: boolean
insecureSkipTLSVerify:
type: boolean
maxUploadParts:
Expand All @@ -906,6 +975,15 @@ spec:
type: string
region:
type: string
retryer:
properties:
maxRetryDelay:
type: string
minRetryDelay:
type: string
numMaxRetries:
type: integer
type: object
serverSideEncryption:
properties:
kmsKeyID:
Expand Down Expand Up @@ -8287,6 +8365,8 @@ spec:
type: string
ldapSecret:
type: string
sse:
type: string
ssl:
type: string
sslInternal:
Expand Down
26 changes: 25 additions & 1 deletion deploy/cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ spec:
encryptionKey: my-cluster-name-mongodb-encryption-key
# vault: my-cluster-name-vault
# ldapSecret: my-ldap-secret
# sse: my-cluster-name-sse
pmm:
enabled: false
image: perconalab/pmm-client:dev-latest
Expand Down Expand Up @@ -527,6 +528,10 @@ spec:
# sseAlgorithm: aws:kms
# sseCustomerAlgorithm: AES256
# sseCustomerKey: Y3VzdG9tZXIta2V5
# retryer:
# numMaxRetries: 3
# minRetryDelay: 30
# maxRetryDelay: 5
# region: us-west-2
# prefix: ""
# uploadPartSize: 10485760
Expand All @@ -547,14 +552,33 @@ spec:
# azure:
# container: CONTAINER-NAME
# prefix: PREFIX-NAME
# https://accountName.blob.core.windows.net
# endpointUrl: https://accountName.blob.core.windows.net
# credentialsSecret: SECRET-NAME
pitr:
enabled: false
oplogOnly: false
# oplogSpanMin: 10
compressionType: gzip
compressionLevel: 6
# backup:
# priority:
# "localhost:28019": 2.5
# "localhost:27018": 2.5
# compression: gzip
# compressionLevel: 0
# timeouts:
# startingStatus: 33
# oplogSpanMin:
# restore:
# batchSize: 500
# numInsertionWorkers: 10
# numDownloadWorkers: 4
# maxDownloadBufferMb: 0
# downloadChunkMb: 32
# mongodLocation: /usr/bin/mongo
# mongodLocationMap:
# "node01:2017": /usr/bin/mongo
# "node03:27017": /usr/bin/mongo
# tasks:
# - name: daily-s3-us-west
# enabled: true
Expand Down
Loading

0 comments on commit e9699d5

Please sign in to comment.