Skip to content

Commit 743a463

Browse files
committed
update: runtime/secrets to v0.67.0 with new Key constants
Signed-off-by: cappyzawa <[email protected]>
1 parent 11522d2 commit 743a463

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/fluxcd/pkg/lockedfile v0.6.0
3939
github.com/fluxcd/pkg/masktoken v0.7.0
4040
github.com/fluxcd/pkg/oci v0.49.0
41-
github.com/fluxcd/pkg/runtime v0.66.0
41+
github.com/fluxcd/pkg/runtime v0.67.0
4242
github.com/fluxcd/pkg/sourceignore v0.12.0
4343
github.com/fluxcd/pkg/ssh v0.19.0
4444
github.com/fluxcd/pkg/tar v0.12.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,8 @@ github.com/fluxcd/pkg/masktoken v0.7.0 h1:pitmyOg2pUVdW+nn2Lk/xqm2TaA08uxvOC0ns3
395395
github.com/fluxcd/pkg/masktoken v0.7.0/go.mod h1:Lc1uoDjO1GY6+YdkK+ZqqBIBWquyV58nlSJ5S1N1IYU=
396396
github.com/fluxcd/pkg/oci v0.49.0 h1:L8/dmNSIzqu6X8vzIkPLrW8NAF7Et/SnOuI8WJkXeq8=
397397
github.com/fluxcd/pkg/oci v0.49.0/go.mod h1:iZkF4bQTpc6YOU5IJWMBp0Q8voGm7bkMYiAarJ9407U=
398-
github.com/fluxcd/pkg/runtime v0.66.0 h1:efOrHg/a+q0iUInCZ+dnTZRG8sk89sW340SC93HhnHg=
399-
github.com/fluxcd/pkg/runtime v0.66.0/go.mod h1:2/cfa1WspakXzEol7tstyzShAQb43pHa8FEXq7vCMf8=
398+
github.com/fluxcd/pkg/runtime v0.67.0 h1:vmMFfbC72/KXJdCMUc7wpDQvWYzd2LbseG+2n80ritQ=
399+
github.com/fluxcd/pkg/runtime v0.67.0/go.mod h1:2/cfa1WspakXzEol7tstyzShAQb43pHa8FEXq7vCMf8=
400400
github.com/fluxcd/pkg/sourceignore v0.12.0 h1:jCIe6d50rQ3wdXPF0+PhhqN0XrTRIq3upMomPelI8Mw=
401401
github.com/fluxcd/pkg/sourceignore v0.12.0/go.mod h1:dc0zvkuXM5OgL/b3IkrVuwvPjj1zJn4NBUMH45uJ4Y0=
402402
github.com/fluxcd/pkg/ssh v0.19.0 h1:njSwNJQZ+3TGhBXshU/2TbqvooMbf6lQzFn7w6vuaKI=

internal/helm/getter/client_opts.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ func setupAuthSecret(ctx context.Context, c client.Client, obj *sourcev1.HelmRep
176176

177177
var deprecatedTLS bool
178178

179-
_, hasUsername := authSecret.Data[secrets.UsernameKey]
180-
_, hasPassword := authSecret.Data[secrets.PasswordKey]
179+
_, hasUsername := authSecret.Data[secrets.KeyUsername]
180+
_, hasPassword := authSecret.Data[secrets.KeyPassword]
181181

182182
if hasUsername || hasPassword {
183183
username, password, err := secrets.BasicAuthFromSecret(ctx, authSecret)
@@ -288,8 +288,8 @@ func storeTLSCertificateFilesForOCI(ctx context.Context, certSecret, authSecret
288288
}
289289

290290
if tlsSecret != nil {
291-
if certData, exists := tlsSecret.Data[secrets.TLSCertKey]; exists {
292-
if keyData, keyExists := tlsSecret.Data[secrets.TLSPrivateKeyKey]; keyExists {
291+
if certData, exists := tlsSecret.Data[secrets.KeyTLSCert]; exists {
292+
if keyData, keyExists := tlsSecret.Data[secrets.KeyTLSPrivateKey]; keyExists {
293293
certFile, err = writeToFile(certData, certFileName, path)
294294
if err != nil {
295295
return "", "", "", err
@@ -301,7 +301,7 @@ func storeTLSCertificateFilesForOCI(ctx context.Context, certSecret, authSecret
301301
}
302302
}
303303

304-
if caData, exists := tlsSecret.Data[secrets.CACertKey]; exists {
304+
if caData, exists := tlsSecret.Data[secrets.KeyCACert]; exists {
305305
caFile, err = writeToFile(caData, caFileName, path)
306306
if err != nil {
307307
return "", "", "", err

0 commit comments

Comments
 (0)