From ad5dd109d28dc2670006ad9be8519ed23929e769 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 11 Dec 2024 17:28:34 +0800 Subject: [PATCH] Update secret type for multisecret driver and fix an issue Signed-off-by: Vincent --- pkg/storage/driver/multisecrets.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/storage/driver/multisecrets.go b/pkg/storage/driver/multisecrets.go index 615c3bcbb..468754cd8 100644 --- a/pkg/storage/driver/multisecrets.go +++ b/pkg/storage/driver/multisecrets.go @@ -352,7 +352,7 @@ func newMultiSecretsObject(key string, rls *rspb.Release, lbs labels, chunkSizeE Name: instanceName, Labels: kblabels.Merge(lbs.toMap(), lbs2.toMap()), }, - Type: "helm.sh/release.v1", + Type: "helm.sh/release-multisecret.v1", Data: map[string][]byte{"release": []byte(str), "chunk": []byte(fmt.Sprintf("%d", i)), "chunks": []byte(fmt.Sprintf("%d", len(slices)))}, }) } @@ -413,12 +413,14 @@ func getMaxChunkSize(key string, multiSecretImpl *MultiSecrets, chunkSizeExist i sz = obj.ObjectMeta.Labels["chunksize"] if sz != "" { size, err := strconv.Atoi(sz) - if err == nil && size < maxChunkSize { + if err == nil && size <= maxChunkSize { chunkSize = size } else { log.Fatal(errors.Wrapf(err, "newSecretsObject: cannot use chunk size: %s", sz)) //return nil, errors.Wrapf(err, "newSecretsObject: cannot use chunk size: %s", sz) } + } else { + chunkSize = maxChunkSize } } else { // CASE 3: use the default or the envvar @@ -426,7 +428,7 @@ func getMaxChunkSize(key string, multiSecretImpl *MultiSecrets, chunkSizeExist i sz := strings.TrimSpace(os.Getenv("MULTISECRETS_CHUNKSIZE")) if sz != "" { size, err := strconv.Atoi(sz) - if err == nil && size < maxChunkSize { + if err == nil && size <= maxChunkSize { chunkSize = size } else { log.Fatal(errors.Wrapf(err, "newSecretsObject: cannot use chunk size: %s", sz))