Skip to content

Commit 4001f14

Browse files
keep lookupMap for easy reading for relevant publicKey file (#1930)
Co-authored-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent 130413c commit 4001f14

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

operatorapi/tenants.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,13 @@ func parseCertificate(name string, rawCert []byte) (*models.CertificateInfo, err
586586
}, nil
587587
}
588588

589+
var secretTypePublicKeyNameMap = map[string]string{
590+
"kubernetes.io/tls": "tls.crt",
591+
"cert-manager.io/v1": "tls.crt",
592+
"cert-manager.io/v1alpha2": "tls.crt",
593+
// Add newer secretTypes and their corresponding values in future
594+
}
595+
589596
// parseTenantCertificates convert public key pem certificates stored in k8s secrets for a given Tenant into x509 certificates
590597
func parseTenantCertificates(ctx context.Context, clientSet K8sClientI, namespace string, secrets []*miniov2.LocalCertificateReference) ([]*models.CertificateInfo, error) {
591598
var certificates []*models.CertificateInfo
@@ -597,9 +604,11 @@ func parseTenantCertificates(ctx context.Context, clientSet K8sClientI, namespac
597604
if err != nil {
598605
return nil, err
599606
}
600-
if secret.Type == "kubernetes.io/tls" || secret.Type == "cert-manager.io/v1" || secret.Type == "cert-manager.io/v1alpha2" {
601-
publicKey = "tls.crt"
607+
608+
if v, ok := secretTypePublicKeyNameMap[secret.Type]; ok {
609+
publicKey = v
602610
}
611+
603612
// Extract public key from certificate TLS secret
604613
if rawCert, ok := keyPair.Data[publicKey]; ok {
605614
var blocks []byte

0 commit comments

Comments
 (0)