Skip to content

K8SPS-623: fix GCS backups #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pooknull wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −12
Open

K8SPS-623: fix GCS backups #1194

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6147aaf
K8SPS-623: fix GCS backups
pooknull Jan 21, 2026
956872e
Update pkg/xtrabackup/storage/options.go
pooknull Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions pkg/xtrabackup/storage/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

apiv1 "github.com/percona/percona-server-mysql-operator/api/v1"
"github.com/percona/percona-server-mysql-operator/pkg/secret"
"github.com/percona/percona-server-mysql-operator/pkg/xtrabackup"
)

Expand Down Expand Up @@ -63,16 +64,16 @@ func GetOptionsFromBackupStatus(ctx context.Context, cl client.Client, cluster *
}

func getGCSOptions(ctx context.Context, cl client.Client, cluster *apiv1.PerconaServerMySQL, storageName string, backupStatus apiv1.PerconaServerMySQLBackupStatus) (Options, error) {
secret := new(corev1.Secret)
s := new(corev1.Secret)
err := cl.Get(ctx, types.NamespacedName{
Name: backupStatus.Storage.GCS.CredentialsSecret,
Namespace: cluster.Namespace,
}, secret)
}, s)
if client.IgnoreNotFound(err) != nil {
return nil, errors.Wrap(err, "failed to get secret")
}
accessKeyID := string(secret.Data["AWS_ACCESS_KEY_ID"])
secretAccessKey := string(secret.Data["AWS_SECRET_ACCESS_KEY"])
accessKeyID := string(s.Data[secret.CredentialsGCSAccessKey])
Copy link
Contributor

@gkech gkech Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we ensure that the data actually contain the expected key?

e.g.

accessKeyBytes, ok := s.Data[secret.CredentialsGCSAccessKey]

secretAccessKey := string(s.Data[secret.CredentialsGCSSecretKey])

bucket, prefix := backupStatus.Storage.GCS.BucketAndPrefix()
if bucket == "" {
Expand Down Expand Up @@ -105,16 +106,16 @@ func getGCSOptions(ctx context.Context, cl client.Client, cluster *apiv1.Percona
}

func getAzureOptions(ctx context.Context, cl client.Client, ns string, backupStatus apiv1.PerconaServerMySQLBackupStatus) (*AzureOptions, error) {
secret := new(corev1.Secret)
s := new(corev1.Secret)
err := cl.Get(ctx, types.NamespacedName{
Name: backupStatus.Storage.Azure.CredentialsSecret,
Namespace: ns,
}, secret)
}, s)
if err != nil {
return nil, errors.Wrap(err, "failed to get secret")
}
accountName := string(secret.Data["AZURE_STORAGE_ACCOUNT_NAME"])
accountKey := string(secret.Data["AZURE_STORAGE_ACCOUNT_KEY"])
accountName := string(s.Data["AZURE_STORAGE_ACCOUNT_NAME"])
accountKey := string(s.Data["AZURE_STORAGE_ACCOUNT_KEY"])

container, prefix := backupStatus.Storage.Azure.ContainerAndPrefix()
if container == "" {
Expand All @@ -135,16 +136,16 @@ func getAzureOptions(ctx context.Context, cl client.Client, ns string, backupSta
}

func getS3Options(ctx context.Context, cl client.Client, cluster *apiv1.PerconaServerMySQL, storageName string, backupStatus apiv1.PerconaServerMySQLBackupStatus) (*S3Options, error) {
secret := new(corev1.Secret)
s := new(corev1.Secret)
err := cl.Get(ctx, types.NamespacedName{
Name: backupStatus.Storage.S3.CredentialsSecret,
Namespace: cluster.Namespace,
}, secret)
}, s)
if client.IgnoreNotFound(err) != nil {
return nil, errors.Wrap(err, "failed to get secret")
}
accessKeyID := string(secret.Data["AWS_ACCESS_KEY_ID"])
secretAccessKey := string(secret.Data["AWS_SECRET_ACCESS_KEY"])
accessKeyID := string(s.Data[secret.CredentialsAWSAccessKey])
secretAccessKey := string(s.Data[secret.CredentialsAWSSecretKey])

bucket, prefix := backupStatus.Storage.S3.BucketAndPrefix()
if bucket == "" {
Expand Down
Loading