Skip to content

Commit

Permalink
Merge branch 'main' into K8SPXC-1341
Browse files Browse the repository at this point in the history
  • Loading branch information
@hors
hors authored Jan 11, 2024
2 parents fad67e0 + 3832924 commit c482ad9
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 104 deletions.
4 changes: 0 additions & 4 deletions deploy/cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,10 +528,6 @@ spec:
# command: [ "/bin/true" ]
# loadBalancerSourceRanges:
# - 10.0.0.0/8
# serviceAnnotations:
# service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
# serviceLabels:
# rack: rack-23
logcollector:
enabled: true
image: perconalab/percona-xtradb-cluster-operator:main-logcollector
Expand Down
7 changes: 7 additions & 0 deletions e2e-tests/demand-backup/compare/secret_demand-backup-mysql-init.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
data:
init.sql: U0VUIFNFU1NJT04gd3NyZXBfb249T0ZGOwpTRVQgU0VTU0lPTiBzcWxfbG9nX2Jpbj0wOwpBTFRFUiBVU0VSICdtb25pdG9yJ0AnJScgSURFTlRJRklFRCBCWSAnbmV3cGFzcyc7CkFMVEVSIFVTRVIgJ3h0cmFiYWNrdXAnQCclJyBJREVOVElGSUVEIEJZICduZXdwYXNzJzsK
kind: Secret
metadata:
name: demand-backup-mysql-init
type: Opaque
2 changes: 1 addition & 1 deletion e2e-tests/demand-backup/conf/demand-backup.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
antiAffinityTopologyKey: "kubernetes.io/hostname"
proxysql:
enabled: true
size: 1
size: 2
image: -proxysql
resources:
requests:
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/demand-backup/run
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ main() {
kubectl logs "$backup_job_name" | egrep "xbcloud put --storage=s3 --parallel=4 --md5 --insecure (--curl-retriable-errors=7 )?--parallel=2 --curl-retriable-errors=8"
kubectl logs "$backup_job_name" | grep "xbstream -x -C /tmp --parallel=2"

new_pass=$(echo -n "newpass" | base64)
kubectl_bin patch secret my-cluster-secrets -p="{\"data\":{\"xtrabackup\": \"${new_pass}\", \"monitor\": \"${new_pass}\"}}"
wait_cluster_consistency ${cluster} 3 2

compare_kubectl secret/${cluster}-mysql-init

run_recovery_check "$cluster" "on-demand-backup-minio"
compare_kubectl job/restore-job-on-demand-backup-minio-demand-backup
restore_job_name=$(kubectl get pod -l job-name=restore-job-on-demand-backup-minio-demand-backup -o jsonpath='{.items[].metadata.name}')
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/pitr/compare/secret_pitr-mysql-init.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
data:
init.sql: U0VUIFNFU1NJT04gd3NyZXBfb249T0ZGOwpTRVQgU0VTU0lPTiBzcWxfbG9nX2Jpbj0wOwpBTFRFUiBVU0VSICd4dHJhYmFja3VwJ0AnJScgSURFTlRJRklFRCBCWSAncGFzczMnOwo=
init.sql: U0VUIFNFU1NJT04gd3NyZXBfb249T0ZGOwpTRVQgU0VTU0lPTiBzcWxfbG9nX2Jpbj0wOwpBTFRFUiBVU0VSICd4dHJhYmFja3VwJ0AnJScgSURFTlRJRklFRCBCWSAncGFzczEnOwpBTFRFUiBVU0VSICd4dHJhYmFja3VwJ0AnJScgSURFTlRJRklFRCBCWSAncGFzczInOwpBTFRFUiBVU0VSICd4dHJhYmFja3VwJ0AnJScgSURFTlRJRklFRCBCWSAncGFzczMnOwo=
kind: Secret
metadata:
name: pitr-mysql-init
Expand Down
32 changes: 16 additions & 16 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ module github.com/percona/percona-xtradb-cluster-operator
go 1.21

require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1
github.com/Percona-Lab/percona-version-service/api v0.0.0-20201216104127-a39f2dded3cc
github.com/caarlos0/env v3.5.0+incompatible
github.com/cert-manager/cert-manager v1.13.3
github.com/flosch/pongo2/v6 v6.0.0
github.com/go-ini/ini v1.67.0
github.com/go-logr/logr v1.3.0
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.3.0
github.com/go-openapi/errors v0.20.4
github.com/go-openapi/errors v0.21.0
github.com/go-openapi/runtime v0.26.2
github.com/go-openapi/strfmt v0.21.8
github.com/go-openapi/strfmt v0.22.0
github.com/go-openapi/swag v0.22.7
github.com/go-openapi/validate v0.22.3
github.com/go-openapi/validate v0.22.6
github.com/go-sql-driver/mysql v1.7.1
github.com/google/go-cmp v0.6.0
github.com/hashicorp/go-version v1.6.0
Expand All @@ -25,17 +25,17 @@ require (
github.com/pkg/errors v0.9.1
github.com/robfig/cron/v3 v3.0.1
go.uber.org/zap v1.26.0
golang.org/x/sync v0.5.0
golang.org/x/sync v0.6.0
k8s.io/api v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.29.0
k8s.io/klog/v2 v2.110.1
k8s.io/klog/v2 v2.120.0
sigs.k8s.io/controller-runtime v0.16.1
)

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -46,19 +46,19 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/loads v0.21.2 // indirect
github.com/go-openapi/spec v0.20.11 // indirect
github.com/go-openapi/analysis v0.22.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/loads v0.21.5 // indirect
github.com/go-openapi/spec v0.20.13 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand Down Expand Up @@ -91,7 +91,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
Expand Down
Loading

0 comments on commit c482ad9

Please sign in to comment.