Skip to content

Commit 97c888b

Browse files
AlekSitalos-bot
authored andcommitted
chore: add options to CSR
Co-authored-by: Andrey Smirnov <me@smira.ru> Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
1 parent 7776057 commit 97c888b

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

tls/provider.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"errors"
1212
"fmt"
1313
"log"
14-
"net"
1514
"sync"
1615
"time"
1716

@@ -44,17 +43,15 @@ type certificateProvider struct {
4443
ca []byte
4544
crt *tls.Certificate
4645

47-
dnsNames []string
48-
ips []net.IP
46+
csrOptions []talosx509.Option
4947
}
5048

5149
// NewRenewingCertificateProvider returns a new CertificateProvider
5250
// which manages and updates its certificates using Generator.
53-
func NewRenewingCertificateProvider(generator Generator, dnsNames []string, ips []net.IP) (CertificateProvider, error) {
51+
func NewRenewingCertificateProvider(generator Generator, csrOptions ...talosx509.Option) (CertificateProvider, error) {
5452
provider := &certificateProvider{
55-
generator: generator,
56-
dnsNames: dnsNames,
57-
ips: ips,
53+
generator: generator,
54+
csrOptions: csrOptions,
5855
}
5956

6057
ca, cert, err := provider.update()
@@ -70,7 +67,7 @@ func NewRenewingCertificateProvider(generator Generator, dnsNames []string, ips
7067
}
7168

7269
func (p *certificateProvider) update() ([]byte, *tls.Certificate, error) {
73-
csr, identity, err := talosx509.NewEd25519CSRAndIdentity(talosx509.DNSNames(p.dnsNames), talosx509.IPAddresses(p.ips))
70+
csr, identity, err := talosx509.NewEd25519CSRAndIdentity(p.csrOptions...)
7471
if err != nil {
7572
return nil, nil, err
7673
}

0 commit comments

Comments
 (0)