From 85728aa18f3dd2d6adcdf64cd70e5e8f7b0b6619 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 18 Jun 2024 11:16:44 -0400 Subject: [PATCH] fixup! Certificate support for image registry --- go.mod | 2 +- go.sum | 2 ++ internal/controllers/clusterextension_controller.go | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 08114c526..9701ca41f 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/operator-framework/catalogd v0.14.0 github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9 github.com/operator-framework/operator-registry v1.43.1 - github.com/operator-framework/rukpak v0.23.2-0.20240618133950-e1d8b0e32344 + github.com/operator-framework/rukpak v0.24.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index f6b2313e3..04c4b003f 100644 --- a/go.sum +++ b/go.sum @@ -485,6 +485,8 @@ github.com/operator-framework/operator-registry v1.43.1 h1:ACahVHGIL/hINBXd3RKWq github.com/operator-framework/operator-registry v1.43.1/go.mod h1:qhssAIYWXDIW+nTg0C5i4iD9zpMtiXtfXqGUuUmGz5c= github.com/operator-framework/rukpak v0.23.2-0.20240618133950-e1d8b0e32344 h1:L2jGtjx9g3EgXUTDiVNgoqyBrP4m4RCyQspDjoDIFjg= github.com/operator-framework/rukpak v0.23.2-0.20240618133950-e1d8b0e32344/go.mod h1:peTAGzf4gmU+in2RJen84ZQ8lkdB3m6qy+nfNiVv0RY= +github.com/operator-framework/rukpak v0.24.0 h1:zxLyk931w4isFiTPox4soXxh/eQJr5sjq15gHcb6dlE= +github.com/operator-framework/rukpak v0.24.0/go.mod h1:peTAGzf4gmU+in2RJen84ZQ8lkdB3m6qy+nfNiVv0RY= github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks= diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go index 3ffc6e3a7..4c9685add 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/controllers/clusterextension_controller.go @@ -582,12 +582,12 @@ func (r *ClusterExtensionReconciler) getCertificateData(ctx context.Context, ce // Get any 'ca.crt' data, ok := secret.Data[corev1.ServiceAccountRootCAKey] if ok && len(data) > 0 { - certs = append(certs, string(data[:])) + certs = append(certs, string(data)) } // Get any 'tls.crt' data, ok = secret.Data[corev1.TLSCertKey] if ok && len(data) > 0 { - certs = append(certs, string(data[:])) + certs = append(certs, string(data)) } if len(certs) == 0 { return "", fmt.Errorf("no data found in secret: %v", secretName)