Skip to content

Commit e240318

Browse files
upgrade chart (#54)
* upgrade chart * add sensible defaults --------- Co-authored-by: Luke Lombardi <[email protected]>
1 parent e54621e commit e240318

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
chartVersion := 0.1.1
1+
chartVersion := 0.1.2
22
imageVersion := latest
33
GOOS ?= linux
44
GOARCH ?= $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')

deploy/charts/blobcache/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common
3-
repository: https://bjw-s.github.io/helm-charts
3+
repository: https://bjw-s-labs.github.io/helm-charts
44
version: 2.5.0
5-
digest: sha256:d40f33f9bf7747337babf6efd9561f1fadc0e2dea867b3146201ca3a8eb70e7a
6-
generated: "2024-02-08T17:59:12.280543-05:00"
5+
digest: sha256:9c7fd73836903c1d0a15deeb2732d39b5b363cc3d7c8a13be3adf5b6e099758e
6+
generated: "2025-05-03T10:37:42.036903-04:00"

deploy/charts/blobcache/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apiVersion: v2
22
name: beam-blobcache-v2-chart
33
description: A Helm chart for Blobcache
44
type: application
5-
version: 0.1.1
6-
appVersion: 0.1.1
5+
version: 0.1.2
6+
appVersion: 0.1.2
77
home: https://beam.cloud
88
dependencies:
99
- name: common
10-
repository: https://bjw-s.github.io/helm-charts
10+
repository: https://bjw-s-labs.github.io/helm-charts
1111
version: 2.5.0

deploy/charts/blobcache/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
# -- See the common values.yaml for all the options you can set.
3-
# https://github.com/bjw-s/helm-charts/blob/common-2.5.0/charts/library/common/values.yaml
3+
# https://github.com/bjw-s-labs/helm-charts/blob/common-2.5.0/charts/library/common/values.yaml
44
global:
55
fullnameOverride:
66

77
image:
88
repository: public.ecr.aws/n4e0e1y0/beam-blobcache-v2
9-
tag: latest
9+
tag: 0.1.30
1010

1111
controllers:
1212
main:

pkg/s3_client.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ import (
1313
"github.com/aws/aws-sdk-go-v2/service/s3"
1414
)
1515

16+
const (
17+
defaultDownloadConcurrency = 16
18+
defaultDownloadChunkSize = 64 * 1024 * 1024 // 64MB
19+
)
20+
1621
type S3Client struct {
1722
Client *s3.Client
1823
Source S3SourceConfig
@@ -45,6 +50,14 @@ func NewS3Client(ctx context.Context, sourceConfig S3SourceConfig, serverConfig
4550
cfg.BaseEndpoint = aws.String(sourceConfig.EndpointURL)
4651
}
4752

53+
if serverConfig.S3DownloadConcurrency <= 0 {
54+
serverConfig.S3DownloadConcurrency = defaultDownloadConcurrency
55+
}
56+
57+
if serverConfig.S3DownloadChunkSize <= 0 {
58+
serverConfig.S3DownloadChunkSize = defaultDownloadChunkSize
59+
}
60+
4861
s3Client := s3.NewFromConfig(cfg)
4962
return &S3Client{
5063
Client: s3Client,

0 commit comments

Comments
 (0)