Compare commits

...

2 Commits

Author SHA1 Message Date
Minio Trusted
14fe7c1269 update to v0.6.6 release with service 2021-03-27 17:06:01 -07:00
Lenin Alevski
b6938a5888 Check xcerts.Manager is initialized before adding certificates (#673) 2021-03-27 15:35:45 -07:00
9 changed files with 29 additions and 16 deletions

View File

@@ -78,6 +78,10 @@ nfpms:
formats: formats:
- deb - deb
- rpm - rpm
contents:
# Basic file that applies to all packagers
- src: systemd/console.service
dst: /etc/systemd/system/minio-console.service
dockers: dockers:
- image_templates: - image_templates:

View File

@@ -6,8 +6,8 @@ COPY LICENSE /licenses/LICENSE
LABEL name="MinIO" \ LABEL name="MinIO" \
vendor="MinIO Inc <dev@min.io>" \ vendor="MinIO Inc <dev@min.io>" \
maintainer="MinIO Inc <dev@min.io>" \ maintainer="MinIO Inc <dev@min.io>" \
version="v0.6.5" \ version="v0.6.6" \
release="v0.6.5" \ release="v0.6.6" \
summary="A graphical user interface for MinIO" \ summary="A graphical user interface for MinIO" \
description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads." description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads."

View File

@@ -17,6 +17,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
@@ -146,15 +147,14 @@ func startServer(ctx *cli.Context) error {
SwaggerServerCACertificate := ctx.String("tls-ca") SwaggerServerCACertificate := ctx.String("tls-ca")
// load tls cert and key from swagger server tls-certificate and tls-key flags // load tls cert and key from swagger server tls-certificate and tls-key flags
if swaggerServerCertificate != "" && swaggerServerCertificateKey != "" { if swaggerServerCertificate != "" && swaggerServerCertificateKey != "" {
if errAddCert := restapi.GlobalTLSCertsManager.AddCertificate(swaggerServerCertificate, swaggerServerCertificateKey); errAddCert == nil { if errAddCert := certs.AddCertificate(context.Background(), restapi.GlobalTLSCertsManager, swaggerServerCertificate, swaggerServerCertificateKey); errAddCert != nil {
if x509Certs, errParseCert := config.ParsePublicCertFile(swaggerServerCertificate); errParseCert == nil && len(x509Certs) > 0 {
restapi.GlobalPublicCerts = append(restapi.GlobalPublicCerts, x509Certs[0])
} else {
log.Println(errParseCert)
}
} else {
log.Println(errAddCert) log.Println(errAddCert)
} }
if x509Certs, errParseCert := config.ParsePublicCertFile(swaggerServerCertificate); errParseCert == nil {
if len(x509Certs) > 0 {
restapi.GlobalPublicCerts = append(restapi.GlobalPublicCerts, x509Certs[0])
}
}
} }
// load ca cert from swagger server tls-ca flag // load ca cert from swagger server tls-ca flag
if SwaggerServerCACertificate != "" { if SwaggerServerCACertificate != "" {

View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: console-sa serviceAccountName: console-sa
containers: containers:
- name: console - name: console
image: minio/console:v0.6.5 image: minio/console:v0.6.6
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
args: args:
- server - server

View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: console-sa serviceAccountName: console-sa
containers: containers:
- name: console - name: console
image: minio/console:v0.6.5 image: minio/console:v0.6.6
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
env: env:
- name: CONSOLE_OPERATOR_MODE - name: CONSOLE_OPERATOR_MODE

View File

@@ -228,3 +228,14 @@ func GetAllCertificatesAndCAs() (*x509.CertPool, []*x509.Certificate, *xcerts.Ma
logger.FatalIf(err, "Unable to load the TLS configuration") logger.FatalIf(err, "Unable to load the TLS configuration")
return GlobalRootCAs, globalPublicCerts, globalTLSCertsManager return GlobalRootCAs, globalPublicCerts, globalTLSCertsManager
} }
// AddCertificate check if Manager is initialized and then append a new certificate to it
func AddCertificate(ctx context.Context, manager *xcerts.Manager, publicKey, privateKey string) (err error) {
// If Cert Manager is not nil add more certificates
if manager != nil {
return manager.AddCertificate(publicKey, privateKey)
}
// Initialize cert manager
manager, err = xcerts.NewManager(ctx, publicKey, privateKey, config.LoadX509KeyPair)
return err
}

View File

@@ -557,9 +557,7 @@ const ViewBucket = ({
setPolicyEdit(row); setPolicyEdit(row);
}; };
const PolicyActions = [ const PolicyActions = [{ type: "view", onClick: viewAction }];
{ type: "view", onClick: viewAction },
];
return ( return (
<Fragment> <Fragment>

View File

@@ -1028,7 +1028,7 @@ func Test_UpdateTenantAction(t *testing.T) {
}, },
params: admin_api.UpdateTenantParams{ params: admin_api.UpdateTenantParams{
Body: &models.UpdateTenantRequest{ Body: &models.UpdateTenantRequest{
ConsoleImage: "minio/console:v0.6.5", ConsoleImage: "minio/console:v0.6.6",
}, },
}, },
}, },

View File

@@ -63,7 +63,7 @@ const (
// Image versions // Image versions
const ( const (
KESImageVersion = "minio/kes:v0.13.4" KESImageVersion = "minio/kes:v0.13.4"
ConsoleImageDefaultVersion = "minio/console:v0.6.5" ConsoleImageDefaultVersion = "minio/console:v0.6.6"
) )
// K8s // K8s