Skip to content

Commit

Permalink
Multitenancy Support for External Certs (#1971)
Browse files Browse the repository at this point in the history
  • Loading branch information
cniackz authored Feb 6, 2024
1 parent a8bb885 commit e360633
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions pkg/controller/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"fmt"
"net"
"net/http"
"strings"
"time"

k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -172,6 +173,29 @@ func (c *Controller) fetchTransportCACertificates() (pool *x509.CertPool) {
rootCAs.AppendCertsFromPEM(val)
}
}

// Multi-tenancy support for external certificates
// One secret per tenant to allow for the automatic appending and renewal of certificates upon expiration.
secretsAvailableAtOperatorNS, _ := c.kubeClientSet.CoreV1().Secrets(miniov2.GetNSFromFile()).List(context.Background(), metav1.ListOptions{})
for _, secret := range secretsAvailableAtOperatorNS.Items {
// Check if secret starts with "operator-ca-tls-"
secretName := OperatorCATLSSecretName + "-"
if strings.HasPrefix(secret.Name, secretName) {
klog.Infof("External secret found: %s", secret.Name)
operatorCATLSCert, err := c.kubeClientSet.CoreV1().Secrets(miniov2.GetNSFromFile()).Get(context.Background(), secret.Name, metav1.GetOptions{})
if err == nil && operatorCATLSCert != nil {
if val, ok := operatorCATLSCert.Data["ca.crt"]; ok {
klog.Infof("Appending cert from %s secret", secret.Name)
rootCAs.AppendCertsFromPEM(val)
} else {
klog.Errorf("NOT appending %s secret, ok: %t", secret.Name, ok)
}
} else {
klog.Errorf("NOT appending %s secret, err: %s operatorCATLSCert: %s", secret.Name, err, operatorCATLSCert)
}
}
}

return rootCAs
}

Expand Down

0 comments on commit e360633

Please sign in to comment.