PB-6331: Add S3DisableSSL field to the JobOptions to fix tls secret m…

…ount to the maintenance job spec
portworx · Apr 18, 2024 · 7530705 · 7530705
1 parent 9a1ed66
commit 7530705
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/drivers/kopiamaintenance/kopiamaintenance.go b/pkg/drivers/kopiamaintenance/kopiamaintenance.go
@@ -292,7 +292,7 @@ func jobFor(
 		jobSpec.Volumes = append(jobSpec.Volumes, volume)
 	}
 
-	if drivers.CertFilePath != "" {
+	if drivers.CertFilePath != "" && !jobOption.S3DisableSSL {
 		volumeMount = corev1.VolumeMount{
 			Name:      utils.TLSCertMountVol,
 			MountPath: drivers.CertMount,
@@ -375,7 +375,7 @@ func jobFor(
 			},
 		}
 
-		if drivers.CertFilePath != "" {
+		if drivers.CertFilePath != "" && !jobOption.S3DisableSSL {
 			jobV1.Spec.JobTemplate.Spec.Template.Spec.Containers[0].VolumeMounts = append(
 				jobV1.Spec.JobTemplate.Spec.Template.Spec.Containers[0].VolumeMounts,
 				volumeMount,
@@ -408,7 +408,7 @@ func jobFor(
 		},
 	}
 
-	if drivers.CertFilePath != "" {
+	if drivers.CertFilePath != "" && !jobOption.S3DisableSSL {
 		jobV1Beta1.Spec.JobTemplate.Spec.Template.Spec.Containers[0].VolumeMounts = append(
 			jobV1Beta1.Spec.JobTemplate.Spec.Template.Spec.Containers[0].VolumeMounts,
 			volumeMount,

diff --git a/pkg/drivers/options.go b/pkg/drivers/options.go
@@ -58,6 +58,15 @@ type JobOpts struct {
 	AppCRNamespace             string
 	ResoureBackupName          string
 	ResoureBackupNamespace     string
+	S3DisableSSL               bool
+}
+
+// WithS3DisableSSL is job parameter
+func WithS3DisableSSL(disableSSL bool) JobOption {
+	return func(opts *JobOpts) error {
+		opts.S3DisableSSL = disableSSL
+		return nil
+	}
 }
 
 // WithResoureBackupName is job parameter