CA Certificates in Operator-UI (#829)

- Bug fix: removing CA certificates for MinIO in operator-ui was broken
- Added missing file uplader for Console CA certificates

Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>
This commit is contained in:
Lenin Alevski
2021-06-24 12:15:24 -07:00
committed by GitHub
parent c7e195b361
commit 616be03c0b
20 changed files with 262 additions and 26 deletions

View File

@@ -1261,6 +1261,30 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
minInst.Spec.Console.Labels = tenantReq.Console.Labels
minInst.Spec.Console.NodeSelector = tenantReq.Console.NodeSelector
}
// External TLS CA certificates for Console
if tenantReq.TLS != nil && len(tenantReq.TLS.ConsoleCaCertificates) > 0 {
var caCertificates []tenantSecret
for i, caCertificate := range tenantReq.TLS.ConsoleCaCertificates {
certificateContent, err := base64.StdEncoding.DecodeString(caCertificate)
if err != nil {
return nil, prepareError(errorGeneric, nil, err)
}
caCertificates = append(caCertificates, tenantSecret{
Name: fmt.Sprintf("console-ca-certificate-%d", i),
Content: map[string][]byte{
"public.crt": certificateContent,
},
})
}
if len(caCertificates) > 0 {
certificateSecrets, err := createOrReplaceSecrets(ctx, &k8sClient, ns, caCertificates, tenantName)
if err != nil {
return nil, prepareError(errorGeneric, nil, err)
}
minInst.Spec.Console.ExternalCaCertSecret = certificateSecrets
}
}
}
// add annotations

View File

@@ -7490,6 +7490,12 @@ func init() {
"type": "object",
"$ref": "#/definitions/keyPairConfiguration"
},
"console_ca_certificates": {
"type": "array",
"items": {
"type": "string"
}
},
"minio": {
"type": "array",
"items": {
@@ -15845,6 +15851,12 @@ func init() {
"type": "object",
"$ref": "#/definitions/keyPairConfiguration"
},
"console_ca_certificates": {
"type": "array",
"items": {
"type": "string"
}
},
"minio": {
"type": "array",
"items": {