[installer]: allow the s3 connection to be insecure

Simon Emms · Simon Emms · commit 3b57e44efec3 · 2022-09-23T14:01:38.000Z
diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden
diff --git a/install/installer/pkg/common/storage.go b/install/installer/pkg/common/storage.go
@@ -51,7 +51,7 @@ func StorageConfig(context *RenderContext) storageconfig.StorageConfig {
 				Endpoint:            context.Config.ObjectStorage.S3.Endpoint,
 				AccessKeyIdFile:     filepath.Join(storageMount, "accessKeyId"),
 				SecretAccessKeyFile: filepath.Join(storageMount, "secretAccessKey"),
-				Secure:              true,
+				Secure:              !context.Config.ObjectStorage.S3.AllowInsecureConnection,
 				Region:              context.Config.Metadata.Region,
 				ParallelUpload:      100,
 
diff --git a/install/installer/pkg/config/v1/config.go b/install/installer/pkg/config/v1/config.go
@@ -255,6 +255,8 @@ type ObjectStorageS3 struct {
 	// BucketName sets the name of an existing bucket to enable the "single bucket mode"
 	// If no name is configured, the old "one bucket per user" behaviour kicks in.
 	BucketName string `json:"bucket"`
+
+	AllowInsecureConnection bool `json:"allowInsecureConnection"`
 }
 
 type ObjectStorageCloudStorage struct {

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,8 @@ type ObjectStorageS3 struct {`
`255`	`255`	`// BucketName sets the name of an existing bucket to enable the "single bucket mode"`
`256`	`256`	`// If no name is configured, the old "one bucket per user" behaviour kicks in.`
`257`	`257`	BucketName string `json:"bucket"`
	`258`	`+`
	`259`	+ AllowInsecureConnection bool `json:"allowInsecureConnection"`
`258`	`260`	`}`
`259`	`261`
`260`	`262`	`type ObjectStorageCloudStorage struct {`