@@ -19,19 +19,19 @@ import (
1919 corev1 "k8s.io/api/core/v1"
2020 k8serrors "k8s.io/apimachinery/pkg/api/errors"
2121 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22- "k8s.io/apimachinery/pkg/runtime"
2322 "sigs.k8s.io/controller-runtime/pkg/client"
2423
2524 interfaces "go.etcd.io/etcd-operator/pkg/certificate/interfaces"
2625)
2726
2827type Provider struct {
2928 client.Client
30- Scheme * runtime.Scheme
3129}
3230
33- func New () * Provider {
34- return & Provider {}
31+ func New (client client.Client ) * Provider {
32+ return & Provider {
33+ client ,
34+ }
3535}
3636
3737func (cm * Provider ) createCertificate (
@@ -57,7 +57,7 @@ func (cm *Provider) createCertificate(
5757 },
5858 }
5959
60- return cm .Create (ctx , certificateResource )
60+ return cm .Client . Create (ctx , certificateResource )
6161}
6262
6363// parsePrivateKey parses the private key from the PEM-encoded data.
@@ -119,8 +119,8 @@ func (cm *Provider) EnsureCertificateSecret(
119119
120120 checkCertSecret , valErr := cm .ValidateCertificateSecret (ctx , secretName , namespace , cfg )
121121 if valErr != nil {
122- return fmt .Errorf ("invalid certificate secret: %s present in namespace: %s, please delete and try again" ,
123- secretName , namespace )
122+ return fmt .Errorf ("invalid certificate secret: %s present in namespace: %s, please delete and try again. \n Error: %s " ,
123+ secretName , namespace , valErr )
124124 }
125125 if checkCertSecret {
126126 return fmt .Errorf ("valid certificate secret: %s already present in namespace: %s , skipping Certificate creation" ,
@@ -138,7 +138,7 @@ func (cm *Provider) ValidateCertificateSecret(
138138 namespace string ,
139139 _ * interfaces.Config ) (bool , error ) {
140140 secret := & corev1.Secret {}
141- err := cm .Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, secret )
141+ err := cm .Client . Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, secret )
142142 if err != nil {
143143 return false , nil
144144 }
@@ -148,12 +148,17 @@ func (cm *Provider) ValidateCertificateSecret(
148148 return false , errors .New ("certificate not found in secret" )
149149 }
150150
151+ decodeCertificatePem , _ := pem .Decode (certificateData )
152+ if decodeCertificatePem == nil {
153+ return false , errors .New ("failed to decode PEM block" )
154+ }
155+
151156 privateKeyData , keyExists := secret .Data ["tls.key" ]
152157 if ! keyExists {
153158 return false , errors .New ("private key not found in secret" )
154159 }
155160
156- parseCert , err := x509 .ParseCertificate (certificateData )
161+ parseCert , err := x509 .ParseCertificate (decodeCertificatePem . Bytes )
157162 if err != nil {
158163 return false , fmt .Errorf ("failed to parse certificate: %w" , err )
159164 }
@@ -176,13 +181,13 @@ func (cm *Provider) ValidateCertificateSecret(
176181
177182func (cm * Provider ) DeleteCertificateSecret (ctx context.Context , secretName string , namespace string ) error {
178183 secret := & corev1.Secret {}
179- err := cm .Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, secret )
184+ err := cm .Client . Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, secret )
180185 if err != nil {
181186 return fmt .Errorf ("failed to get secret: %w" , err )
182187 }
183188
184189 // Delete the Secret
185- err = cm .Delete (ctx , secret )
190+ err = cm .Client . Delete (ctx , secret )
186191 if err != nil {
187192 return fmt .Errorf ("failed to delete secret: %w" , err )
188193 }
@@ -192,12 +197,12 @@ func (cm *Provider) DeleteCertificateSecret(ctx context.Context, secretName stri
192197
193198func (cm * Provider ) RevokeCertificate (ctx context.Context , secretName string , namespace string ) error {
194199 cmCertificate := & certmanagerv1.Certificate {}
195- getCertificateErr := cm .Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, cmCertificate )
200+ getCertificateErr := cm .Client . Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, cmCertificate )
196201 if getCertificateErr != nil {
197202 return getCertificateErr
198203 }
199204
200- deleteCertificateErr := cm .Delete (ctx , cmCertificate )
205+ deleteCertificateErr := cm .Client . Delete (ctx , cmCertificate )
201206 if deleteCertificateErr != nil {
202207 return deleteCertificateErr
203208 }
@@ -223,7 +228,7 @@ func (cm *Provider) GetCertificateConfig(
223228 secretName string ,
224229 namespace string ) (* interfaces.Config , error ) {
225230 cmCertificate := & certmanagerv1.Certificate {}
226- err := cm .Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, cmCertificate )
231+ err := cm .Client . Get (ctx , client.ObjectKey {Name : secretName , Namespace : namespace }, cmCertificate )
227232 if err != nil {
228233 return nil , fmt .Errorf ("failed to get certificate: %w" , err )
229234 }
0 commit comments