From 5ecb311f79e9197d793cc932d72b06c8a5182a21 Mon Sep 17 00:00:00 2001 From: Daniel Valdivia Date: Sat, 25 Jul 2020 11:51:29 -0700 Subject: [PATCH] Update Operator References --- cluster/cluster.go | 2 +- go.mod | 1 - go.sum | 2 -- k8s/console/base/minio-operator.yaml | 2 +- k8s/operator-console/base/minio-operator.yaml | 2 +- pkg/auth/operator.go | 4 ++-- pkg/auth/operator_test.go | 2 +- restapi/admin_tenants.go | 2 +- restapi/operator_client.go | 14 +++++++------- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/cluster/cluster.go b/cluster/cluster.go index 3226e7e96..3a8b41bae 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -17,7 +17,7 @@ package cluster import ( - operator "github.com/minio/minio-operator/pkg/client/clientset/versioned" + operator "github.com/minio/operator/pkg/client/clientset/versioned" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" certutil "k8s.io/client-go/util/cert" diff --git a/go.mod b/go.mod index bb0d2c865..5b3e273f4 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/minio/minio v0.0.0-20200723003940-b9be841fd222 github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec github.com/minio/minio-go/v7 v7.0.2-0.20200718235721-f0e2f3ae3678 - github.com/minio/minio-operator v0.0.0-20200723204759-26762d65da84 github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect github.com/satori/go.uuid v1.2.0 github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index 17855fcf4..bccc7e285 100644 --- a/go.sum +++ b/go.sum @@ -524,8 +524,6 @@ github.com/minio/minio-go/v7 v7.0.0-20200714085548-47e386e2cde8/go.mod h1:QTstSR github.com/minio/minio-go/v7 v7.0.1/go.mod h1:dJ80Mv2HeGkYLH1sqS/ksz07ON6csH3S6JUMSQ2zAns= github.com/minio/minio-go/v7 v7.0.2-0.20200718235721-f0e2f3ae3678 h1:vV6dhx+KI1YfQTqlYYUa2dh8MUhecITo1XXhFDTl6fU= github.com/minio/minio-go/v7 v7.0.2-0.20200718235721-f0e2f3ae3678/go.mod h1:dJ80Mv2HeGkYLH1sqS/ksz07ON6csH3S6JUMSQ2zAns= -github.com/minio/minio-operator v0.0.0-20200723204759-26762d65da84 h1:chr56VwbyGM6rqbKtVJiQ+pgrxh1rbus9HEmAx5Tcys= -github.com/minio/minio-operator v0.0.0-20200723204759-26762d65da84/go.mod h1:auKSx2m2jfN8DqHwDZWZm4eW6bHYXW1haUBIerVvA6w= github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61 h1:pUSI/WKPdd77gcuoJkSzhJ4wdS8OMDOsOu99MtpXEQA= github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61/go.mod h1:4trzEJ7N1nBTd5Tt7OCZT5SEin+WiAXpdJ/WgPkESA8= github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= diff --git a/k8s/console/base/minio-operator.yaml b/k8s/console/base/minio-operator.yaml index 58617d669..0f1011a11 100644 --- a/k8s/console/base/minio-operator.yaml +++ b/k8s/console/base/minio-operator.yaml @@ -276,7 +276,7 @@ spec: name: minio-operator spec: containers: - - image: minio/k8s-operator:3.0.0 + - image: minio/operator:v3.0.1 imagePullPolicy: IfNotPresent name: minio-operator serviceAccountName: minio-operator diff --git a/k8s/operator-console/base/minio-operator.yaml b/k8s/operator-console/base/minio-operator.yaml index 58617d669..0f1011a11 100644 --- a/k8s/operator-console/base/minio-operator.yaml +++ b/k8s/operator-console/base/minio-operator.yaml @@ -276,7 +276,7 @@ spec: name: minio-operator spec: containers: - - image: minio/k8s-operator:3.0.0 + - image: minio/operator:v3.0.1 imagePullPolicy: IfNotPresent name: minio-operator serviceAccountName: minio-operator diff --git a/pkg/auth/operator.go b/pkg/auth/operator.go index e65f61775..a4488549c 100644 --- a/pkg/auth/operator.go +++ b/pkg/auth/operator.go @@ -22,7 +22,7 @@ import ( "github.com/minio/mcs/cluster" "github.com/minio/minio-go/v6/pkg/credentials" - operatorClientset "github.com/minio/minio-operator/pkg/client/clientset/versioned" + 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 } diff --git a/pkg/auth/operator_test.go b/pkg/auth/operator_test.go index 2425b67d8..6a5a97b27 100644 --- a/pkg/auth/operator_test.go +++ b/pkg/auth/operator_test.go @@ -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 { diff --git a/restapi/admin_tenants.go b/restapi/admin_tenants.go index ae227f27a..d5dfa728d 100644 --- a/restapi/admin_tenants.go +++ b/restapi/admin_tenants.go @@ -41,7 +41,7 @@ import ( "github.com/minio/mcs/models" "github.com/minio/mcs/restapi/operations" "github.com/minio/mcs/restapi/operations/admin_api" - operator "github.com/minio/minio-operator/pkg/apis/minio.min.io/v1" + operator "github.com/minio/operator/pkg/apis/minio.min.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/restapi/operator_client.go b/restapi/operator_client.go index d6aaa2d35..121981433 100644 --- a/restapi/operator_client.go +++ b/restapi/operator_client.go @@ -19,8 +19,8 @@ package restapi import ( "context" - v1 "github.com/minio/minio-operator/pkg/apis/minio.min.io/v1" - operatorClientset "github.com/minio/minio-operator/pkg/client/clientset/versioned" + v1 "github.com/minio/operator/pkg/apis/minio.min.io/v1" + operatorClientset "github.com/minio/operator/pkg/client/clientset/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" ) @@ -38,27 +38,27 @@ 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 } -// TenantDelete implements the minio instance delete action from minio-operator +// TenantDelete implements the minio instance delete action from minio operator func (c *operatorClient) TenantDelete(ctx context.Context, namespace string, instanceName string, options metav1.DeleteOptions) error { return c.client.MinioV1().Tenants(namespace).Delete(ctx, instanceName, options) } -// TenantGet implements the minio instance get action from minio-operator +// TenantGet implements the minio instance get action from minio operator func (c *operatorClient) TenantGet(ctx context.Context, namespace string, instanceName string, options metav1.GetOptions) (*v1.Tenant, error) { return c.client.MinioV1().Tenants(namespace).Get(ctx, instanceName, options) } -// TenantPatch implements the minio instance patch action from minio-operator +// TenantPatch implements the minio instance patch action from minio operator func (c *operatorClient) TenantPatch(ctx context.Context, namespace string, instanceName string, pt types.PatchType, data []byte, options metav1.PatchOptions) (*v1.Tenant, error) { return c.client.MinioV1().Tenants(namespace).Patch(ctx, instanceName, pt, data, options) } -// TenantList implements the minio instance list action from minio-operator +// TenantList implements the minio instance list action from minio operator func (c *operatorClient) TenantList(ctx context.Context, namespace string, opts metav1.ListOptions) (*v1.TenantList, error) { return c.client.MinioV1().Tenants(namespace).List(ctx, opts) }