From 3e637a62c9e1e59d6a8f99322b9ecc341e200b44 Mon Sep 17 00:00:00 2001 From: Rob Nickmans Date: Mon, 19 Aug 2024 14:45:24 +0200 Subject: [PATCH 1/2] fix: add secret only when not in secret file --- pkg/cluster/k8sres.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index eb4402f03..c1125ced9 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -2478,7 +2478,9 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { } case "gcs": - envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials}) + if c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials != "" { + envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials}) + } case "az": envVars = appendEnvVars(envVars, []v1.EnvVar{ @@ -2489,11 +2491,11 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { { Name: "LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER", Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageContainer, - }, - { - Name: "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY", - Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey, }}...) + + if c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey != "" { + envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY", Value: c.OpConfig.LogicalBackup.LogicalBackupAzureStorageAccountKey}) + } } return envVars From 0fee00404508fc367d87a94bb6c69ac1b0bc1bd5 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Tue, 20 Aug 2024 14:57:02 +0200 Subject: [PATCH 2/2] Update pkg/cluster/k8sres.go --- pkg/cluster/k8sres.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index b795725bc..8934b6b49 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -2481,9 +2481,9 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar { } case "gcs": - if c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials != "" { - envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials}) - } + if c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials != "" { + envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_GOOGLE_APPLICATION_CREDENTIALS", Value: c.OpConfig.LogicalBackup.LogicalBackupGoogleApplicationCredentials}) + } case "az": envVars = appendEnvVars(envVars, []v1.EnvVar{