@@ -103,36 +103,35 @@ func NewCertificateManagerFromMRC(ctx context.Context, kubeClient kubernetes.Int
103103}
104104
105105// GetCertIssuerForMRC returns a certificate.Issuer generated from the provided MRC.
106- func (c * MRCProviderGenerator ) GetCertIssuerForMRC (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , pem.RootCertificate , string , error ) {
106+ func (c * MRCProviderGenerator ) GetCertIssuerForMRC (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , pem.RootCertificate , error ) {
107107 p := mrc .Spec .Provider
108108 var issuer certificate.Issuer
109- var id string
110109 var err error
111110 switch {
112111 case p .Tresor != nil :
113- issuer , id , err = c .getTresorOSMCertificateManager (mrc )
112+ issuer , err = c .getTresorOSMCertificateManager (mrc )
114113 case p .Vault != nil :
115- issuer , id , err = c .getHashiVaultOSMCertificateManager (mrc )
114+ issuer , err = c .getHashiVaultOSMCertificateManager (mrc )
116115 case p .CertManager != nil :
117- issuer , id , err = c .getCertManagerOSMCertificateManager (mrc )
116+ issuer , err = c .getCertManagerOSMCertificateManager (mrc )
118117 default :
119- return nil , nil , "" , fmt .Errorf ("Unknown certificate provider: %+v" , p )
118+ return nil , nil , fmt .Errorf ("Unknown certificate provider: %+v" , p )
120119 }
121120
122121 if err != nil {
123- return nil , nil , "" , err
122+ return nil , nil , err
124123 }
125124
126125 ca , err := c .caExtractorFunc (issuer )
127126 if err != nil {
128- return nil , nil , "" , fmt .Errorf ("error generating init cert: %w" , err )
127+ return nil , nil , fmt .Errorf ("error generating init cert: %w" , err )
129128 }
130129
131- return issuer , ca , id , nil
130+ return issuer , ca , nil
132131}
133132
134133// getTresorOSMCertificateManager returns a certificate manager instance with Tresor as the certificate provider
135- func (c * MRCProviderGenerator ) getTresorOSMCertificateManager (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , string , error ) {
134+ func (c * MRCProviderGenerator ) getTresorOSMCertificateManager (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , error ) {
136135 var err error
137136 var rootCert * certificate.Certificate
138137
@@ -142,20 +141,20 @@ func (c *MRCProviderGenerator) getTresorOSMCertificateManager(mrc *v1alpha2.Mesh
142141 // Regardless of success or failure, all instances can proceed to load the same CA.
143142 rootCert , err = tresor .NewCA (constants .CertificationAuthorityCommonName , constants .CertificationAuthorityRootValidityPeriod , rootCertCountry , rootCertLocality , rootCertOrganization )
144143 if err != nil {
145- return nil , "" , errors .New ("Failed to create new Certificate Authority with cert issuer tresor" )
144+ return nil , errors .New ("Failed to create new Certificate Authority with cert issuer tresor" )
146145 }
147146
148147 if rootCert .GetPrivateKey () == nil {
149- return nil , "" , errors .New ("Root cert does not have a private key" )
148+ return nil , errors .New ("Root cert does not have a private key" )
150149 }
151150
152151 rootCert , err = k8s .GetCertificateFromSecret (mrc .Namespace , mrc .Spec .Provider .Tresor .CA .SecretRef .Name , rootCert , c .kubeClient )
153152 if err != nil {
154- return nil , "" , fmt .Errorf ("Failed to synchronize certificate on Secrets API : %w" , err )
153+ return nil , fmt .Errorf ("Failed to synchronize certificate on Secrets API : %w" , err )
155154 }
156155
157156 if rootCert .GetPrivateKey () == nil {
158- return nil , "" , fmt .Errorf ("Root cert does not have a private key: %w" , certificate .ErrInvalidCertSecret )
157+ return nil , fmt .Errorf ("Root cert does not have a private key: %w" , certificate .ErrInvalidCertSecret )
159158 }
160159
161160 tresorClient , err := tresor .New (
@@ -164,14 +163,14 @@ func (c *MRCProviderGenerator) getTresorOSMCertificateManager(mrc *v1alpha2.Mesh
164163 c .KeyBitSize ,
165164 )
166165 if err != nil {
167- return nil , "" , fmt .Errorf ("failed to instantiate Tresor as a Certificate Manager: %w" , err )
166+ return nil , fmt .Errorf ("failed to instantiate Tresor as a Certificate Manager: %w" , err )
168167 }
169168
170- return tresorClient , mrc . Name , nil
169+ return tresorClient , nil
171170}
172171
173172// getHashiVaultOSMCertificateManager returns a certificate manager instance with Hashi Vault as the certificate provider
174- func (c * MRCProviderGenerator ) getHashiVaultOSMCertificateManager (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , string , error ) {
173+ func (c * MRCProviderGenerator ) getHashiVaultOSMCertificateManager (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , error ) {
175174 provider := mrc .Spec .Provider .Vault
176175
177176 // A Vault address would have the following shape: "http://vault.default.svc.cluster.local:8200"
@@ -184,7 +183,7 @@ func (c *MRCProviderGenerator) getHashiVaultOSMCertificateManager(mrc *v1alpha2.
184183 log .Debug ().Msgf ("Attempting to get Vault token from secret %s" , provider .Token .SecretKeyRef .Name )
185184 vaultToken , err = getHashiVaultOSMToken (& provider .Token .SecretKeyRef , c .kubeClient )
186185 if err != nil {
187- return nil , "" , err
186+ return nil , err
188187 }
189188 }
190189
@@ -194,10 +193,10 @@ func (c *MRCProviderGenerator) getHashiVaultOSMCertificateManager(mrc *v1alpha2.
194193 provider .Role ,
195194 )
196195 if err != nil {
197- return nil , "" , fmt .Errorf ("error instantiating Hashicorp Vault as a Certificate Manager: %w" , err )
196+ return nil , fmt .Errorf ("error instantiating Hashicorp Vault as a Certificate Manager: %w" , err )
198197 }
199198
200- return vaultClient , mrc . Name , nil
199+ return vaultClient , nil
201200}
202201
203202// getHashiVaultOSMToken returns the Hashi Vault token from the secret specified in the provided secret key reference
@@ -216,11 +215,11 @@ func getHashiVaultOSMToken(secretKeyRef *v1alpha2.SecretKeyReferenceSpec, kubeCl
216215}
217216
218217// getCertManagerOSMCertificateManager returns a certificate manager instance with cert-manager as the certificate provider
219- func (c * MRCProviderGenerator ) getCertManagerOSMCertificateManager (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , string , error ) {
218+ func (c * MRCProviderGenerator ) getCertManagerOSMCertificateManager (mrc * v1alpha2.MeshRootCertificate ) (certificate.Issuer , error ) {
220219 provider := mrc .Spec .Provider .CertManager
221220 client , err := cmversionedclient .NewForConfig (c .kubeConfig )
222221 if err != nil {
223- return nil , "" , fmt .Errorf ("Failed to build cert-manager client set: %s" , err )
222+ return nil , fmt .Errorf ("Failed to build cert-manager client set: %s" , err )
224223 }
225224
226225 cmClient , err := certmanager .New (
@@ -234,8 +233,8 @@ func (c *MRCProviderGenerator) getCertManagerOSMCertificateManager(mrc *v1alpha2
234233 c .KeyBitSize ,
235234 )
236235 if err != nil {
237- return nil , "" , fmt .Errorf ("error instantiating Jetstack cert-manager client: %w" , err )
236+ return nil , fmt .Errorf ("error instantiating Jetstack cert-manager client: %w" , err )
238237 }
239238
240- return cmClient , mrc . Name , nil
239+ return cmClient , nil
241240}
0 commit comments