From 43f041d8f334294a24dafde28563a5edd199e3d0 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Wed, 10 Nov 2021 13:14:57 +0000 Subject: [PATCH] [installer]: ensure the incluster minio region is "local" --- installer/example-config.yaml | 2 +- installer/pkg/common/storage.go | 2 +- installer/pkg/config/v1/config.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/installer/example-config.yaml b/installer/example-config.yaml index 6d1d9baadff5b6..73e27c4d79167e 100644 --- a/installer/example-config.yaml +++ b/installer/example-config.yaml @@ -14,7 +14,7 @@ jaegerOperator: inCluster: true kind: Full metadata: - region: "foobar" + region: "local" objectStorage: inCluster: true observability: diff --git a/installer/pkg/common/storage.go b/installer/pkg/common/storage.go index 4d5fd9bf3add3b..175dd4bb0c191f 100644 --- a/installer/pkg/common/storage.go +++ b/installer/pkg/common/storage.go @@ -50,7 +50,7 @@ func StorageConfig(context *RenderContext) storageconfig.StorageConfig { AccessKeyID: context.Values.StorageAccessKey, SecretAccessKey: context.Values.StorageSecretKey, Secure: false, - Region: context.Config.Metadata.Region, + Region: "local", // Local Minio requires this value - workspace allocation fails if not set to this ParallelUpload: 6, }, } diff --git a/installer/pkg/config/v1/config.go b/installer/pkg/config/v1/config.go index b7eeffae6fe7fa..e8ffd2ff5f389c 100644 --- a/installer/pkg/config/v1/config.go +++ b/installer/pkg/config/v1/config.go @@ -43,6 +43,7 @@ func (v version) Defaults(in interface{}) error { cfg.Certificate.Kind = ObjectRefSecret cfg.Certificate.Name = "https-certificates" cfg.Database.InCluster = pointer.Bool(true) + cfg.Metadata.Region = "local" cfg.ObjectStorage.InCluster = pointer.Bool(true) cfg.ContainerRegistry.InCluster = pointer.Bool(true) cfg.Jaeger.InCluster = pointer.Bool(true)