Upgrade Operator to 3.0.1 (#201)

This commit is contained in:
Daniel Valdivia
2020-07-25 14:38:16 -07:00
committed by GitHub
parent 3ac64b3848
commit bc8429bd6b
34 changed files with 833 additions and 826 deletions

View File

@@ -34,7 +34,7 @@ import (
"github.com/go-openapi/swag"
"github.com/minio/mcs/models"
xjwt "github.com/minio/mcs/pkg/auth/jwt"
"github.com/minio/minio-go/v6/pkg/credentials"
"github.com/minio/minio-go/v7/pkg/credentials"
uuid "github.com/satori/go.uuid"
"golang.org/x/crypto/pbkdf2"
)

View File

@@ -19,7 +19,7 @@ package auth
import (
"testing"
"github.com/minio/minio-go/v6/pkg/credentials"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/stretchr/testify/assert"
)

View File

@@ -20,7 +20,7 @@ import (
"errors"
"log"
"github.com/minio/minio-go/v6/pkg/credentials"
"github.com/minio/minio-go/v7/pkg/credentials"
)
var (

View File

@@ -21,8 +21,8 @@ import (
"log"
"github.com/minio/mcs/cluster"
"github.com/minio/minio-go/v6/pkg/credentials"
operatorClientset "github.com/minio/minio-operator/pkg/client/clientset/versioned"
"github.com/minio/minio-go/v7/pkg/credentials"
operatorClientset "github.com/minio/operator/pkg/client/clientset/versioned"
)
// operatorCredentialsProvider is an struct to hold the JWT (service account token)
@@ -54,7 +54,7 @@ type OperatorClient interface {
// Interface implementation
//
// Define the structure of a operator client and define the functions that are actually used
// from the minio-operator.
// from the minio operator.
type operatorClient struct {
client *operatorClientset.Clientset
}

View File

@@ -6,7 +6,7 @@ import (
"testing"
"github.com/minio/mcs/cluster"
operatorClientset "github.com/minio/minio-operator/pkg/client/clientset/versioned"
operatorClientset "github.com/minio/operator/pkg/client/clientset/versioned"
)
type operatorClientTest struct {
@@ -15,7 +15,7 @@ type operatorClientTest struct {
var operatorAuthenticateMock func(ctx context.Context) ([]byte, error)
// MinIOInstanceDelete implements the minio instance delete action from minio-operator
// TenantDelete implements the minio instance delete action from minio-operator
func (c *operatorClientTest) Authenticate(ctx context.Context) ([]byte, error) {
return operatorAuthenticateMock(ctx)
}