Skip to content

Commit cb06a1e

Browse files
nickmansrobFxKu
andauthored
fix: add secret only when not in secret file (#2732)
* fix: add secret only when not in secret file * fix indentation --------- Co-authored-by: Felix Kunde <felix-kunde@gmx.de>
1 parent 2582b93 commit cb06a1e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkg/cluster/k8sres.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,9 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
24812481
}
24822482

24832483
case "gcs":
2484-
envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials})
2484+
if c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials != "" {
2485+
envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials})
2486+
}
24852487

24862488
case "az":
24872489
envVars = appendEnvVars(envVars, []v1.EnvVar{
@@ -2492,11 +2494,11 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
24922494
{
24932495
Name: "LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER",
24942496
Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageContainer,
2495-
},
2496-
{
2497-
Name: "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY",
2498-
Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey,
24992497
}}...)
2498+
2499+
if c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey != "" {
2500+
envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY", Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey})
2501+
}
25002502
}
25012503

25022504
return envVars

0 commit comments

Comments
 (0)