fixup! Add HTTP client to certificate manager

plgd-dev · Oct 31, 2024 · 950a671 · 950a671
1 parent ed3f2e0
commit 950a671
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/certificate-authority/config.yaml b/certificate-authority/config.yaml
@@ -29,6 +29,7 @@ apis:
       keyFile: "/secrets/private/cert.key"
       certFile: "/secrets/private/cert.crt"
       clientCertificateRequired: true
+
     authorization:
       ownerClaim: "sub"
       audience: ""

diff --git a/pkg/security/certManager/general/certManager.go b/pkg/security/certManager/general/certManager.go
@@ -33,10 +33,12 @@ type Config struct {
 	ClientCertificateRequired bool                  `yaml:"clientCertificateRequired" json:"clientCertificateRequired" description:"require client certificate"`
 	UseSystemCAPool           bool                  `yaml:"useSystemCAPool" json:"useSystemCaPool" description:"use system certification pool"`
 	CRL                       pkgTls.CRLConfig      `yaml:"crl" json:"crl"`
+
+	CAPoolIsOptional bool `yaml:"-" json:"-"`
 }
 
 func (c Config) Validate() error {
-	if len(c.CAPool) == 0 && !c.UseSystemCAPool {
+	if len(c.CAPool) == 0 && !c.UseSystemCAPool && !c.CAPoolIsOptional {
 		return fmt.Errorf("caPool('%v')", c.CAPool)
 	}
 	if c.CertFile == "" {

diff --git a/pkg/security/certManager/server/certManager.go b/pkg/security/certManager/server/certManager.go
@@ -83,6 +83,7 @@ func New(config Config, fileWatcher *fsnotify.Watcher, logger log.Logger, tracer
 	}
 	cfg := general.Config{
 		CAPool:                    config.caPoolArray,
+		CAPoolIsOptional:          config.CAPoolIsOptional,
 		KeyFile:                   config.KeyFile,
 		CertFile:                  config.CertFile,
 		ClientCertificateRequired: config.ClientCertificateRequired,