2020-07-01 18:03:22 -07:00
|
|
|
// This file is part of MinIO Kubernetes Cloud
|
2021-01-19 17:04:13 -06:00
|
|
|
// Copyright (c) 2021 MinIO, Inc.
|
2020-07-01 18:03:22 -07:00
|
|
|
//
|
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
//
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
// GNU Affero General Public License for more details.
|
|
|
|
|
//
|
|
|
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
|
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
package restapi
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"context"
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
"encoding/base64"
|
2020-07-01 18:03:22 -07:00
|
|
|
"encoding/json"
|
2020-07-27 14:06:12 -07:00
|
|
|
"errors"
|
2020-07-01 18:03:22 -07:00
|
|
|
"fmt"
|
|
|
|
|
"log"
|
2020-07-09 12:24:01 -07:00
|
|
|
"net"
|
2020-07-01 18:03:22 -07:00
|
|
|
"net/http"
|
|
|
|
|
"os"
|
2020-07-09 12:24:01 -07:00
|
|
|
"strconv"
|
2020-07-01 18:03:22 -07:00
|
|
|
"strings"
|
|
|
|
|
"time"
|
|
|
|
|
|
2021-01-13 14:08:32 -06:00
|
|
|
"gopkg.in/yaml.v2"
|
2020-07-01 18:03:22 -07:00
|
|
|
"k8s.io/apimachinery/pkg/api/resource"
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
"k8s.io/apimachinery/pkg/types"
|
2020-07-01 18:03:22 -07:00
|
|
|
|
|
|
|
|
corev1 "k8s.io/api/core/v1"
|
|
|
|
|
|
2020-07-26 00:34:17 -07:00
|
|
|
"github.com/minio/console/cluster"
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
"github.com/minio/minio/pkg/madmin"
|
2020-07-01 18:03:22 -07:00
|
|
|
|
|
|
|
|
"github.com/go-openapi/runtime/middleware"
|
|
|
|
|
"github.com/go-openapi/swag"
|
2020-07-26 00:34:17 -07:00
|
|
|
"github.com/minio/console/models"
|
|
|
|
|
"github.com/minio/console/restapi/operations"
|
|
|
|
|
"github.com/minio/console/restapi/operations/admin_api"
|
2021-02-01 12:13:51 -08:00
|
|
|
miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2"
|
2020-08-04 20:54:59 -07:00
|
|
|
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
|
2020-07-01 18:03:22 -07:00
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
2020-08-04 20:54:59 -07:00
|
|
|
v1 "k8s.io/client-go/kubernetes/typed/core/v1"
|
2020-07-01 18:03:22 -07:00
|
|
|
)
|
|
|
|
|
|
2020-08-04 20:54:59 -07:00
|
|
|
type imageRegistry struct {
|
|
|
|
|
Auths map[string]imageRegistryCredentials `json:"auths"`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type imageRegistryCredentials struct {
|
|
|
|
|
Username string `json:"username"`
|
|
|
|
|
Password string `json:"password"`
|
|
|
|
|
Auth string `json:"auth"`
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-26 00:34:17 -07:00
|
|
|
func registerTenantHandlers(api *operations.ConsoleAPI) {
|
2020-07-01 18:03:22 -07:00
|
|
|
// Add Tenant
|
2020-07-10 19:14:28 -07:00
|
|
|
api.AdminAPICreateTenantHandler = admin_api.CreateTenantHandlerFunc(func(params admin_api.CreateTenantParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
resp, err := getTenantCreatedResponse(session, params)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewCreateTenantDefault(int(err.Code)).WithPayload(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewCreateTenantOK().WithPayload(resp)
|
|
|
|
|
})
|
|
|
|
|
// List All Tenants of all namespaces
|
2020-07-10 19:14:28 -07:00
|
|
|
api.AdminAPIListAllTenantsHandler = admin_api.ListAllTenantsHandlerFunc(func(params admin_api.ListAllTenantsParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
resp, err := getListAllTenantsResponse(session, params)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewListTenantsDefault(int(err.Code)).WithPayload(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewListTenantsOK().WithPayload(resp)
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
// List Tenants by namespace
|
2020-07-10 19:14:28 -07:00
|
|
|
api.AdminAPIListTenantsHandler = admin_api.ListTenantsHandlerFunc(func(params admin_api.ListTenantsParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
resp, err := getListTenantsResponse(session, params)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewListTenantsDefault(int(err.Code)).WithPayload(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewListTenantsOK().WithPayload(resp)
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
// Detail Tenant
|
2020-07-10 19:14:28 -07:00
|
|
|
api.AdminAPITenantInfoHandler = admin_api.TenantInfoHandlerFunc(func(params admin_api.TenantInfoParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
resp, err := getTenantInfoResponse(session, params)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewTenantInfoDefault(int(err.Code)).WithPayload(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewTenantInfoOK().WithPayload(resp)
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Delete Tenant
|
2020-07-10 19:14:28 -07:00
|
|
|
api.AdminAPIDeleteTenantHandler = admin_api.DeleteTenantHandlerFunc(func(params admin_api.DeleteTenantParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
err := getDeleteTenantResponse(session, params)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewTenantInfoDefault(int(err.Code)).WithPayload(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewTenantInfoOK()
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Update Tenant
|
2020-07-10 19:14:28 -07:00
|
|
|
api.AdminAPIUpdateTenantHandler = admin_api.UpdateTenantHandlerFunc(func(params admin_api.UpdateTenantParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
err := getUpdateTenantResponse(session, params)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewUpdateTenantDefault(int(err.Code)).WithPayload(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewUpdateTenantCreated()
|
|
|
|
|
})
|
2020-07-13 20:36:27 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// Add Tenant Pools
|
|
|
|
|
api.AdminAPITenantAddPoolHandler = admin_api.TenantAddPoolHandlerFunc(func(params admin_api.TenantAddPoolParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
err := getTenantAddPoolResponse(session, params)
|
2020-07-13 20:36:27 -07:00
|
|
|
if err != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
return admin_api.NewTenantAddPoolDefault(int(err.Code)).WithPayload(err)
|
2020-07-13 20:36:27 -07:00
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
return admin_api.NewTenantAddPoolCreated()
|
2020-07-13 20:36:27 -07:00
|
|
|
})
|
2020-07-27 14:19:40 -07:00
|
|
|
|
2020-09-03 10:20:58 -07:00
|
|
|
// Get Tenant Usage
|
2020-07-27 14:19:40 -07:00
|
|
|
api.AdminAPIGetTenantUsageHandler = admin_api.GetTenantUsageHandlerFunc(func(params admin_api.GetTenantUsageParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
payload, err := getTenantUsageResponse(session, params)
|
|
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return admin_api.NewGetTenantUsageDefault(int(err.Code)).WithPayload(err)
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewGetTenantUsageOK().WithPayload(payload)
|
|
|
|
|
})
|
2020-08-26 17:12:59 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// Update Tenant Pools
|
|
|
|
|
api.AdminAPITenantUpdatePoolsHandler = admin_api.TenantUpdatePoolsHandlerFunc(func(params admin_api.TenantUpdatePoolsParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
resp, err := getTenantUpdatePoolResponse(session, params)
|
2020-08-26 17:12:59 -07:00
|
|
|
if err != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
return admin_api.NewTenantUpdatePoolsDefault(int(err.Code)).WithPayload(err)
|
2020-08-26 17:12:59 -07:00
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
return admin_api.NewTenantUpdatePoolsOK().WithPayload(resp)
|
2020-08-26 17:12:59 -07:00
|
|
|
})
|
2020-09-03 10:20:58 -07:00
|
|
|
|
|
|
|
|
// Update Tenant Certificates
|
|
|
|
|
api.AdminAPITenantUpdateCertificateHandler = admin_api.TenantUpdateCertificateHandlerFunc(func(params admin_api.TenantUpdateCertificateParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
err := getTenantUpdateCertificatesResponse(session, params)
|
|
|
|
|
if err != nil {
|
2020-09-08 12:20:38 -07:00
|
|
|
return admin_api.NewTenantUpdateCertificateDefault(int(err.Code)).WithPayload(err)
|
2020-09-03 10:20:58 -07:00
|
|
|
}
|
|
|
|
|
return admin_api.NewTenantUpdateCertificateCreated()
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Update Tenant Encryption Configuration
|
|
|
|
|
api.AdminAPITenantUpdateEncryptionHandler = admin_api.TenantUpdateEncryptionHandlerFunc(func(params admin_api.TenantUpdateEncryptionParams, session *models.Principal) middleware.Responder {
|
|
|
|
|
err := getTenantUpdateEncryptionResponse(session, params)
|
|
|
|
|
if err != nil {
|
2020-09-08 12:20:38 -07:00
|
|
|
return admin_api.NewTenantUpdateEncryptionDefault(int(err.Code)).WithPayload(err)
|
2020-09-03 10:20:58 -07:00
|
|
|
}
|
2020-09-08 12:20:38 -07:00
|
|
|
return admin_api.NewTenantUpdateEncryptionCreated()
|
2020-09-03 10:20:58 -07:00
|
|
|
})
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// getDeleteTenantResponse gets the output of deleting a minio instance
|
2020-09-04 20:32:57 -07:00
|
|
|
func getDeleteTenantResponse(session *models.Principal, params admin_api.DeleteTenantParams) *models.Error {
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-08-19 20:34:43 -07:00
|
|
|
// get Kubernetes Client
|
2020-12-07 17:11:08 -06:00
|
|
|
clientset, err := cluster.K8sClient(session.STSSessionToken)
|
2020-08-19 20:34:43 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return prepareError(err)
|
2020-08-19 20:34:43 -07:00
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
2020-08-19 20:34:43 -07:00
|
|
|
deleteTenantPVCs := false
|
|
|
|
|
if params.Body != nil {
|
|
|
|
|
deleteTenantPVCs = params.Body.DeletePvcs
|
|
|
|
|
}
|
2020-09-04 20:32:57 -07:00
|
|
|
if err = deleteTenantAction(context.Background(), opClient, clientset.CoreV1(), params.Namespace, params.Tenant, deleteTenantPVCs); err != nil {
|
|
|
|
|
return prepareError(err)
|
|
|
|
|
}
|
|
|
|
|
return nil
|
2020-08-19 20:34:43 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// deleteTenantAction performs the actions of deleting a tenant
|
|
|
|
|
//
|
|
|
|
|
// It also adds the option of deleting the tenant's underlying pvcs if deletePvcs set
|
|
|
|
|
func deleteTenantAction(
|
|
|
|
|
ctx context.Context,
|
2020-09-03 10:20:58 -07:00
|
|
|
operatorClient OperatorClientI,
|
2020-08-19 20:34:43 -07:00
|
|
|
clientset v1.CoreV1Interface,
|
|
|
|
|
namespace, tenantName string,
|
|
|
|
|
deletePvcs bool) error {
|
|
|
|
|
|
|
|
|
|
err := operatorClient.TenantDelete(ctx, namespace, tenantName, metav1.DeleteOptions{})
|
|
|
|
|
if err != nil {
|
|
|
|
|
// try to delete pvc even if the tenant doesn't exist anymore but only if deletePvcs is set to true,
|
|
|
|
|
// else, we return the error
|
|
|
|
|
if (deletePvcs && !k8sErrors.IsNotFound(err)) || !deletePvcs {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if deletePvcs {
|
|
|
|
|
opts := metav1.ListOptions{
|
2021-02-01 12:13:51 -08:00
|
|
|
LabelSelector: fmt.Sprintf("%s=%s", miniov2.TenantLabel, tenantName),
|
2020-08-19 20:34:43 -07:00
|
|
|
}
|
2020-08-20 18:57:34 -07:00
|
|
|
err = clientset.PersistentVolumeClaims(namespace).DeleteCollection(ctx, metav1.DeleteOptions{}, opts)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
// delete all tenant's secrets only if deletePvcs = true
|
|
|
|
|
return clientset.Secrets(namespace).DeleteCollection(ctx, metav1.DeleteOptions{}, opts)
|
2020-08-19 20:34:43 -07:00
|
|
|
}
|
|
|
|
|
return nil
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2020-09-21 21:31:30 -07:00
|
|
|
// GetTenantServiceURL gets tenant's service url with the proper scheme and port
|
2021-02-01 12:13:51 -08:00
|
|
|
func GetTenantServiceURL(mi *miniov2.Tenant) (svcURL string) {
|
2020-07-09 12:24:01 -07:00
|
|
|
scheme := "http"
|
2021-02-01 12:13:51 -08:00
|
|
|
port := miniov2.MinIOPortLoadBalancerSVC
|
2020-07-23 11:13:05 -07:00
|
|
|
if mi.AutoCert() || mi.ExternalCert() {
|
2020-07-09 12:24:01 -07:00
|
|
|
scheme = "https"
|
2021-02-01 12:13:51 -08:00
|
|
|
port = miniov2.MinIOTLSPortLoadBalancerSVC
|
2020-07-09 12:24:01 -07:00
|
|
|
}
|
2020-09-21 21:31:30 -07:00
|
|
|
svc := fmt.Sprintf("%s.%s.svc.cluster.local", mi.MinIOCIServiceName(), mi.Namespace)
|
|
|
|
|
return fmt.Sprintf("%s://%s", scheme, net.JoinHostPort(svc, strconv.Itoa(port)))
|
2020-07-09 12:24:01 -07:00
|
|
|
}
|
|
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
func getTenantAdminClient(ctx context.Context, client K8sClientI, tenant *miniov2.Tenant, svcURL string) (*madmin.AdminClient, error) {
|
2020-11-30 12:41:58 -08:00
|
|
|
tenantCreds, err := getTenantCreds(ctx, client, tenant)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
sessionToken := ""
|
2020-12-07 13:49:00 -06:00
|
|
|
mAdmin, pErr := NewAdminClientWithInsecure(svcURL, tenantCreds.accessKey, tenantCreds.secretKey, sessionToken, false)
|
2020-11-30 12:41:58 -08:00
|
|
|
if pErr != nil {
|
|
|
|
|
return nil, pErr.Cause
|
|
|
|
|
}
|
|
|
|
|
return mAdmin, nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type tenantKeys struct {
|
|
|
|
|
accessKey string
|
|
|
|
|
secretKey string
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
func getTenantCreds(ctx context.Context, client K8sClientI, tenant *miniov2.Tenant) (*tenantKeys, error) {
|
2020-10-09 11:51:02 -07:00
|
|
|
if tenant == nil || tenant.Spec.CredsSecret == nil {
|
|
|
|
|
return nil, errors.New("invalid arguments")
|
|
|
|
|
}
|
2020-07-09 12:24:01 -07:00
|
|
|
// get admin credentials from secret
|
2020-10-09 11:51:02 -07:00
|
|
|
creds, err := client.getSecret(ctx, tenant.Namespace, tenant.Spec.CredsSecret.Name, metav1.GetOptions{})
|
2020-07-09 12:24:01 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
2020-11-30 12:41:58 -08:00
|
|
|
tenantAccessKey, ok := creds.Data["accesskey"]
|
2020-07-09 12:24:01 -07:00
|
|
|
if !ok {
|
|
|
|
|
log.Println("tenant's secret doesn't contain accesskey")
|
|
|
|
|
return nil, errorGeneric
|
|
|
|
|
}
|
2020-11-30 12:41:58 -08:00
|
|
|
tenantSecretKey, ok := creds.Data["secretkey"]
|
2020-07-09 12:24:01 -07:00
|
|
|
if !ok {
|
|
|
|
|
log.Println("tenant's secret doesn't contain secretkey")
|
|
|
|
|
return nil, errorGeneric
|
|
|
|
|
}
|
2020-11-20 11:52:34 -08:00
|
|
|
// TODO:
|
|
|
|
|
// We need to avoid using minio root credentials to talk to tenants, and instead use a different user credentials
|
|
|
|
|
// when that its implemented we also need to check here if the tenant has LDAP enabled so we authenticate first against AD
|
2020-11-30 12:41:58 -08:00
|
|
|
return &tenantKeys{accessKey: string(tenantAccessKey), secretKey: string(tenantSecretKey)}, nil
|
2020-07-09 12:24:01 -07:00
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
func getTenant(ctx context.Context, operatorClient OperatorClientI, namespace, tenantName string) (*miniov2.Tenant, error) {
|
2020-07-25 14:38:16 -07:00
|
|
|
minInst, err := operatorClient.TenantGet(ctx, namespace, tenantName, metav1.GetOptions{})
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
2020-07-09 12:24:01 -07:00
|
|
|
return minInst, nil
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
|
2020-09-05 23:48:51 -07:00
|
|
|
func isPrometheusEnabled(annotations map[string]string) bool {
|
|
|
|
|
if annotations == nil {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
// if one of the following prometheus annotations are not present
|
|
|
|
|
// we consider the tenant as not integrated with prometheus
|
|
|
|
|
if _, ok := annotations[prometheusPath]; !ok {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
if _, ok := annotations[prometheusPort]; !ok {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
if _, ok := annotations[prometheusScrape]; !ok {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
return true
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
func getTenantInfo(tenant *miniov2.Tenant) *models.Tenant {
|
2020-12-07 09:49:51 -06:00
|
|
|
var pools []*models.Pool
|
2020-09-05 23:48:51 -07:00
|
|
|
consoleImage := ""
|
2020-07-25 14:38:16 -07:00
|
|
|
var totalSize int64
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, p := range tenant.Spec.Pools {
|
|
|
|
|
pools = append(pools, parseTenantPool(&p))
|
|
|
|
|
poolSize := int64(p.Servers) * int64(p.VolumesPerServer) * p.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value()
|
|
|
|
|
totalSize = totalSize + poolSize
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-09-05 23:37:01 -07:00
|
|
|
var deletion string
|
|
|
|
|
if tenant.ObjectMeta.DeletionTimestamp != nil {
|
2021-01-13 14:08:32 -06:00
|
|
|
deletion = tenant.ObjectMeta.DeletionTimestamp.Format(time.RFC3339)
|
2020-09-05 23:37:01 -07:00
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
|
2020-09-05 23:48:51 -07:00
|
|
|
if tenant.HasConsoleEnabled() {
|
|
|
|
|
consoleImage = tenant.Spec.Console.Image
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-01 18:03:22 -07:00
|
|
|
return &models.Tenant{
|
2021-01-13 14:08:32 -06:00
|
|
|
CreationDate: tenant.ObjectMeta.CreationTimestamp.Format(time.RFC3339),
|
2020-09-05 23:48:51 -07:00
|
|
|
DeletionDate: deletion,
|
|
|
|
|
Name: tenant.Name,
|
|
|
|
|
TotalSize: totalSize,
|
|
|
|
|
CurrentState: tenant.Status.CurrentState,
|
2020-12-07 09:49:51 -06:00
|
|
|
Pools: pools,
|
2020-09-05 23:48:51 -07:00
|
|
|
Namespace: tenant.ObjectMeta.Namespace,
|
|
|
|
|
Image: tenant.Spec.Image,
|
|
|
|
|
ConsoleImage: consoleImage,
|
2020-09-17 06:44:16 -07:00
|
|
|
EnablePrometheus: isPrometheusEnabled(tenant.Annotations),
|
2020-07-09 12:24:01 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-04 20:32:57 -07:00
|
|
|
func getTenantInfoResponse(session *models.Principal, params admin_api.TenantInfoParams) (*models.Tenant, *models.Error) {
|
2020-07-25 14:38:16 -07:00
|
|
|
// 5 seconds timeout
|
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
2020-07-09 12:24:01 -07:00
|
|
|
defer cancel()
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-09 12:24:01 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-09 12:24:01 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-25 14:38:16 -07:00
|
|
|
minTenant, err := getTenant(ctx, opClient, params.Namespace, params.Tenant)
|
2020-07-09 12:24:01 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-09 12:24:01 -07:00
|
|
|
}
|
2020-07-25 14:38:16 -07:00
|
|
|
|
2020-07-27 14:19:40 -07:00
|
|
|
info := getTenantInfo(minTenant)
|
2021-01-12 15:55:07 -06:00
|
|
|
|
2021-01-13 14:08:32 -06:00
|
|
|
clientSet, err := cluster.K8sClient(session.STSSessionToken)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, prepareError(err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
k8sClient := k8sClient{
|
|
|
|
|
client: clientSet,
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-12 15:55:07 -06:00
|
|
|
if minTenant.Spec.Console != nil {
|
|
|
|
|
// obtain current subnet license for tenant (if exists)
|
|
|
|
|
license, _ := getSubscriptionLicense(context.Background(), &k8sClient, params.Namespace, minTenant.Spec.Console.ConsoleSecret.Name)
|
|
|
|
|
if license != "" {
|
|
|
|
|
client := &cluster.HTTPClient{
|
|
|
|
|
Client: GetConsoleSTSClient(),
|
|
|
|
|
}
|
|
|
|
|
licenseInfo, _, _ := subscriptionValidate(client, license, "", "")
|
|
|
|
|
// if licenseInfo is present attach it to the tenantInfo response
|
|
|
|
|
if licenseInfo != nil {
|
|
|
|
|
info.SubnetLicense = licenseInfo
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-13 14:08:32 -06:00
|
|
|
// get tenant service
|
|
|
|
|
minTenant.EnsureDefaults()
|
|
|
|
|
//minio service
|
|
|
|
|
minSvc, err := k8sClient.getService(ctx, minTenant.Namespace, minTenant.MinIOCIServiceName(), metav1.GetOptions{})
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, prepareError(err)
|
|
|
|
|
}
|
|
|
|
|
//console service
|
|
|
|
|
conSvc, err := k8sClient.getService(ctx, minTenant.Namespace, minTenant.ConsoleCIServiceName(), metav1.GetOptions{})
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, prepareError(err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
schema := "http"
|
2021-01-13 13:24:30 -08:00
|
|
|
consoleSchema := "http"
|
2021-01-13 14:08:32 -06:00
|
|
|
consolePort := ":9090"
|
|
|
|
|
if minTenant.TLS() {
|
|
|
|
|
schema = "https"
|
2021-01-13 13:24:30 -08:00
|
|
|
}
|
|
|
|
|
if minTenant.AutoCert() || minTenant.ConsoleExternalCert() {
|
|
|
|
|
consoleSchema = "https"
|
2021-01-13 14:08:32 -06:00
|
|
|
consolePort = ":9443"
|
|
|
|
|
}
|
|
|
|
|
var minioEndpoint string
|
|
|
|
|
var consoleEndpoint string
|
|
|
|
|
if len(minSvc.Status.LoadBalancer.Ingress) > 0 {
|
|
|
|
|
minioEndpoint = fmt.Sprintf("%s://%s", schema, minSvc.Status.LoadBalancer.Ingress[0].IP)
|
|
|
|
|
}
|
|
|
|
|
if len(conSvc.Status.LoadBalancer.Ingress) > 0 {
|
2021-01-13 13:24:30 -08:00
|
|
|
consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].IP, consolePort)
|
2021-01-13 14:08:32 -06:00
|
|
|
}
|
|
|
|
|
if minioEndpoint != "" || consoleEndpoint != "" {
|
|
|
|
|
info.Endpoints = &models.TenantEndpoints{
|
|
|
|
|
Console: consoleEndpoint,
|
|
|
|
|
Minio: minioEndpoint,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-09 12:24:01 -07:00
|
|
|
return info, nil
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2020-09-03 10:20:58 -07:00
|
|
|
func listTenants(ctx context.Context, operatorClient OperatorClientI, namespace string, limit *int32) (*models.ListTenantsResponse, error) {
|
2020-07-01 18:03:22 -07:00
|
|
|
listOpts := metav1.ListOptions{
|
|
|
|
|
Limit: 10,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if limit != nil {
|
|
|
|
|
listOpts.Limit = int64(*limit)
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-25 14:38:16 -07:00
|
|
|
minTenants, err := operatorClient.TenantList(ctx, namespace, listOpts)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var tenants []*models.TenantList
|
2020-07-27 18:03:47 -07:00
|
|
|
|
2020-07-30 13:55:11 -07:00
|
|
|
for _, tenant := range minTenants.Items {
|
|
|
|
|
var totalSize int64
|
2020-07-01 18:03:22 -07:00
|
|
|
var instanceCount int64
|
|
|
|
|
var volumeCount int64
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, pool := range tenant.Spec.Pools {
|
|
|
|
|
instanceCount = instanceCount + int64(pool.Servers)
|
|
|
|
|
volumeCount = volumeCount + int64(pool.Servers*pool.VolumesPerServer)
|
|
|
|
|
if pool.VolumeClaimTemplate != nil {
|
|
|
|
|
poolSize := int64(pool.VolumesPerServer) * int64(pool.Servers) * pool.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value()
|
|
|
|
|
totalSize = totalSize + poolSize
|
2020-07-27 18:03:47 -07:00
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2020-09-05 23:37:01 -07:00
|
|
|
var deletion string
|
|
|
|
|
if tenant.ObjectMeta.DeletionTimestamp != nil {
|
2021-01-13 14:08:32 -06:00
|
|
|
deletion = tenant.ObjectMeta.DeletionTimestamp.Format(time.RFC3339)
|
2020-09-05 23:37:01 -07:00
|
|
|
}
|
|
|
|
|
|
2020-07-01 18:03:22 -07:00
|
|
|
tenants = append(tenants, &models.TenantList{
|
2021-01-13 14:08:32 -06:00
|
|
|
CreationDate: tenant.ObjectMeta.CreationTimestamp.Format(time.RFC3339),
|
2020-09-05 23:37:01 -07:00
|
|
|
DeletionDate: deletion,
|
2020-07-30 13:55:11 -07:00
|
|
|
Name: tenant.ObjectMeta.Name,
|
2020-12-07 09:49:51 -06:00
|
|
|
PoolCount: int64(len(tenant.Spec.Pools)),
|
2020-07-01 18:03:22 -07:00
|
|
|
InstanceCount: instanceCount,
|
|
|
|
|
VolumeCount: volumeCount,
|
2020-07-30 13:55:11 -07:00
|
|
|
CurrentState: tenant.Status.CurrentState,
|
|
|
|
|
Namespace: tenant.ObjectMeta.Namespace,
|
2020-07-27 18:03:47 -07:00
|
|
|
TotalSize: totalSize,
|
2020-07-01 18:03:22 -07:00
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return &models.ListTenantsResponse{
|
|
|
|
|
Tenants: tenants,
|
2020-07-30 13:55:11 -07:00
|
|
|
Total: int64(len(tenants)),
|
2020-07-01 18:03:22 -07:00
|
|
|
}, nil
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-04 20:32:57 -07:00
|
|
|
func getListAllTenantsResponse(session *models.Principal, params admin_api.ListAllTenantsParams) (*models.ListTenantsResponse, *models.Error) {
|
2020-07-01 18:03:22 -07:00
|
|
|
ctx := context.Background()
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
|
|
|
|
listT, err := listTenants(ctx, opClient, "", params.Limit)
|
|
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return listT, nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// getListTenantsResponse list tenants by namespace
|
2020-09-04 20:32:57 -07:00
|
|
|
func getListTenantsResponse(session *models.Principal, params admin_api.ListTenantsParams) (*models.ListTenantsResponse, *models.Error) {
|
2020-07-01 18:03:22 -07:00
|
|
|
ctx := context.Background()
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
|
|
|
|
listT, err := listTenants(ctx, opClient, params.Namespace, params.Limit)
|
|
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
return listT, nil
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-09 17:08:34 -07:00
|
|
|
func getTenantCreatedResponse(session *models.Principal, params admin_api.CreateTenantParams) (response *models.CreateTenantResponse, mError *models.Error) {
|
2020-08-04 16:04:04 -07:00
|
|
|
tenantReq := params.Body
|
|
|
|
|
minioImage := tenantReq.Image
|
2020-08-04 20:54:59 -07:00
|
|
|
ctx := context.Background()
|
2020-11-30 12:08:13 -08:00
|
|
|
consoleHasTLS := false
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-07-01 18:03:22 -07:00
|
|
|
if minioImage == "" {
|
|
|
|
|
minImg, err := cluster.GetMinioImage()
|
2020-08-11 22:29:33 -07:00
|
|
|
// we can live without figuring out the latest version of MinIO, Operator will use a hardcoded value
|
|
|
|
|
if err == nil {
|
|
|
|
|
minioImage = *minImg
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
}
|
2020-07-30 13:55:11 -07:00
|
|
|
// get Kubernetes Client
|
2020-12-07 17:11:08 -06:00
|
|
|
clientSet, err := cluster.K8sClient(session.STSSessionToken)
|
2020-09-03 10:20:58 -07:00
|
|
|
k8sClient := k8sClient{
|
|
|
|
|
client: clientSet,
|
|
|
|
|
}
|
2020-07-30 13:55:11 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-30 13:55:11 -07:00
|
|
|
}
|
|
|
|
|
|
2020-08-04 16:04:04 -07:00
|
|
|
ns := *tenantReq.Namespace
|
2020-07-01 18:03:22 -07:00
|
|
|
|
|
|
|
|
// if access/secret are provided, use them, else create a random pair
|
|
|
|
|
accessKey := RandomCharString(16)
|
|
|
|
|
secretKey := RandomCharString(32)
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-08-04 16:04:04 -07:00
|
|
|
if tenantReq.AccessKey != "" {
|
|
|
|
|
accessKey = tenantReq.AccessKey
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-08-04 16:04:04 -07:00
|
|
|
if tenantReq.SecretKey != "" {
|
|
|
|
|
secretKey = tenantReq.SecretKey
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-08-20 19:09:13 -07:00
|
|
|
tenantName := *tenantReq.Name
|
|
|
|
|
secretName := fmt.Sprintf("%s-secret", tenantName)
|
2020-07-01 18:03:22 -07:00
|
|
|
imm := true
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-07-01 18:03:22 -07:00
|
|
|
instanceSecret := corev1.Secret{
|
|
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
|
|
|
Name: secretName,
|
2020-08-20 19:09:13 -07:00
|
|
|
Labels: map[string]string{
|
2021-02-01 12:13:51 -08:00
|
|
|
miniov2.TenantLabel: tenantName,
|
2020-08-20 19:09:13 -07:00
|
|
|
},
|
2020-07-01 18:03:22 -07:00
|
|
|
},
|
|
|
|
|
Immutable: &imm,
|
|
|
|
|
Data: map[string][]byte{
|
|
|
|
|
"accesskey": []byte(accessKey),
|
|
|
|
|
"secretkey": []byte(secretKey),
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-03 10:20:58 -07:00
|
|
|
_, err = clientSet.CoreV1().Secrets(ns).Create(ctx, &instanceSecret, metav1.CreateOptions{})
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-09-09 17:08:34 -07:00
|
|
|
// delete secrets created if an error occurred during tenant creation,
|
|
|
|
|
defer func() {
|
|
|
|
|
if mError != nil {
|
|
|
|
|
log.Printf("deleting secrets created for failed tenant: %s if any\n", tenantName)
|
|
|
|
|
opts := metav1.ListOptions{
|
2021-02-01 12:13:51 -08:00
|
|
|
LabelSelector: fmt.Sprintf("%s=%s", miniov2.TenantLabel, tenantName),
|
2020-09-09 17:08:34 -07:00
|
|
|
}
|
|
|
|
|
err = clientSet.CoreV1().Secrets(ns).DeleteCollection(ctx, metav1.DeleteOptions{}, opts)
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.Println("error deleting tenant's secrets:", err)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}()
|
2020-07-01 18:03:22 -07:00
|
|
|
|
2021-01-12 15:55:07 -06:00
|
|
|
var environmentVariables []corev1.EnvVar
|
2020-08-04 22:32:41 -07:00
|
|
|
// Check the Erasure Coding Parity for validity and pass it to Tenant
|
|
|
|
|
if tenantReq.ErasureCodingParity > 0 {
|
2020-09-09 17:08:34 -07:00
|
|
|
if tenantReq.ErasureCodingParity < 2 || tenantReq.ErasureCodingParity > 8 {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(errorInvalidErasureCodingValue)
|
2020-08-04 22:32:41 -07:00
|
|
|
}
|
2021-01-12 15:55:07 -06:00
|
|
|
environmentVariables = append(environmentVariables, corev1.EnvVar{
|
2020-08-04 22:32:41 -07:00
|
|
|
Name: "MINIO_STORAGE_CLASS_STANDARD",
|
2020-08-07 12:28:46 -07:00
|
|
|
Value: fmt.Sprintf("EC:%d", tenantReq.ErasureCodingParity),
|
2020-08-04 22:32:41 -07:00
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-01 18:03:22 -07:00
|
|
|
//Construct a MinIO Instance with everything we are getting from parameters
|
2021-02-01 12:13:51 -08:00
|
|
|
minInst := miniov2.Tenant{
|
2020-07-01 18:03:22 -07:00
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
2020-09-17 06:44:16 -07:00
|
|
|
Name: tenantName,
|
|
|
|
|
Labels: tenantReq.Labels,
|
2020-07-01 18:03:22 -07:00
|
|
|
},
|
2021-02-01 12:13:51 -08:00
|
|
|
Spec: miniov2.TenantSpec{
|
2020-07-01 18:03:22 -07:00
|
|
|
Image: minioImage,
|
|
|
|
|
Mountpath: "/export",
|
|
|
|
|
CredsSecret: &corev1.LocalObjectReference{
|
|
|
|
|
Name: secretName,
|
|
|
|
|
},
|
2021-01-12 15:55:07 -06:00
|
|
|
Env: environmentVariables,
|
2020-07-01 18:03:22 -07:00
|
|
|
},
|
|
|
|
|
}
|
2020-08-02 23:45:54 -07:00
|
|
|
idpEnabled := false
|
|
|
|
|
// Enable IDP (Active Directory) for MinIO
|
2020-08-04 16:04:04 -07:00
|
|
|
if tenantReq.Idp != nil && tenantReq.Idp.ActiveDirectory != nil {
|
|
|
|
|
url := *tenantReq.Idp.ActiveDirectory.URL
|
|
|
|
|
userNameFormat := *tenantReq.Idp.ActiveDirectory.UsernameFormat
|
|
|
|
|
userSearchFilter := *tenantReq.Idp.ActiveDirectory.UserSearchFilter
|
2020-08-09 16:08:58 -07:00
|
|
|
tlsSkipVerify := tenantReq.Idp.ActiveDirectory.SkipTLSVerification
|
2020-08-04 16:04:04 -07:00
|
|
|
serverInsecure := tenantReq.Idp.ActiveDirectory.ServerInsecure
|
|
|
|
|
groupSearchDN := tenantReq.Idp.ActiveDirectory.GroupSearchBaseDn
|
|
|
|
|
groupSearchFilter := tenantReq.Idp.ActiveDirectory.GroupSearchFilter
|
|
|
|
|
groupNameAttribute := tenantReq.Idp.ActiveDirectory.GroupNameAttribute
|
2020-08-02 23:45:54 -07:00
|
|
|
if url != "" && userNameFormat != "" && userSearchFilter != "" {
|
|
|
|
|
// CONSOLE_LDAP_ENABLED
|
|
|
|
|
idpEnabled = true
|
|
|
|
|
minInst.Spec.Env = append(minInst.Spec.Env, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_SERVER_ADDR",
|
|
|
|
|
Value: userNameFormat,
|
|
|
|
|
}, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_USERNAME_FORMAT",
|
|
|
|
|
Value: userNameFormat,
|
|
|
|
|
}, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_USERNAME_SEARCH_FILTER",
|
|
|
|
|
Value: userSearchFilter,
|
|
|
|
|
}, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_USERNAME_SEARCH_FILTER",
|
|
|
|
|
Value: userSearchFilter,
|
|
|
|
|
}, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_GROUP_SEARCH_BASE_DN",
|
|
|
|
|
Value: groupSearchDN,
|
|
|
|
|
}, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_GROUP_SEARCH_FILTER",
|
|
|
|
|
Value: groupSearchFilter,
|
|
|
|
|
}, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_GROUP_NAME_ATTRIBUTE",
|
|
|
|
|
Value: groupNameAttribute,
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
if tlsSkipVerify {
|
|
|
|
|
minInst.Spec.Env = append(minInst.Spec.Env, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_TLS_SKIP_VERIFY",
|
|
|
|
|
Value: "on",
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
if serverInsecure {
|
|
|
|
|
minInst.Spec.Env = append(minInst.Spec.Env, corev1.EnvVar{
|
|
|
|
|
Name: "MINIO_IDENTITY_LDAP_SERVER_INSECURE",
|
|
|
|
|
Value: "on",
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-09-22 15:50:37 -07:00
|
|
|
isEncryptionEnabled := false
|
2020-11-30 12:08:13 -08:00
|
|
|
|
|
|
|
|
if tenantReq.EnableTLS != nil {
|
|
|
|
|
// if enableTLS is defined in the create tenant request we assign the value
|
|
|
|
|
// to the RequestAutoCert attribute in the tenant spec
|
2020-11-04 21:45:48 -08:00
|
|
|
minInst.Spec.RequestAutoCert = tenantReq.EnableTLS
|
2020-11-30 12:08:13 -08:00
|
|
|
if *tenantReq.EnableTLS {
|
|
|
|
|
// requestAutoCert is enabled, MinIO will be deployed with TLS enabled and encryption can be enabled
|
|
|
|
|
isEncryptionEnabled = true
|
|
|
|
|
consoleHasTLS = true
|
|
|
|
|
}
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
}
|
2020-11-30 12:08:13 -08:00
|
|
|
// External TLS certificates for MinIO
|
|
|
|
|
if tenantReq.TLS != nil && len(tenantReq.TLS.Minio) > 0 {
|
2020-09-22 15:50:37 -07:00
|
|
|
isEncryptionEnabled = true
|
2020-09-03 10:20:58 -07:00
|
|
|
// Certificates used by the MinIO instance
|
|
|
|
|
externalCertSecretName := fmt.Sprintf("%s-instance-external-certificates", secretName)
|
2020-10-05 12:09:34 -07:00
|
|
|
externalCertSecret, err := createOrReplaceExternalCertSecrets(ctx, &k8sClient, ns, tenantReq.TLS.Minio, externalCertSecretName, tenantName)
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
}
|
2020-09-03 10:20:58 -07:00
|
|
|
minInst.Spec.ExternalCertSecret = externalCertSecret
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
}
|
2020-11-30 12:08:13 -08:00
|
|
|
// If encryption configuration is present and TLS will be enabled (using AutoCert or External certificates)
|
2020-09-22 15:50:37 -07:00
|
|
|
if tenantReq.Encryption != nil && isEncryptionEnabled {
|
2020-11-30 12:08:13 -08:00
|
|
|
// KES client mTLSCertificates used by MinIO instance
|
|
|
|
|
if tenantReq.Encryption.Client != nil {
|
2020-09-03 10:20:58 -07:00
|
|
|
tenantExternalClientCertSecretName := fmt.Sprintf("%s-tenant-external-client-cert", secretName)
|
2020-10-05 12:09:34 -07:00
|
|
|
certificates := []*models.KeyPairConfiguration{tenantReq.Encryption.Client}
|
|
|
|
|
certificateSecrets, err := createOrReplaceExternalCertSecrets(ctx, &k8sClient, ns, certificates, tenantExternalClientCertSecretName, tenantName)
|
2020-08-09 14:47:06 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(errorGeneric)
|
2020-08-09 14:47:06 -07:00
|
|
|
}
|
2020-10-05 12:09:34 -07:00
|
|
|
if len(certificateSecrets) > 0 {
|
|
|
|
|
minInst.Spec.ExternalClientCertSecret = certificateSecrets[0]
|
|
|
|
|
}
|
2020-08-07 20:23:03 -07:00
|
|
|
}
|
2020-11-30 12:08:13 -08:00
|
|
|
|
2020-08-07 20:23:03 -07:00
|
|
|
// KES configuration for Tenant instance
|
2020-11-30 12:08:13 -08:00
|
|
|
minInst.Spec.KES, err = getKESConfiguration(ctx, &k8sClient, ns, tenantReq.Encryption, secretName, tenantName)
|
2020-08-07 20:23:03 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(errorGeneric)
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
}
|
2020-09-22 20:49:25 -07:00
|
|
|
// Set Labels, Annotations and Node Selector for KES
|
2020-09-22 15:50:37 -07:00
|
|
|
minInst.Spec.KES.Labels = tenantReq.Encryption.Labels
|
|
|
|
|
minInst.Spec.KES.Annotations = tenantReq.Encryption.Annotations
|
|
|
|
|
minInst.Spec.KES.NodeSelector = tenantReq.Encryption.NodeSelector
|
|
|
|
|
}
|
2021-02-02 18:49:40 -06:00
|
|
|
// External TLS CA certificates for MinIO
|
|
|
|
|
if tenantReq.TLS != nil && len(tenantReq.TLS.CaCertificates) > 0 {
|
|
|
|
|
var caCertificates []tenantSecret
|
|
|
|
|
for i, caCertificate := range tenantReq.TLS.CaCertificates {
|
|
|
|
|
certificateContent, err := base64.StdEncoding.DecodeString(caCertificate)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, prepareError(errorGeneric, nil, err)
|
|
|
|
|
}
|
|
|
|
|
caCertificates = append(caCertificates, tenantSecret{
|
|
|
|
|
Name: fmt.Sprintf("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.ExternalCaCertSecret = certificateSecrets
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
// optionals are set below
|
2020-07-30 13:55:11 -07:00
|
|
|
var consoleAccess string
|
|
|
|
|
var consoleSecret string
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-08-09 17:19:39 -07:00
|
|
|
enableConsole := true
|
|
|
|
|
if tenantReq.EnableConsole != nil && *tenantReq.EnableConsole {
|
|
|
|
|
enableConsole = *tenantReq.EnableConsole
|
|
|
|
|
}
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
|
2020-07-26 00:34:17 -07:00
|
|
|
if enableConsole {
|
2020-08-20 19:09:13 -07:00
|
|
|
consoleSelector := fmt.Sprintf("%s-console", tenantName)
|
2020-07-26 00:34:17 -07:00
|
|
|
consoleSecretName := fmt.Sprintf("%s-secret", consoleSelector)
|
2020-07-30 13:55:11 -07:00
|
|
|
consoleAccess = RandomCharString(16)
|
|
|
|
|
consoleSecret = RandomCharString(32)
|
2021-01-12 15:55:07 -06:00
|
|
|
|
|
|
|
|
consoleSecretData := map[string][]byte{
|
|
|
|
|
"CONSOLE_PBKDF_PASSPHRASE": []byte(RandomCharString(16)),
|
|
|
|
|
"CONSOLE_PBKDF_SALT": []byte(RandomCharString(8)),
|
|
|
|
|
"CONSOLE_ACCESS_KEY": []byte(consoleAccess),
|
|
|
|
|
"CONSOLE_SECRET_KEY": []byte(consoleSecret),
|
|
|
|
|
}
|
|
|
|
|
// If Subnet License is present in k8s secrets, copy that to the CONSOLE_SUBNET_LICENSE env variable
|
|
|
|
|
// of the console tenant
|
|
|
|
|
license, _ := getSubscriptionLicense(ctx, &k8sClient, cluster.Namespace, OperatorSubnetLicenseSecretName)
|
|
|
|
|
if license != "" {
|
|
|
|
|
consoleSecretData[ConsoleSubnetLicense] = []byte(license)
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
imm := true
|
|
|
|
|
instanceSecret := corev1.Secret{
|
|
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
2020-07-26 00:34:17 -07:00
|
|
|
Name: consoleSecretName,
|
2020-08-20 19:09:13 -07:00
|
|
|
Labels: map[string]string{
|
2021-02-01 12:13:51 -08:00
|
|
|
miniov2.TenantLabel: tenantName,
|
2020-08-20 19:09:13 -07:00
|
|
|
},
|
2020-07-01 18:03:22 -07:00
|
|
|
},
|
|
|
|
|
Immutable: &imm,
|
2021-01-12 15:55:07 -06:00
|
|
|
Data: consoleSecretData,
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-08-02 23:45:54 -07:00
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
minInst.Spec.Console = &miniov2.ConsoleConfiguration{
|
2020-11-30 12:08:13 -08:00
|
|
|
Replicas: 1,
|
2021-01-13 14:08:32 -06:00
|
|
|
Image: getConsoleImage(),
|
2020-11-30 12:08:13 -08:00
|
|
|
ConsoleSecret: &corev1.LocalObjectReference{Name: consoleSecretName},
|
|
|
|
|
Resources: corev1.ResourceRequirements{
|
|
|
|
|
Requests: map[corev1.ResourceName]resource.Quantity{
|
|
|
|
|
"memory": resource.MustParse("64Mi"),
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
if tenantReq.TLS != nil && tenantReq.TLS.Console != nil {
|
|
|
|
|
consoleHasTLS = true
|
|
|
|
|
// Certificates used by the console instance
|
|
|
|
|
externalCertSecretName := fmt.Sprintf("%s-console-external-certificates", secretName)
|
|
|
|
|
certificates := []*models.KeyPairConfiguration{tenantReq.TLS.Console}
|
|
|
|
|
externalCertSecret, err := createOrReplaceExternalCertSecrets(ctx, &k8sClient, ns, certificates, externalCertSecretName, tenantName)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, prepareError(errorGeneric)
|
|
|
|
|
}
|
|
|
|
|
if len(externalCertSecret) > 0 {
|
|
|
|
|
minInst.Spec.Console.ExternalCertSecret = externalCertSecret[0]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If IDP is not already enabled via LDAP (Active Directory) and OIDC configuration is present then
|
|
|
|
|
// enable oidc for console
|
2020-08-04 16:04:04 -07:00
|
|
|
if !idpEnabled && tenantReq.Idp != nil && tenantReq.Idp.Oidc != nil {
|
|
|
|
|
url := *tenantReq.Idp.Oidc.URL
|
|
|
|
|
clientID := *tenantReq.Idp.Oidc.ClientID
|
|
|
|
|
secretID := *tenantReq.Idp.Oidc.SecretID
|
2020-08-02 23:45:54 -07:00
|
|
|
if url != "" && clientID != "" && secretID != "" {
|
|
|
|
|
instanceSecret.Data["CONSOLE_IDP_URL"] = []byte(url)
|
|
|
|
|
instanceSecret.Data["CONSOLE_IDP_CLIENT_ID"] = []byte(clientID)
|
|
|
|
|
instanceSecret.Data["CONSOLE_IDP_SECRET"] = []byte(secretID)
|
|
|
|
|
consoleScheme := "http"
|
|
|
|
|
consolePort := 9090
|
2020-11-30 12:08:13 -08:00
|
|
|
// If Console will be deployed with TLS enabled (using AutoCert or External certificates)
|
|
|
|
|
if consoleHasTLS {
|
2020-08-02 23:45:54 -07:00
|
|
|
consoleScheme = "https"
|
|
|
|
|
consolePort = 9443
|
|
|
|
|
}
|
|
|
|
|
// https://[HOSTNAME]:9443 will be replaced by javascript in the browser to use the actual hostname
|
|
|
|
|
// assigned to Console, eg: https://localhost:9443
|
|
|
|
|
instanceSecret.Data["CONSOLE_IDP_CALLBACK"] = []byte(fmt.Sprintf("%s://[HOSTNAME]:%d/oauth_callback", consoleScheme, consolePort))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-03 10:20:58 -07:00
|
|
|
_, err = clientSet.CoreV1().Secrets(ns).Create(ctx, &instanceSecret, metav1.CreateOptions{})
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(errorGeneric)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2020-09-22 15:50:37 -07:00
|
|
|
// Set Labels, Annotations and Node Selector for Console
|
|
|
|
|
if tenantReq.Console != nil {
|
|
|
|
|
minInst.Spec.Console.Annotations = tenantReq.Console.Annotations
|
|
|
|
|
minInst.Spec.Console.Labels = tenantReq.Console.Labels
|
|
|
|
|
minInst.Spec.Console.NodeSelector = tenantReq.Console.NodeSelector
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2020-08-05 12:35:41 -07:00
|
|
|
// add annotations
|
|
|
|
|
var annotations map[string]string
|
2020-09-17 06:44:16 -07:00
|
|
|
|
2020-08-24 15:07:36 -07:00
|
|
|
if len(tenantReq.Annotations) > 0 {
|
2020-08-05 12:35:41 -07:00
|
|
|
annotations = tenantReq.Annotations
|
2020-09-17 06:44:16 -07:00
|
|
|
minInst.Annotations = annotations
|
2020-08-05 12:35:41 -07:00
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
// set the pools if they are provided
|
|
|
|
|
for _, pool := range tenantReq.Pools {
|
|
|
|
|
pool, err := parseTenantPoolRequest(pool)
|
2020-07-29 01:01:17 -07:00
|
|
|
if err != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
log.Println("parseTenantPoolRequest", err)
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
minInst.Spec.Pools = append(minInst.Spec.Pools, *pool)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Set Mount Path if provided
|
2020-08-04 16:04:04 -07:00
|
|
|
if tenantReq.MounthPath != "" {
|
|
|
|
|
minInst.Spec.Mountpath = tenantReq.MounthPath
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-08-04 16:04:04 -07:00
|
|
|
|
2020-08-11 18:20:43 -07:00
|
|
|
// We accept either `image_pull_secret` or the individual details of the `image_registry` but not both
|
|
|
|
|
var imagePullSecret string
|
|
|
|
|
|
|
|
|
|
if tenantReq.ImagePullSecret != "" {
|
|
|
|
|
imagePullSecret = tenantReq.ImagePullSecret
|
2020-09-09 17:08:34 -07:00
|
|
|
} else if imagePullSecret, err = setImageRegistry(ctx, tenantReq.ImageRegistry, clientSet.CoreV1(), ns, tenantName); err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-08-11 18:20:43 -07:00
|
|
|
// pass the image pull secret to the Tenant
|
|
|
|
|
if imagePullSecret != "" {
|
|
|
|
|
minInst.Spec.ImagePullSecret = corev1.LocalObjectReference{
|
|
|
|
|
Name: imagePullSecret,
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
|
2020-08-24 15:07:36 -07:00
|
|
|
// prometheus annotations support
|
2020-09-17 06:44:16 -07:00
|
|
|
if tenantReq.EnablePrometheus != nil && *tenantReq.EnablePrometheus && minInst.Annotations != nil {
|
|
|
|
|
minInst.Annotations[prometheusPath] = "/minio/prometheus/metrics"
|
2021-02-01 12:13:51 -08:00
|
|
|
minInst.Annotations[prometheusPort] = fmt.Sprint(miniov2.MinIOPort)
|
2020-09-17 06:44:16 -07:00
|
|
|
minInst.Annotations[prometheusScrape] = "true"
|
2020-08-24 15:07:36 -07:00
|
|
|
}
|
|
|
|
|
|
2020-08-11 18:20:43 -07:00
|
|
|
// set console image if provided
|
|
|
|
|
if tenantReq.ConsoleImage != "" {
|
|
|
|
|
minInst.Spec.Console.Image = tenantReq.ConsoleImage
|
2020-08-05 01:21:35 -07:00
|
|
|
}
|
2021-01-13 14:08:32 -06:00
|
|
|
// default activate lgo search and prometheus
|
2021-02-01 12:13:51 -08:00
|
|
|
minInst.Spec.Log = &miniov2.LogConfig{
|
2021-01-13 14:08:32 -06:00
|
|
|
Image: "miniodev/logsearch:v4.0.0",
|
2021-02-01 12:13:51 -08:00
|
|
|
Audit: &miniov2.AuditConfig{DiskCapacityGB: swag.Int(10)},
|
2021-01-13 14:08:32 -06:00
|
|
|
}
|
2021-02-01 12:13:51 -08:00
|
|
|
minInst.Spec.Prometheus = &miniov2.PrometheusConfig{
|
2021-01-13 14:08:32 -06:00
|
|
|
DiskCapacityDB: swag.Int(5),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// expose services
|
|
|
|
|
if tenantReq.ExposeMinio || tenantReq.ExposeConsole {
|
2021-02-01 12:13:51 -08:00
|
|
|
minInst.Spec.ExposeServices = &miniov2.ExposeServices{
|
2021-01-13 14:08:32 -06:00
|
|
|
MinIO: tenantReq.ExposeMinio,
|
|
|
|
|
Console: tenantReq.ExposeConsole,
|
|
|
|
|
}
|
|
|
|
|
log.Println("happened")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
yo, _ := yaml.Marshal(minInst)
|
|
|
|
|
log.Println(string(yo))
|
2020-08-05 01:21:35 -07:00
|
|
|
|
2020-12-07 17:11:08 -06:00
|
|
|
opClient, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
_, err = opClient.MinioV2().Tenants(ns).Create(context.Background(), &minInst, metav1.CreateOptions{})
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
log.Println("Create", err)
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Integratrions
|
|
|
|
|
if os.Getenv("GKE_INTEGRATION") != "" {
|
2020-12-07 17:11:08 -06:00
|
|
|
err := gkeIntegration(clientSet, tenantName, ns, session.STSSessionToken)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
}
|
2020-11-18 16:16:06 -08:00
|
|
|
response = &models.CreateTenantResponse{}
|
2020-07-30 13:55:11 -07:00
|
|
|
// Attach Console Credentials
|
|
|
|
|
if enableConsole {
|
2020-08-04 16:04:04 -07:00
|
|
|
response.Console = &models.CreateTenantResponseConsole{
|
|
|
|
|
AccessKey: consoleAccess,
|
|
|
|
|
SecretKey: consoleSecret,
|
|
|
|
|
}
|
2020-07-30 13:55:11 -07:00
|
|
|
}
|
|
|
|
|
return response, nil
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
|
2020-08-11 18:20:43 -07:00
|
|
|
// setImageRegistry creates a secret to store the private registry credentials, if one exist it updates the existing one
|
|
|
|
|
// returns the name of the secret created/updated
|
2020-09-09 17:08:34 -07:00
|
|
|
func setImageRegistry(ctx context.Context, req *models.ImageRegistry, clientset v1.CoreV1Interface, namespace, tenantName string) (string, error) {
|
2020-08-04 20:54:59 -07:00
|
|
|
if req == nil || req.Registry == nil || req.Username == nil || req.Password == nil {
|
2020-08-11 18:20:43 -07:00
|
|
|
return "", nil
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
credentials := make(map[string]imageRegistryCredentials)
|
|
|
|
|
// username:password encoded
|
|
|
|
|
authData := []byte(fmt.Sprintf("%s:%s", *req.Username, *req.Password))
|
|
|
|
|
authStr := base64.StdEncoding.EncodeToString(authData)
|
|
|
|
|
|
|
|
|
|
credentials[*req.Registry] = imageRegistryCredentials{
|
|
|
|
|
Username: *req.Username,
|
|
|
|
|
Password: *req.Password,
|
|
|
|
|
Auth: authStr,
|
|
|
|
|
}
|
|
|
|
|
imRegistry := imageRegistry{
|
|
|
|
|
Auths: credentials,
|
|
|
|
|
}
|
|
|
|
|
imRegistryJSON, err := json.Marshal(imRegistry)
|
|
|
|
|
if err != nil {
|
2020-08-11 18:20:43 -07:00
|
|
|
return "", err
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
|
|
|
|
|
2020-08-11 18:20:43 -07:00
|
|
|
pullSecretName := fmt.Sprintf("%s-regcred", tenantName)
|
2020-09-06 23:20:27 -07:00
|
|
|
secretCredentials := map[string][]byte{
|
|
|
|
|
corev1.DockerConfigJsonKey: []byte(string(imRegistryJSON)),
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
|
|
|
|
// Get or Create secret if it doesn't exist
|
2020-09-06 23:20:27 -07:00
|
|
|
currentSecret, err := clientset.Secrets(namespace).Get(ctx, pullSecretName, metav1.GetOptions{})
|
2020-08-04 20:54:59 -07:00
|
|
|
if err != nil {
|
|
|
|
|
if k8sErrors.IsNotFound(err) {
|
2020-09-06 23:20:27 -07:00
|
|
|
instanceSecret := corev1.Secret{
|
|
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
|
|
|
Name: pullSecretName,
|
|
|
|
|
Labels: map[string]string{
|
2021-02-01 12:13:51 -08:00
|
|
|
miniov2.TenantLabel: tenantName,
|
2020-09-06 23:20:27 -07:00
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Data: secretCredentials,
|
|
|
|
|
Type: corev1.SecretTypeDockerConfigJson,
|
|
|
|
|
}
|
2020-08-04 20:54:59 -07:00
|
|
|
_, err = clientset.Secrets(namespace).Create(ctx, &instanceSecret, metav1.CreateOptions{})
|
|
|
|
|
if err != nil {
|
2020-08-11 18:20:43 -07:00
|
|
|
return "", err
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
2020-09-04 17:09:17 -07:00
|
|
|
return pullSecretName, nil
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
2020-08-11 18:20:43 -07:00
|
|
|
return "", err
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
2020-09-06 23:20:27 -07:00
|
|
|
currentSecret.Data = secretCredentials
|
|
|
|
|
_, err = clientset.Secrets(namespace).Update(ctx, currentSecret, metav1.UpdateOptions{})
|
2020-08-04 20:54:59 -07:00
|
|
|
if err != nil {
|
2020-08-11 18:20:43 -07:00
|
|
|
return "", err
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
2020-08-11 18:20:43 -07:00
|
|
|
return pullSecretName, nil
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
|
|
|
|
|
2020-07-25 14:38:16 -07:00
|
|
|
// updateTenantAction does an update on the minioTenant by patching the desired changes
|
2020-09-03 10:20:58 -07:00
|
|
|
func updateTenantAction(ctx context.Context, operatorClient OperatorClientI, clientset v1.CoreV1Interface, httpCl cluster.HTTPClientI, namespace string, params admin_api.UpdateTenantParams) error {
|
2020-07-01 18:03:22 -07:00
|
|
|
imageToUpdate := params.Body.Image
|
2020-08-04 20:54:59 -07:00
|
|
|
imageRegistryReq := params.Body.ImageRegistry
|
|
|
|
|
|
|
|
|
|
minInst, err := operatorClient.TenantGet(ctx, namespace, params.Tenant, metav1.GetOptions{})
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
2020-08-11 18:20:43 -07:00
|
|
|
// we can take either the `image_pull_secret` of the `image_registry` but not both
|
|
|
|
|
if params.Body.ImagePullSecret != "" {
|
|
|
|
|
minInst.Spec.ImagePullSecret.Name = params.Body.ImagePullSecret
|
|
|
|
|
} else {
|
|
|
|
|
// update the image pull secret content
|
2020-09-09 17:08:34 -07:00
|
|
|
if _, err := setImageRegistry(ctx, imageRegistryReq, clientset, namespace, params.Tenant); err != nil {
|
2020-08-11 18:20:43 -07:00
|
|
|
log.Println("error setting image registry secret:", err)
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// update the console image
|
|
|
|
|
if strings.TrimSpace(params.Body.ConsoleImage) != "" && minInst.Spec.Console != nil {
|
|
|
|
|
minInst.Spec.Console.Image = params.Body.ConsoleImage
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
|
|
|
|
|
// if image to update is empty we'll use the latest image by default
|
|
|
|
|
if strings.TrimSpace(imageToUpdate) != "" {
|
2020-08-04 20:54:59 -07:00
|
|
|
minInst.Spec.Image = imageToUpdate
|
2020-07-01 18:03:22 -07:00
|
|
|
} else {
|
|
|
|
|
im, err := cluster.GetLatestMinioImage(httpCl)
|
2020-08-11 18:20:43 -07:00
|
|
|
// if we can't get the MinIO image, we won' auto-update it unless it's explicit by name
|
|
|
|
|
if err == nil {
|
|
|
|
|
minInst.Spec.Image = *im
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-05 23:48:51 -07:00
|
|
|
// Prometheus Annotations
|
2020-09-17 06:44:16 -07:00
|
|
|
currentAnnotations := minInst.Annotations
|
2020-09-05 23:48:51 -07:00
|
|
|
prometheusAnnotations := map[string]string{
|
|
|
|
|
prometheusPath: "/minio/prometheus/metrics",
|
2021-02-01 12:13:51 -08:00
|
|
|
prometheusPort: fmt.Sprint(miniov2.MinIOPort),
|
2020-09-05 23:48:51 -07:00
|
|
|
prometheusScrape: "true",
|
|
|
|
|
}
|
2020-09-21 21:31:30 -07:00
|
|
|
if params.Body.EnablePrometheus && currentAnnotations != nil {
|
2020-09-05 23:48:51 -07:00
|
|
|
// add prometheus annotations to the tenant
|
2020-09-17 06:44:16 -07:00
|
|
|
minInst.Annotations = addAnnotations(currentAnnotations, prometheusAnnotations)
|
2020-12-07 09:49:51 -06:00
|
|
|
// add prometheus annotations to the each pool
|
|
|
|
|
if minInst.Spec.Pools != nil {
|
|
|
|
|
for _, pool := range minInst.Spec.Pools {
|
|
|
|
|
poolAnnotations := pool.VolumeClaimTemplate.GetObjectMeta().GetAnnotations()
|
|
|
|
|
pool.VolumeClaimTemplate.GetObjectMeta().SetAnnotations(addAnnotations(poolAnnotations, prometheusAnnotations))
|
2020-09-05 23:48:51 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// remove prometheus annotations to the tenant
|
2020-09-17 06:44:16 -07:00
|
|
|
minInst.Annotations = removeAnnotations(currentAnnotations, prometheusAnnotations)
|
2020-12-07 09:49:51 -06:00
|
|
|
// add prometheus annotations from each pool
|
|
|
|
|
if minInst.Spec.Pools != nil {
|
|
|
|
|
for _, pool := range minInst.Spec.Pools {
|
|
|
|
|
poolAnnotations := pool.VolumeClaimTemplate.GetObjectMeta().GetAnnotations()
|
|
|
|
|
pool.VolumeClaimTemplate.GetObjectMeta().SetAnnotations(removeAnnotations(poolAnnotations, prometheusAnnotations))
|
2020-09-05 23:48:51 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-01 18:03:22 -07:00
|
|
|
payloadBytes, err := json.Marshal(minInst)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
2020-08-04 20:54:59 -07:00
|
|
|
_, err = operatorClient.TenantPatch(ctx, namespace, minInst.Name, types.MergePatchType, payloadBytes, metav1.PatchOptions{})
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-05 23:48:51 -07:00
|
|
|
// addAnnotations will merge two annotation maps
|
|
|
|
|
func addAnnotations(annotationsOne, annotationsTwo map[string]string) map[string]string {
|
|
|
|
|
if annotationsOne == nil {
|
|
|
|
|
annotationsOne = map[string]string{}
|
|
|
|
|
}
|
|
|
|
|
for key, value := range annotationsTwo {
|
|
|
|
|
annotationsOne[key] = value
|
|
|
|
|
}
|
|
|
|
|
return annotationsOne
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// removeAnnotations will remove keys from the first annotations map based on the second one
|
|
|
|
|
func removeAnnotations(annotationsOne, annotationsTwo map[string]string) map[string]string {
|
|
|
|
|
if annotationsOne == nil {
|
|
|
|
|
annotationsOne = map[string]string{}
|
|
|
|
|
}
|
|
|
|
|
for key := range annotationsTwo {
|
|
|
|
|
delete(annotationsOne, key)
|
|
|
|
|
}
|
|
|
|
|
return annotationsOne
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-04 20:32:57 -07:00
|
|
|
func getUpdateTenantResponse(session *models.Principal, params admin_api.UpdateTenantParams) *models.Error {
|
2020-07-01 18:03:22 -07:00
|
|
|
ctx := context.Background()
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-01 18:03:22 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return prepareError(err)
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-08-04 20:54:59 -07:00
|
|
|
// get Kubernetes Client
|
2020-12-07 17:11:08 -06:00
|
|
|
clientSet, err := cluster.K8sClient(session.STSSessionToken)
|
2020-08-04 20:54:59 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return prepareError(err)
|
2020-08-04 20:54:59 -07:00
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
|
|
|
|
httpC := &cluster.HTTPClient{
|
|
|
|
|
Client: &http.Client{
|
|
|
|
|
Timeout: 4 * time.Second,
|
|
|
|
|
},
|
|
|
|
|
}
|
2020-09-04 20:32:57 -07:00
|
|
|
if err := updateTenantAction(ctx, opClient, clientSet.CoreV1(), httpC, params.Namespace, params); err != nil {
|
|
|
|
|
return prepareError(err, errors.New("unable to update tenant"))
|
2020-07-01 18:03:22 -07:00
|
|
|
}
|
2020-07-13 20:36:27 -07:00
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// addTenantPool creates a pool to a defined tenant
|
|
|
|
|
func addTenantPool(ctx context.Context, operatorClient OperatorClientI, params admin_api.TenantAddPoolParams) error {
|
2020-07-29 01:01:17 -07:00
|
|
|
tenant, err := operatorClient.TenantGet(ctx, params.Namespace, params.Tenant, metav1.GetOptions{})
|
2020-07-13 20:36:27 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
poolParams := params.Body
|
|
|
|
|
pool, err := parseTenantPoolRequest(poolParams)
|
2020-07-27 14:06:12 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
tenant.Spec.Pools = append(tenant.Spec.Pools, *pool)
|
2020-07-29 01:01:17 -07:00
|
|
|
payloadBytes, err := json.Marshal(tenant)
|
2020-07-13 20:36:27 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
|
2020-07-29 01:01:17 -07:00
|
|
|
_, err = operatorClient.TenantPatch(ctx, params.Namespace, tenant.Name, types.MergePatchType, payloadBytes, metav1.PatchOptions{})
|
2020-07-13 20:36:27 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
func getTenantAddPoolResponse(session *models.Principal, params admin_api.TenantAddPoolParams) *models.Error {
|
2020-07-13 20:36:27 -07:00
|
|
|
ctx := context.Background()
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-13 20:36:27 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return prepareError(err)
|
2020-07-13 20:36:27 -07:00
|
|
|
}
|
|
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
if err := addTenantPool(ctx, opClient, params); err != nil {
|
|
|
|
|
return prepareError(err, errors.New("unable to add pool"))
|
2020-07-13 20:36:27 -07:00
|
|
|
}
|
2020-07-01 18:03:22 -07:00
|
|
|
return nil
|
|
|
|
|
}
|
2020-07-27 14:19:40 -07:00
|
|
|
|
|
|
|
|
// getTenantUsageResponse returns the usage of a tenant
|
2020-09-04 20:32:57 -07:00
|
|
|
func getTenantUsageResponse(session *models.Principal, params admin_api.GetTenantUsageParams) (*models.TenantUsage, *models.Error) {
|
2020-07-27 14:19:40 -07:00
|
|
|
// 5 seconds timeout
|
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
|
|
|
|
defer cancel()
|
|
|
|
|
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-07-27 14:19:40 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err, errorUnableToGetTenantUsage)
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
2020-12-07 17:11:08 -06:00
|
|
|
clientSet, err := cluster.K8sClient(session.STSSessionToken)
|
2020-07-27 14:19:40 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err, errorUnableToGetTenantUsage)
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
|
|
|
|
k8sClient := &k8sClient{
|
2020-09-04 20:32:57 -07:00
|
|
|
client: clientSet,
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
minTenant, err := getTenant(ctx, opClient, params.Namespace, params.Tenant)
|
|
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err, errorUnableToGetTenantUsage)
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
2020-08-09 14:36:55 -07:00
|
|
|
minTenant.EnsureDefaults()
|
2020-07-27 14:19:40 -07:00
|
|
|
|
2020-09-21 21:31:30 -07:00
|
|
|
svcURL := GetTenantServiceURL(minTenant)
|
2020-12-07 13:49:00 -06:00
|
|
|
// getTenantAdminClient will use all certificates under ~/.console/certs/CAs to trust the TLS connections with MinIO tenants
|
2020-07-27 14:19:40 -07:00
|
|
|
mAdmin, err := getTenantAdminClient(
|
|
|
|
|
ctx,
|
|
|
|
|
k8sClient,
|
2020-10-09 11:51:02 -07:00
|
|
|
minTenant,
|
2020-09-21 21:31:30 -07:00
|
|
|
svcURL,
|
2020-11-30 12:41:58 -08:00
|
|
|
)
|
2020-07-27 14:19:40 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err, errorUnableToGetTenantUsage)
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
|
|
|
|
// create a minioClient interface implementation
|
|
|
|
|
// defining the client to be used
|
|
|
|
|
adminClient := adminClient{client: mAdmin}
|
|
|
|
|
// serialize output
|
|
|
|
|
adminInfo, err := getAdminInfo(ctx, adminClient)
|
|
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err, errorUnableToGetTenantUsage)
|
2020-07-27 14:19:40 -07:00
|
|
|
}
|
2020-08-03 12:11:48 -07:00
|
|
|
info := &models.TenantUsage{Used: adminInfo.Usage, DiskUsed: adminInfo.DisksUsage}
|
2020-07-27 14:19:40 -07:00
|
|
|
return info, nil
|
|
|
|
|
}
|
2020-07-29 01:01:17 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// parseTenantPoolRequest parse pool request and returns the equivalent
|
2021-02-01 12:13:51 -08:00
|
|
|
// miniov2.Pool object
|
|
|
|
|
func parseTenantPoolRequest(poolParams *models.Pool) (*miniov2.Pool, error) {
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.VolumeConfiguration == nil {
|
2020-07-29 01:01:17 -07:00
|
|
|
return nil, errors.New("a volume configuration must be specified")
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.VolumeConfiguration.Size == nil || *poolParams.VolumeConfiguration.Size <= int64(0) {
|
2020-07-29 01:01:17 -07:00
|
|
|
return nil, errors.New("volume size must be greater than 0")
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.Servers == nil || *poolParams.Servers <= 0 {
|
2020-07-29 01:01:17 -07:00
|
|
|
return nil, errors.New("number of servers must be greater than 0")
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.VolumesPerServer == nil || *poolParams.VolumesPerServer <= 0 {
|
2020-07-29 01:01:17 -07:00
|
|
|
return nil, errors.New("number of volumes per server must be greater than 0")
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
volumeSize := resource.NewQuantity(*poolParams.VolumeConfiguration.Size, resource.DecimalExponent)
|
2020-07-29 01:01:17 -07:00
|
|
|
volTemp := corev1.PersistentVolumeClaimSpec{
|
|
|
|
|
AccessModes: []corev1.PersistentVolumeAccessMode{
|
|
|
|
|
corev1.ReadWriteOnce,
|
|
|
|
|
},
|
|
|
|
|
Resources: corev1.ResourceRequirements{
|
|
|
|
|
Requests: corev1.ResourceList{
|
|
|
|
|
corev1.ResourceStorage: *volumeSize,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.VolumeConfiguration.StorageClassName != "" {
|
|
|
|
|
volTemp.StorageClassName = &poolParams.VolumeConfiguration.StorageClassName
|
2020-07-29 01:01:17 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse resources' requests
|
TLS with user provided certificates and KES support for MinIO (#213)
This PR adds the following features:
- Allow user to provide its own keypair certificates for enable TLS in
MinIO
- Allow user to configure data encryption at rest in MinIO with KES
- Removes JWT schema for login and instead Console authentication will use
encrypted session tokens
Enable TLS between client and MinIO with user provided certificates
Instead of using AutoCert feature now the user can provide `cert` and
`key` via `tls` object, values must be valid `x509.Certificate`
formatted files encoded in `base64`
Enable encryption at rest configuring KES
User can deploy KES via Console/Operator by defining the encryption
object, AutoCert must be enabled or custom certificates for KES must be
provided, KES support 3 KMS backends: `Vault`, `AWS KMS` and `Gemalto`,
previous configuration of the KMS is necessary.
eg of body request for create-tenant
```
{
"name": "honeywell",
"access_key": "minio",
"secret_key": "minio123",
"enable_mcs": false,
"enable_ssl": false,
"service_name": "honeywell",
"zones": [
{
"name": "honeywell-zone-1",
"servers": 1,
"volumes_per_server": 4,
"volume_configuration": {
"size": 256000000,
"storage_class": "vsan-default-storage-policy"
}
}
],
"namespace": "default",
"tls": {
"tls.crt": "",
"tls.key": ""
},
"encryption": {
"server": {
"tls.crt": "",
"tls.key": ""
},
"client": {
"tls.crt": "",
"tls.key": ""
},
"vault": {
"endpoint": "http://vault:8200",
"prefix": "",
"approle": {
"id": "",
"secret": ""
}
}
}
}
```
2020-07-30 17:49:56 -07:00
|
|
|
resourcesRequests := make(corev1.ResourceList)
|
|
|
|
|
resourcesLimits := make(corev1.ResourceList)
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.Resources != nil {
|
|
|
|
|
for key, val := range poolParams.Resources.Requests {
|
2020-07-29 01:01:17 -07:00
|
|
|
resourcesRequests[corev1.ResourceName(key)] = *resource.NewQuantity(val, resource.BinarySI)
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for key, val := range poolParams.Resources.Limits {
|
2020-07-29 01:01:17 -07:00
|
|
|
resourcesLimits[corev1.ResourceName(key)] = *resource.NewQuantity(val, resource.BinarySI)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse Node Affinity
|
|
|
|
|
nodeSelectorTerms := []corev1.NodeSelectorTerm{}
|
|
|
|
|
preferredSchedulingTerm := []corev1.PreferredSchedulingTerm{}
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.Affinity != nil && poolParams.Affinity.NodeAffinity != nil {
|
|
|
|
|
if poolParams.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution != nil {
|
|
|
|
|
for _, elem := range poolParams.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms {
|
2020-07-29 01:01:17 -07:00
|
|
|
term := parseModelsNodeSelectorTerm(elem)
|
|
|
|
|
nodeSelectorTerms = append(nodeSelectorTerms, term)
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range poolParams.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
pst := corev1.PreferredSchedulingTerm{
|
|
|
|
|
Weight: *elem.Weight,
|
|
|
|
|
Preference: parseModelsNodeSelectorTerm(elem.Preference),
|
|
|
|
|
}
|
|
|
|
|
preferredSchedulingTerm = append(preferredSchedulingTerm, pst)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
var nodeAffinity *corev1.NodeAffinity
|
|
|
|
|
if len(nodeSelectorTerms) > 0 || len(preferredSchedulingTerm) > 0 {
|
|
|
|
|
nodeAffinity = &corev1.NodeAffinity{
|
|
|
|
|
RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
|
|
|
|
|
NodeSelectorTerms: nodeSelectorTerms,
|
|
|
|
|
},
|
|
|
|
|
PreferredDuringSchedulingIgnoredDuringExecution: preferredSchedulingTerm,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse Pod Affinity
|
|
|
|
|
podAffinityTerms := []corev1.PodAffinityTerm{}
|
|
|
|
|
weightedPodAffinityTerms := []corev1.WeightedPodAffinityTerm{}
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.Affinity != nil && poolParams.Affinity.PodAffinity != nil {
|
|
|
|
|
for _, elem := range poolParams.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
podAffinityTerms = append(podAffinityTerms, parseModelPodAffinityTerm(elem))
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range poolParams.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
wAffinityTerm := corev1.WeightedPodAffinityTerm{
|
|
|
|
|
Weight: *elem.Weight,
|
|
|
|
|
PodAffinityTerm: parseModelPodAffinityTerm(elem.PodAffinityTerm),
|
|
|
|
|
}
|
|
|
|
|
weightedPodAffinityTerms = append(weightedPodAffinityTerms, wAffinityTerm)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
var podAffinity *corev1.PodAffinity
|
|
|
|
|
if len(podAffinityTerms) > 0 || len(weightedPodAffinityTerms) > 0 {
|
|
|
|
|
podAffinity = &corev1.PodAffinity{
|
|
|
|
|
RequiredDuringSchedulingIgnoredDuringExecution: podAffinityTerms,
|
|
|
|
|
PreferredDuringSchedulingIgnoredDuringExecution: weightedPodAffinityTerms,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse Pod Anti Affinity
|
|
|
|
|
podAntiAffinityTerms := []corev1.PodAffinityTerm{}
|
|
|
|
|
weightedPodAntiAffinityTerms := []corev1.WeightedPodAffinityTerm{}
|
2020-12-07 09:49:51 -06:00
|
|
|
if poolParams.Affinity != nil && poolParams.Affinity.PodAntiAffinity != nil {
|
|
|
|
|
for _, elem := range poolParams.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
podAntiAffinityTerms = append(podAntiAffinityTerms, parseModelPodAffinityTerm(elem))
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range poolParams.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
wAffinityTerm := corev1.WeightedPodAffinityTerm{
|
|
|
|
|
Weight: *elem.Weight,
|
|
|
|
|
PodAffinityTerm: parseModelPodAffinityTerm(elem.PodAffinityTerm),
|
|
|
|
|
}
|
|
|
|
|
weightedPodAntiAffinityTerms = append(weightedPodAntiAffinityTerms, wAffinityTerm)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
var podAntiAffinity *corev1.PodAntiAffinity
|
|
|
|
|
if len(podAntiAffinityTerms) > 0 || len(weightedPodAntiAffinityTerms) > 0 {
|
|
|
|
|
podAntiAffinity = &corev1.PodAntiAffinity{
|
|
|
|
|
RequiredDuringSchedulingIgnoredDuringExecution: podAntiAffinityTerms,
|
|
|
|
|
PreferredDuringSchedulingIgnoredDuringExecution: weightedPodAntiAffinityTerms,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var affinity *corev1.Affinity
|
|
|
|
|
if nodeAffinity != nil || podAffinity != nil || podAntiAffinity != nil {
|
|
|
|
|
affinity = &corev1.Affinity{
|
|
|
|
|
NodeAffinity: nodeAffinity,
|
|
|
|
|
PodAffinity: podAffinity,
|
|
|
|
|
PodAntiAffinity: podAntiAffinity,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse tolerations
|
|
|
|
|
tolerations := []corev1.Toleration{}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range poolParams.Tolerations {
|
2020-08-07 20:00:16 -07:00
|
|
|
var tolerationSeconds *int64
|
|
|
|
|
if elem.TolerationSeconds != nil {
|
|
|
|
|
// elem.TolerationSeconds.Seconds is allowed to be nil
|
|
|
|
|
tolerationSeconds = elem.TolerationSeconds.Seconds
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-29 01:01:17 -07:00
|
|
|
toleration := corev1.Toleration{
|
|
|
|
|
Key: elem.Key,
|
|
|
|
|
Operator: corev1.TolerationOperator(elem.Operator),
|
|
|
|
|
Value: elem.Value,
|
|
|
|
|
Effect: corev1.TaintEffect(elem.Effect),
|
2020-08-07 20:00:16 -07:00
|
|
|
TolerationSeconds: tolerationSeconds,
|
2020-07-29 01:01:17 -07:00
|
|
|
}
|
|
|
|
|
tolerations = append(tolerations, toleration)
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-05 12:35:41 -07:00
|
|
|
// Pass annotations to the volume
|
|
|
|
|
vct := &corev1.PersistentVolumeClaim{
|
|
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
2020-09-17 06:44:16 -07:00
|
|
|
Name: "data",
|
2020-12-07 09:49:51 -06:00
|
|
|
Labels: poolParams.VolumeConfiguration.Labels,
|
|
|
|
|
Annotations: poolParams.VolumeConfiguration.Annotations,
|
2020-07-29 01:01:17 -07:00
|
|
|
},
|
2020-08-05 12:35:41 -07:00
|
|
|
Spec: volTemp,
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
pool := &miniov2.Pool{
|
2020-12-07 09:49:51 -06:00
|
|
|
Name: poolParams.Name,
|
|
|
|
|
Servers: int32(*poolParams.Servers),
|
|
|
|
|
VolumesPerServer: *poolParams.VolumesPerServer,
|
2020-08-05 12:35:41 -07:00
|
|
|
VolumeClaimTemplate: vct,
|
2020-07-29 01:01:17 -07:00
|
|
|
Resources: corev1.ResourceRequirements{
|
|
|
|
|
Requests: resourcesRequests,
|
|
|
|
|
Limits: resourcesLimits,
|
|
|
|
|
},
|
2020-12-07 09:49:51 -06:00
|
|
|
NodeSelector: poolParams.NodeSelector,
|
2020-07-29 01:01:17 -07:00
|
|
|
Affinity: affinity,
|
|
|
|
|
Tolerations: tolerations,
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
return pool, nil
|
2020-07-29 01:01:17 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func parseModelPodAffinityTerm(term *models.PodAffinityTerm) corev1.PodAffinityTerm {
|
|
|
|
|
labelMatchExpressions := []metav1.LabelSelectorRequirement{}
|
|
|
|
|
for _, exp := range term.LabelSelector.MatchExpressions {
|
|
|
|
|
labelSelectorReq := metav1.LabelSelectorRequirement{
|
|
|
|
|
Key: *exp.Key,
|
|
|
|
|
Operator: metav1.LabelSelectorOperator(*exp.Operator),
|
|
|
|
|
Values: exp.Values,
|
|
|
|
|
}
|
|
|
|
|
labelMatchExpressions = append(labelMatchExpressions, labelSelectorReq)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
podAffinityTerm := corev1.PodAffinityTerm{
|
|
|
|
|
LabelSelector: &metav1.LabelSelector{
|
|
|
|
|
MatchExpressions: labelMatchExpressions,
|
|
|
|
|
MatchLabels: term.LabelSelector.MatchLabels,
|
|
|
|
|
},
|
|
|
|
|
Namespaces: term.Namespaces,
|
|
|
|
|
TopologyKey: *term.TopologyKey,
|
|
|
|
|
}
|
|
|
|
|
return podAffinityTerm
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func parseModelsNodeSelectorTerm(elem *models.NodeSelectorTerm) corev1.NodeSelectorTerm {
|
|
|
|
|
var term corev1.NodeSelectorTerm
|
|
|
|
|
for _, matchExpression := range elem.MatchExpressions {
|
|
|
|
|
matchExp := corev1.NodeSelectorRequirement{
|
|
|
|
|
Key: *matchExpression.Key,
|
|
|
|
|
Operator: corev1.NodeSelectorOperator(*matchExpression.Operator),
|
|
|
|
|
Values: matchExpression.Values,
|
|
|
|
|
}
|
|
|
|
|
term.MatchExpressions = append(term.MatchExpressions, matchExp)
|
|
|
|
|
}
|
|
|
|
|
for _, matchField := range elem.MatchFields {
|
|
|
|
|
matchF := corev1.NodeSelectorRequirement{
|
|
|
|
|
Key: *matchField.Key,
|
|
|
|
|
Operator: corev1.NodeSelectorOperator(*matchField.Operator),
|
|
|
|
|
Values: matchField.Values,
|
|
|
|
|
}
|
|
|
|
|
term.MatchFields = append(term.MatchFields, matchF)
|
|
|
|
|
}
|
|
|
|
|
return term
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-01 12:13:51 -08:00
|
|
|
// parseTenantPool miniov2 pool object and returns the equivalent
|
2020-12-07 09:49:51 -06:00
|
|
|
// models.Pool object
|
2021-02-01 12:13:51 -08:00
|
|
|
func parseTenantPool(pool *miniov2.Pool) *models.Pool {
|
2020-07-29 01:01:17 -07:00
|
|
|
var size *int64
|
|
|
|
|
var storageClassName string
|
2020-12-07 09:49:51 -06:00
|
|
|
if pool.VolumeClaimTemplate != nil {
|
|
|
|
|
size = swag.Int64(pool.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value())
|
|
|
|
|
if pool.VolumeClaimTemplate.Spec.StorageClassName != nil {
|
|
|
|
|
storageClassName = *pool.VolumeClaimTemplate.Spec.StorageClassName
|
2020-07-29 01:01:17 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse resources' requests
|
2020-12-07 09:49:51 -06:00
|
|
|
var resources *models.PoolResources
|
2020-07-29 12:11:48 -07:00
|
|
|
resourcesRequests := make(map[string]int64)
|
|
|
|
|
resourcesLimits := make(map[string]int64)
|
2020-12-07 09:49:51 -06:00
|
|
|
for key, val := range pool.Resources.Requests {
|
2020-07-29 01:01:17 -07:00
|
|
|
resourcesRequests[key.String()] = val.Value()
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for key, val := range pool.Resources.Limits {
|
2020-07-29 01:01:17 -07:00
|
|
|
resourcesLimits[key.String()] = val.Value()
|
|
|
|
|
}
|
|
|
|
|
if len(resourcesRequests) > 0 || len(resourcesLimits) > 0 {
|
2020-12-07 09:49:51 -06:00
|
|
|
resources = &models.PoolResources{
|
2020-07-29 01:01:17 -07:00
|
|
|
Limits: resourcesLimits,
|
|
|
|
|
Requests: resourcesRequests,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse Node Affinity
|
|
|
|
|
nodeSelectorTerms := []*models.NodeSelectorTerm{}
|
2020-12-07 09:49:51 -06:00
|
|
|
preferredSchedulingTerm := []*models.PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0{}
|
2020-07-29 01:01:17 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
if pool.Affinity != nil && pool.Affinity.NodeAffinity != nil {
|
|
|
|
|
if pool.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution != nil {
|
|
|
|
|
for _, elem := range pool.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms {
|
2020-07-29 01:01:17 -07:00
|
|
|
term := parseNodeSelectorTerm(&elem)
|
|
|
|
|
nodeSelectorTerms = append(nodeSelectorTerms, term)
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range pool.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
|
|
|
|
|
pst := &models.PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0{
|
2020-07-29 01:01:17 -07:00
|
|
|
Weight: swag.Int32(elem.Weight),
|
|
|
|
|
Preference: parseNodeSelectorTerm(&elem.Preference),
|
|
|
|
|
}
|
|
|
|
|
preferredSchedulingTerm = append(preferredSchedulingTerm, pst)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
var nodeAffinity *models.PoolAffinityNodeAffinity
|
2020-07-29 01:01:17 -07:00
|
|
|
if len(nodeSelectorTerms) > 0 || len(preferredSchedulingTerm) > 0 {
|
2020-12-07 09:49:51 -06:00
|
|
|
nodeAffinity = &models.PoolAffinityNodeAffinity{
|
|
|
|
|
RequiredDuringSchedulingIgnoredDuringExecution: &models.PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution{
|
2020-07-29 01:01:17 -07:00
|
|
|
NodeSelectorTerms: nodeSelectorTerms,
|
|
|
|
|
},
|
|
|
|
|
PreferredDuringSchedulingIgnoredDuringExecution: preferredSchedulingTerm,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse Pod Affinity
|
|
|
|
|
podAffinityTerms := []*models.PodAffinityTerm{}
|
2020-12-07 09:49:51 -06:00
|
|
|
weightedPodAffinityTerms := []*models.PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0{}
|
2020-07-29 01:01:17 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
if pool.Affinity != nil && pool.Affinity.PodAffinity != nil {
|
|
|
|
|
for _, elem := range pool.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
podAffinityTerms = append(podAffinityTerms, parsePodAffinityTerm(&elem))
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range pool.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
|
|
|
|
|
wAffinityTerm := &models.PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0{
|
2020-07-29 01:01:17 -07:00
|
|
|
Weight: swag.Int32(elem.Weight),
|
|
|
|
|
PodAffinityTerm: parsePodAffinityTerm(&elem.PodAffinityTerm),
|
|
|
|
|
}
|
|
|
|
|
weightedPodAffinityTerms = append(weightedPodAffinityTerms, wAffinityTerm)
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
var podAffinity *models.PoolAffinityPodAffinity
|
2020-07-29 01:01:17 -07:00
|
|
|
if len(podAffinityTerms) > 0 || len(weightedPodAffinityTerms) > 0 {
|
2020-12-07 09:49:51 -06:00
|
|
|
podAffinity = &models.PoolAffinityPodAffinity{
|
2020-07-29 01:01:17 -07:00
|
|
|
RequiredDuringSchedulingIgnoredDuringExecution: podAffinityTerms,
|
|
|
|
|
PreferredDuringSchedulingIgnoredDuringExecution: weightedPodAffinityTerms,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse Pod Anti Affinity
|
|
|
|
|
podAntiAffinityTerms := []*models.PodAffinityTerm{}
|
2020-12-07 09:49:51 -06:00
|
|
|
weightedPodAntiAffinityTerms := []*models.PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0{}
|
2020-07-29 01:01:17 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
if pool.Affinity != nil && pool.Affinity.PodAntiAffinity != nil {
|
|
|
|
|
for _, elem := range pool.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
|
2020-07-29 01:01:17 -07:00
|
|
|
podAntiAffinityTerms = append(podAntiAffinityTerms, parsePodAffinityTerm(&elem))
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, elem := range pool.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
|
|
|
|
|
wAffinityTerm := &models.PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0{
|
2020-07-29 01:01:17 -07:00
|
|
|
Weight: swag.Int32(elem.Weight),
|
|
|
|
|
PodAffinityTerm: parsePodAffinityTerm(&elem.PodAffinityTerm),
|
|
|
|
|
}
|
|
|
|
|
weightedPodAntiAffinityTerms = append(weightedPodAntiAffinityTerms, wAffinityTerm)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
var podAntiAffinity *models.PoolAffinityPodAntiAffinity
|
2020-07-29 01:01:17 -07:00
|
|
|
if len(podAntiAffinityTerms) > 0 || len(weightedPodAntiAffinityTerms) > 0 {
|
2020-12-07 09:49:51 -06:00
|
|
|
podAntiAffinity = &models.PoolAffinityPodAntiAffinity{
|
2020-07-29 01:01:17 -07:00
|
|
|
RequiredDuringSchedulingIgnoredDuringExecution: podAntiAffinityTerms,
|
|
|
|
|
PreferredDuringSchedulingIgnoredDuringExecution: weightedPodAntiAffinityTerms,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// build affinity object
|
2020-12-07 09:49:51 -06:00
|
|
|
var affinity *models.PoolAffinity
|
2020-07-29 01:01:17 -07:00
|
|
|
if nodeAffinity != nil || podAffinity != nil || podAntiAffinity != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
affinity = &models.PoolAffinity{
|
2020-07-29 01:01:17 -07:00
|
|
|
NodeAffinity: nodeAffinity,
|
|
|
|
|
PodAffinity: podAffinity,
|
|
|
|
|
PodAntiAffinity: podAntiAffinity,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse tolerations
|
2020-12-07 09:49:51 -06:00
|
|
|
var tolerations models.PoolTolerations
|
|
|
|
|
for _, elem := range pool.Tolerations {
|
|
|
|
|
var tolerationSecs *models.PoolTolerationSeconds
|
2020-08-07 20:00:16 -07:00
|
|
|
if elem.TolerationSeconds != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
tolerationSecs = &models.PoolTolerationSeconds{
|
2020-08-07 20:00:16 -07:00
|
|
|
Seconds: elem.TolerationSeconds,
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
toleration := &models.PoolTolerationsItems0{
|
2020-07-29 01:01:17 -07:00
|
|
|
Key: elem.Key,
|
|
|
|
|
Operator: string(elem.Operator),
|
|
|
|
|
Value: elem.Value,
|
|
|
|
|
Effect: string(elem.Effect),
|
2020-08-07 20:00:16 -07:00
|
|
|
TolerationSeconds: tolerationSecs,
|
2020-07-29 01:01:17 -07:00
|
|
|
}
|
|
|
|
|
tolerations = append(tolerations, toleration)
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
poolModel := &models.Pool{
|
|
|
|
|
Name: pool.Name,
|
|
|
|
|
Servers: swag.Int64(int64(pool.Servers)),
|
|
|
|
|
VolumesPerServer: swag.Int32(pool.VolumesPerServer),
|
|
|
|
|
VolumeConfiguration: &models.PoolVolumeConfiguration{
|
2020-07-29 01:01:17 -07:00
|
|
|
Size: size,
|
|
|
|
|
StorageClassName: storageClassName,
|
|
|
|
|
},
|
2020-12-07 09:49:51 -06:00
|
|
|
NodeSelector: pool.NodeSelector,
|
2020-07-29 01:01:17 -07:00
|
|
|
Resources: resources,
|
|
|
|
|
Affinity: affinity,
|
|
|
|
|
Tolerations: tolerations,
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
return poolModel
|
2020-07-29 01:01:17 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func parsePodAffinityTerm(term *corev1.PodAffinityTerm) *models.PodAffinityTerm {
|
|
|
|
|
labelMatchExpressions := []*models.PodAffinityTermLabelSelectorMatchExpressionsItems0{}
|
|
|
|
|
for _, exp := range term.LabelSelector.MatchExpressions {
|
|
|
|
|
labelSelectorReq := &models.PodAffinityTermLabelSelectorMatchExpressionsItems0{
|
|
|
|
|
Key: swag.String(exp.Key),
|
|
|
|
|
Operator: swag.String(string(exp.Operator)),
|
|
|
|
|
Values: exp.Values,
|
|
|
|
|
}
|
|
|
|
|
labelMatchExpressions = append(labelMatchExpressions, labelSelectorReq)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
podAffinityTerm := &models.PodAffinityTerm{
|
|
|
|
|
LabelSelector: &models.PodAffinityTermLabelSelector{
|
|
|
|
|
MatchExpressions: labelMatchExpressions,
|
|
|
|
|
MatchLabels: term.LabelSelector.MatchLabels,
|
|
|
|
|
},
|
|
|
|
|
Namespaces: term.Namespaces,
|
|
|
|
|
TopologyKey: swag.String(term.TopologyKey),
|
|
|
|
|
}
|
|
|
|
|
return podAffinityTerm
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func parseNodeSelectorTerm(term *corev1.NodeSelectorTerm) *models.NodeSelectorTerm {
|
|
|
|
|
var t models.NodeSelectorTerm
|
|
|
|
|
for _, matchExpression := range term.MatchExpressions {
|
|
|
|
|
matchExp := &models.NodeSelectorTermMatchExpressionsItems0{
|
|
|
|
|
Key: swag.String(matchExpression.Key),
|
|
|
|
|
Operator: swag.String(string(matchExpression.Operator)),
|
|
|
|
|
Values: matchExpression.Values,
|
|
|
|
|
}
|
|
|
|
|
t.MatchExpressions = append(t.MatchExpressions, matchExp)
|
|
|
|
|
}
|
|
|
|
|
for _, matchField := range term.MatchFields {
|
|
|
|
|
matchF := &models.NodeSelectorTermMatchFieldsItems0{
|
|
|
|
|
Key: swag.String(matchField.Key),
|
|
|
|
|
Operator: swag.String(string(matchField.Operator)),
|
|
|
|
|
Values: matchField.Values,
|
|
|
|
|
}
|
|
|
|
|
t.MatchFields = append(t.MatchFields, matchF)
|
|
|
|
|
}
|
|
|
|
|
return &t
|
|
|
|
|
}
|
2020-08-07 20:23:03 -07:00
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
func getTenantUpdatePoolResponse(session *models.Principal, params admin_api.TenantUpdatePoolsParams) (*models.Tenant, *models.Error) {
|
2020-08-26 17:12:59 -07:00
|
|
|
ctx := context.Background()
|
2020-12-07 17:11:08 -06:00
|
|
|
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
|
2020-08-26 17:12:59 -07:00
|
|
|
if err != nil {
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-08-26 17:12:59 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opClient := &operatorClient{
|
|
|
|
|
client: opClientClientSet,
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
t, err := updateTenantPools(ctx, opClient, params.Namespace, params.Tenant, params.Body.Pools)
|
2020-08-26 17:12:59 -07:00
|
|
|
if err != nil {
|
2020-12-07 09:49:51 -06:00
|
|
|
log.Println("error updating Tenant's pools:", err)
|
2020-09-04 20:32:57 -07:00
|
|
|
return nil, prepareError(err)
|
2020-08-26 17:12:59 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// parse it to models.Tenant
|
|
|
|
|
tenant := getTenantInfo(t)
|
|
|
|
|
return tenant, nil
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// updateTenantPools Sets the Tenant's pools to the ones provided by the request
|
2020-08-26 17:12:59 -07:00
|
|
|
//
|
2020-12-07 09:49:51 -06:00
|
|
|
// It does the equivalent to a PUT request on Tenant's pools
|
|
|
|
|
func updateTenantPools(
|
2020-08-26 17:12:59 -07:00
|
|
|
ctx context.Context,
|
2020-09-03 10:20:58 -07:00
|
|
|
operatorClient OperatorClientI,
|
2020-08-26 17:12:59 -07:00
|
|
|
namespace string,
|
|
|
|
|
tenantName string,
|
2021-02-01 12:13:51 -08:00
|
|
|
poolsReq []*models.Pool) (*miniov2.Tenant, error) {
|
2020-08-26 17:12:59 -07:00
|
|
|
|
|
|
|
|
minInst, err := operatorClient.TenantGet(ctx, namespace, tenantName, metav1.GetOptions{})
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// set the pools if they are provided
|
2021-02-01 12:13:51 -08:00
|
|
|
var newPoolArray []miniov2.Pool
|
2020-12-07 09:49:51 -06:00
|
|
|
for _, pool := range poolsReq {
|
|
|
|
|
pool, err := parseTenantPoolRequest(pool)
|
2020-08-26 17:12:59 -07:00
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
2020-12-07 09:49:51 -06:00
|
|
|
newPoolArray = append(newPoolArray, *pool)
|
2020-08-26 17:12:59 -07:00
|
|
|
}
|
|
|
|
|
|
2020-12-07 09:49:51 -06:00
|
|
|
// replace pools array
|
|
|
|
|
minInst.Spec.Pools = newPoolArray
|
2020-08-26 17:12:59 -07:00
|
|
|
|
2020-09-16 23:01:28 -07:00
|
|
|
minInst = minInst.DeepCopy()
|
|
|
|
|
minInst.EnsureDefaults()
|
|
|
|
|
|
2020-08-26 17:12:59 -07:00
|
|
|
payloadBytes, err := json.Marshal(minInst)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
tenantUpdated, err := operatorClient.TenantPatch(ctx, namespace, minInst.Name, types.MergePatchType, payloadBytes, metav1.PatchOptions{})
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
return tenantUpdated, nil
|
|
|
|
|
}
|