Skip to content

Commit

Permalink
[installer]: ensure the incluster minio region is "local"
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Emms authored and roboquat committed Nov 12, 2021
1 parent 398c331 commit 43f041d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion installer/example-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jaegerOperator:
inCluster: true
kind: Full
metadata:
region: "foobar"
region: "local"
objectStorage:
inCluster: true
observability:
Expand Down
2 changes: 1 addition & 1 deletion installer/pkg/common/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}
Expand Down
1 change: 1 addition & 0 deletions installer/pkg/config/v1/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 43f041d

Please sign in to comment.