@@ -35,7 +35,7 @@ const (
3535 RESTKeyField = "http.key"
3636)
3737
38- type CertsReconciler struct {
38+ type Reconciler struct {
3939 opensearchCluster * v1beta1.OpensearchCluster
4040 client client.Client
4141 ctx context.Context
@@ -44,16 +44,16 @@ type CertsReconciler struct {
4444 recreateCerts bool
4545}
4646
47- func NewCertsReconciler (ctx context.Context , client client.Client , recreateCerts bool , cluster * v1beta1.OpensearchCluster ) * CertsReconciler {
48- return & CertsReconciler {
47+ func NewReconciler (ctx context.Context , client client.Client , recreateCerts bool , cluster * v1beta1.OpensearchCluster ) * Reconciler {
48+ return & Reconciler {
4949 client : client ,
5050 ctx : ctx ,
5151 opensearchCluster : cluster ,
5252 recreateCerts : recreateCerts ,
5353 }
5454}
5555
56- func (c * CertsReconciler ) setTransportCA (caPEM []byte , caKeyPEM []byte ) (err error ) {
56+ func (c * Reconciler ) setTransportCA (caPEM []byte , caKeyPEM []byte ) (err error ) {
5757 ca , err := tls .X509KeyPair (caPEM , caKeyPEM )
5858 if err != nil {
5959 return err
@@ -62,7 +62,7 @@ func (c *CertsReconciler) setTransportCA(caPEM []byte, caKeyPEM []byte) (err err
6262 return
6363}
6464
65- func (c * CertsReconciler ) setRESTCA (caPEM []byte , caKeyPEM []byte ) (err error ) {
65+ func (c * Reconciler ) setRESTCA (caPEM []byte , caKeyPEM []byte ) (err error ) {
6666 ca , err := tls .X509KeyPair (caPEM , caKeyPEM )
6767 if err != nil {
6868 return err
@@ -71,7 +71,7 @@ func (c *CertsReconciler) setRESTCA(caPEM []byte, caKeyPEM []byte) (err error) {
7171 return
7272}
7373
74- func (c * CertsReconciler ) retrieveCert (
74+ func (c * Reconciler ) retrieveCert (
7575 certField string ,
7676 keyField string ,
7777) (
@@ -100,7 +100,7 @@ func (c *CertsReconciler) retrieveCert(
100100 return
101101}
102102
103- func (c * CertsReconciler ) maybeUpdateTransportCA () (ca []byte , key []byte , err error ) {
103+ func (c * Reconciler ) maybeUpdateTransportCA () (ca []byte , key []byte , err error ) {
104104 ca , key , err = c .retrieveCert (TransportCASecretField , TransportCAKeySecretField )
105105 if k8serrors .IsNotFound (err ) || (IsSecretDataMissing (err ) && c .recreateCerts ) {
106106 ca , key , err = pki .CreateCA ("Opensearch Transport CA" )
@@ -116,7 +116,7 @@ func (c *CertsReconciler) maybeUpdateTransportCA() (ca []byte, key []byte, err e
116116 return
117117}
118118
119- func (c * CertsReconciler ) createTransportCert () (cert []byte , key []byte , err error ) {
119+ func (c * Reconciler ) createTransportCert () (cert []byte , key []byte , err error ) {
120120 // We have to add RID Name for the Transport certs
121121 // The oid is 1.2.3.4.5.5. 0x88 is the Tag and Class for RID, 0x5 is the length
122122 // 0x2A is OID standard for the first two numbers - 40 * 1 + 2
@@ -191,7 +191,7 @@ func (c *CertsReconciler) createTransportCert() (cert []byte, key []byte, err er
191191 return
192192}
193193
194- func (c * CertsReconciler ) createRESTCert () (cert []byte , key []byte , err error ) {
194+ func (c * Reconciler ) createRESTCert () (cert []byte , key []byte , err error ) {
195195 rawValues := []asn1.RawValue {}
196196 dnsNames := []string {
197197 fmt .Sprintf ("*.%s" , c .opensearchCluster .Namespace ),
@@ -259,7 +259,7 @@ func (c *CertsReconciler) createRESTCert() (cert []byte, key []byte, err error)
259259 return
260260}
261261
262- func (c * CertsReconciler ) maybeUpdateTransportCert () (cert []byte , key []byte , err error ) {
262+ func (c * Reconciler ) maybeUpdateTransportCert () (cert []byte , key []byte , err error ) {
263263 cert , key , err = c .retrieveCert (TransportCertField , TransportKeyField )
264264 if k8serrors .IsNotFound (err ) || (IsSecretDataMissing (err ) && c .recreateCerts ) {
265265 cert , key , err = c .createTransportCert ()
@@ -279,7 +279,7 @@ func (c *CertsReconciler) maybeUpdateTransportCert() (cert []byte, key []byte, e
279279 return
280280}
281281
282- func (c * CertsReconciler ) maybeUpdateRESTCert () (cert []byte , key []byte , err error ) {
282+ func (c * Reconciler ) maybeUpdateRESTCert () (cert []byte , key []byte , err error ) {
283283 cert , key , err = c .retrieveCert (RESTCertField , RESTKeyField )
284284 if k8serrors .IsNotFound (err ) || (IsSecretDataMissing (err ) && c .recreateCerts ) {
285285 cert , key , err = c .createRESTCert ()
@@ -299,7 +299,7 @@ func (c *CertsReconciler) maybeUpdateRESTCert() (cert []byte, key []byte, err er
299299 return
300300}
301301
302- func (c * CertsReconciler ) maybeUpdateRESTCA () (ca []byte , key []byte , err error ) {
302+ func (c * Reconciler ) maybeUpdateRESTCA () (ca []byte , key []byte , err error ) {
303303 ca , key , err = c .retrieveCert (RESTCASecretField , RESTCAKeySecretField )
304304 if k8serrors .IsNotFound (err ) || (IsSecretDataMissing (err ) && c .recreateCerts ) {
305305 ca , key , err = pki .CreateCA ("Opensearch REST CA" )
@@ -315,7 +315,7 @@ func (c *CertsReconciler) maybeUpdateRESTCA() (ca []byte, key []byte, err error)
315315 return
316316}
317317
318- func (c * CertsReconciler ) CertSecrets () (resourceList []resources.Resource , err error ) {
318+ func (c * Reconciler ) CertSecrets () (resourceList []resources.Resource , err error ) {
319319 secretPKI := & corev1.Secret {
320320 ObjectMeta : metav1.ObjectMeta {
321321 Name : fmt .Sprintf ("%s-os-pki" , c .opensearchCluster .Name ),
0 commit comments