From 2d1ae7aa20c23ccb4d3e379c12ed7a9fbae4eaf1 Mon Sep 17 00:00:00 2001 From: ajanikow Date: Tue, 31 Mar 2020 21:22:17 +0000 Subject: [PATCH 1/3] Accept Kubeconfig ENV --- pkg/util/k8sutil/client.go | 54 +++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/pkg/util/k8sutil/client.go b/pkg/util/k8sutil/client.go index 73c4baa8c..ecaea9b98 100644 --- a/pkg/util/k8sutil/client.go +++ b/pkg/util/k8sutil/client.go @@ -23,7 +23,9 @@ package k8sutil import ( - "net" + "fmt" + "github.com/arangodb/kube-arangodb/pkg/util" + "k8s.io/client-go/tools/clientcmd" "os" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" @@ -31,9 +33,34 @@ import ( "k8s.io/client-go/rest" ) +const Kubeconfig util.EnvironmentVariable = "KUBECONFIG" + +// NewKubeConfig loads config from KUBECONFIG or as incluster +func NewKubeConfig() (*rest.Config, error) { + // If KUBECONFIG is defined use this variable + if kubeconfig, ok := Kubeconfig.Lookup(); ok { + return clientcmd.BuildConfigFromFlags("", kubeconfig) + } + + // Try to load incluster config + if cfg, err := rest.InClusterConfig(); err == nil { + return cfg, nil + } else if err != rest.ErrNotInCluster { + return nil, err + } + + // At the end try to use default path + home, err := os.UserHomeDir() + if err != nil { + return nil, err + } + + return clientcmd.BuildConfigFromFlags("", fmt.Sprintf("%s/.kube/config", home)) +} + // NewKubeClient creates a new k8s client func NewKubeClient() (kubernetes.Interface, error) { - cfg, err := InClusterConfig() + cfg, err := NewKubeConfig() if err != nil { return nil, maskAny(err) } @@ -55,7 +82,7 @@ func MustNewKubeClient() kubernetes.Interface { // NewKubeExtClient creates a new k8s api extensions client func NewKubeExtClient() (apiextensionsclient.Interface, error) { - cfg, err := InClusterConfig() + cfg, err := NewKubeConfig() if err != nil { return nil, maskAny(err) } @@ -65,24 +92,3 @@ func NewKubeExtClient() (apiextensionsclient.Interface, error) { } return c, nil } - -// InClusterConfig loads the environment into a rest config. -func InClusterConfig() (*rest.Config, error) { - // Work around https://github.com/kubernetes/kubernetes/issues/40973 - // See https://github.com/coreos/etcd-operator/issues/731#issuecomment-283804819 - if len(os.Getenv("KUBERNETES_SERVICE_HOST")) == 0 { - addrs, err := net.LookupHost("kubernetes.default.svc") - if err != nil { - return nil, maskAny(err) - } - os.Setenv("KUBERNETES_SERVICE_HOST", addrs[0]) - } - if len(os.Getenv("KUBERNETES_SERVICE_PORT")) == 0 { - os.Setenv("KUBERNETES_SERVICE_PORT", "443") - } - cfg, err := rest.InClusterConfig() - if err != nil { - return nil, maskAny(err) - } - return cfg, nil -} From 998569e4b3d5414f584e239cc65901908bef8dbd Mon Sep 17 00:00:00 2001 From: ajanikow Date: Wed, 1 Apr 2020 13:56:13 +0000 Subject: [PATCH 2/3] FMT --- pkg/util/k8sutil/client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/util/k8sutil/client.go b/pkg/util/k8sutil/client.go index ecaea9b98..9aa85d75e 100644 --- a/pkg/util/k8sutil/client.go +++ b/pkg/util/k8sutil/client.go @@ -24,9 +24,10 @@ package k8sutil import ( "fmt" + "os" + "github.com/arangodb/kube-arangodb/pkg/util" "k8s.io/client-go/tools/clientcmd" - "os" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/kubernetes" From 755a9e0fd1c6d369673a3c11e78409552bbb27e0 Mon Sep 17 00:00:00 2001 From: ajanikow Date: Thu, 2 Apr 2020 12:26:55 +0000 Subject: [PATCH 3/3] Fix build --- main.go | 2 +- pkg/client/client.go | 12 ++++++------ pkg/deployment/resources/servicemonitor.go | 2 +- reboot.go | 2 +- tests/annotations_test.go | 2 +- tests/auth_test.go | 12 ++++++------ tests/backup_test.go | 4 ++-- tests/change_args_test.go | 4 ++-- tests/cursor_test.go | 6 +++--- tests/deployments_test.go | 4 ++-- tests/environments_test.go | 2 +- tests/immutable_test.go | 2 +- tests/load_balancer_source_ranges_test.go | 2 +- tests/load_balancer_test.go | 2 +- tests/member_resilience_test.go | 6 +++--- tests/metrics_test.go | 2 +- tests/operator_upgrade_test.go | 2 +- tests/pc_test.go | 2 +- tests/pdb_test.go | 2 +- tests/persistent_volumes_test.go | 10 +++++----- tests/resilience_test.go | 8 ++++---- tests/resources_test.go | 4 ++-- tests/rocksdb_encryption_test.go | 2 +- tests/scale_test.go | 6 +++--- tests/secret_hashes_test.go | 2 +- tests/service_account_test.go | 8 ++++---- tests/sidecar_test.go | 2 +- tests/simple_test.go | 8 ++++---- tests/sync/main.go | 2 +- tests/sync_test.go | 4 ++-- tests/test_util.go | 2 +- tests/upgrade_test.go | 2 +- tests/version_test.go | 2 +- 33 files changed, 67 insertions(+), 67 deletions(-) diff --git a/main.go b/main.go index 42f02d426..26d4f75ab 100644 --- a/main.go +++ b/main.go @@ -275,7 +275,7 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper if err != nil { return operator.Config{}, operator.Dependencies{}, maskAny(fmt.Errorf("Failed to create k8b api extensions client: %s", err)) } - crCli, err := client.NewInCluster() + crCli, err := client.NewClient() if err != nil { return operator.Config{}, operator.Dependencies{}, maskAny(fmt.Errorf("Failed to created versioned client: %s", err)) } diff --git a/pkg/client/client.go b/pkg/client/client.go index 4f5629b2d..31345c07c 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -34,10 +34,10 @@ var ( maskAny = errors.WithStack ) -// MustNewInCluster creates an in-cluster client, or panics +// MustNewClient creates an client, or panics // when a failure is detected. -func MustNewInCluster() versioned.Interface { - cli, err := NewInCluster() +func MustNewClient() versioned.Interface { + cli, err := NewClient() if err != nil { panic(err) } @@ -54,10 +54,10 @@ func MustNew(cfg *rest.Config) versioned.Interface { return cli } -// NewInCluster creates an in-cluster client, or returns an error +// NewClient creates an client, or returns an error // when a failure is detected. -func NewInCluster() (versioned.Interface, error) { - cfg, err := k8sutil.InClusterConfig() +func NewClient() (versioned.Interface, error) { + cfg, err := k8sutil.NewKubeConfig() if err != nil { return nil, maskAny(err) } diff --git a/pkg/deployment/resources/servicemonitor.go b/pkg/deployment/resources/servicemonitor.go index cc75c450c..3cac64acd 100644 --- a/pkg/deployment/resources/servicemonitor.go +++ b/pkg/deployment/resources/servicemonitor.go @@ -57,7 +57,7 @@ func (r *Resources) EnsureMonitoringClient() (*clientv1.MonitoringV1Client, erro // Make a client: var restConfig *rest.Config - restConfig, err := k8sutil.InClusterConfig() + restConfig, err := k8sutil.NewKubeConfig() if err != nil { return nil, maskAny(err) } diff --git a/reboot.go b/reboot.go index e844053c6..ff886c649 100644 --- a/reboot.go +++ b/reboot.go @@ -386,7 +386,7 @@ func cmdRebootRun(cmd *cobra.Command, args []string) { cliLog.Fatal().Err(err).Msg("Failed to create Kubernetes client") } - extcli, err := extclient.NewInCluster() + extcli, err := extclient.NewClient() if err != nil { cliLog.Fatal().Err(err).Msg("failed to create arango extension client") } diff --git a/tests/annotations_test.go b/tests/annotations_test.go index 207c032a6..c446c1d1b 100644 --- a/tests/annotations_test.go +++ b/tests/annotations_test.go @@ -184,7 +184,7 @@ func ensureAnnotations(t *testing.T, client kubernetes.Interface, depl *api.Aran func TestAnnotations(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/auth_test.go b/tests/auth_test.go index d2eccb57e..88fb45401 100644 --- a/tests/auth_test.go +++ b/tests/auth_test.go @@ -41,7 +41,7 @@ import ( // with default authentication (on) using a generated JWT secret. func TestAuthenticationSingleDefaultSecret(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -89,7 +89,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) { // with default authentication (on) using a user created JWT secret. func TestAuthenticationSingleCustomSecret(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) secrets := kubecli.CoreV1().Secrets(ns) @@ -140,7 +140,7 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) { // with authentication set to `None`. func TestAuthenticationNoneSingle(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -179,7 +179,7 @@ func TestAuthenticationNoneSingle(t *testing.T) { // with default authentication (on) using a generated JWT secret. func TestAuthenticationClusterDefaultSecret(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -227,7 +227,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) { // with default authentication (on) using a user created JWT secret. func TestAuthenticationClusterCustomSecret(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) secrets := kubecli.CoreV1().Secrets(ns) @@ -280,7 +280,7 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) { // with authentication set to `None`. func TestAuthenticationNoneCluster(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/backup_test.go b/tests/backup_test.go index 01e126a80..9f32e9b80 100644 --- a/tests/backup_test.go +++ b/tests/backup_test.go @@ -317,9 +317,9 @@ func compareBackup(t *testing.T, meta driver.BackupMeta, backup *backupApi.Arang func TestBackupCluster(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) - deploymentClient := kubeArangoClient.MustNewInCluster() + deploymentClient := kubeArangoClient.MustNewClient() ns := getNamespace(t) backupPolicyClient := deploymentClient.BackupV1().ArangoBackupPolicies(ns) diff --git a/tests/change_args_test.go b/tests/change_args_test.go index 628e34322..b6c7de952 100644 --- a/tests/change_args_test.go +++ b/tests/change_args_test.go @@ -42,7 +42,7 @@ import ( // with default settings and once ready changes the arguments of the agents. func TestChangeArgsAgents(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -121,7 +121,7 @@ func TestChangeArgsAgents(t *testing.T) { // with default settings and once ready changes the arguments of the dbservers. func TestChangeArgsDBServer(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/cursor_test.go b/tests/cursor_test.go index dfbed0187..bfa0e0b0c 100644 --- a/tests/cursor_test.go +++ b/tests/cursor_test.go @@ -40,7 +40,7 @@ import ( // with default settings and runs some cursor requests on it. func TestCursorSingle(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -84,7 +84,7 @@ func TestCursorSingle(t *testing.T) { // with default settings. func TestCursorActiveFailover(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -128,7 +128,7 @@ func TestCursorActiveFailover(t *testing.T) { // with default settings. func TestCursorCluster(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/deployments_test.go b/tests/deployments_test.go index faaee7c43..fb39e164d 100644 --- a/tests/deployments_test.go +++ b/tests/deployments_test.go @@ -72,7 +72,7 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage ns := getNamespace(t) kubecli := mustNewKubeClient(t) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() // Prepare deployment config depl := newDeployment("test-deployment-" + string(mode) + "-" + string(engine) + "-" + uniuri.NewLen(4)) @@ -107,7 +107,7 @@ func TestMultiDeployment(t *testing.T) { ns := getNamespace(t) kubecli := mustNewKubeClient(t) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() // Prepare deployment configurations depl1 := newDeployment("test-multidep-1-" + uniuri.NewLen(4)) diff --git a/tests/environments_test.go b/tests/environments_test.go index b372c670f..999a5a65e 100644 --- a/tests/environments_test.go +++ b/tests/environments_test.go @@ -54,7 +54,7 @@ func TestEnvironmentProduction(t *testing.T) { } numNodes := len(nodeList.Items) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() depl := newDeployment(strings.Replace(fmt.Sprintf("tprod-%s-%s-%s", mode[:2], engine[:2], uniuri.NewLen(4)), ".", "", -1)) depl.Spec.Mode = api.NewMode(mode) depl.Spec.StorageEngine = api.NewStorageEngine(engine) diff --git a/tests/immutable_test.go b/tests/immutable_test.go index b36cddab1..5d342ac1b 100644 --- a/tests/immutable_test.go +++ b/tests/immutable_test.go @@ -39,7 +39,7 @@ import ( // spec are reverted to their original value. func TestImmutableFields(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) revertTimeout := time.Second * 30 diff --git a/tests/load_balancer_source_ranges_test.go b/tests/load_balancer_source_ranges_test.go index 19632f12e..be43ff46f 100644 --- a/tests/load_balancer_source_ranges_test.go +++ b/tests/load_balancer_source_ranges_test.go @@ -41,7 +41,7 @@ import ( func TestLoadBalancingSourceRanges(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/load_balancer_test.go b/tests/load_balancer_test.go index 8654733a4..641d478ef 100644 --- a/tests/load_balancer_test.go +++ b/tests/load_balancer_test.go @@ -54,7 +54,7 @@ func wasForwarded(r driver.Response) bool { // tests cursor forwarding with load-balanced conn. func loadBalancingCursorSubtest(t *testing.T, useVst bool) { - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/member_resilience_test.go b/tests/member_resilience_test.go index bba0a90d0..c148a3736 100644 --- a/tests/member_resilience_test.go +++ b/tests/member_resilience_test.go @@ -42,7 +42,7 @@ import ( // After 5 times, the member should be replaced by another member with the same ID. func TestMemberResilienceAgents(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -143,7 +143,7 @@ func TestMemberResilienceAgents(t *testing.T) { // After 5 times, the member should be replaced by another member. func TestMemberResilienceCoordinators(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -240,7 +240,7 @@ func TestMemberResilienceCoordinators(t *testing.T) { // After 5 times, the member should be replaced by another member. func TestMemberResilienceDBServers(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/metrics_test.go b/tests/metrics_test.go index f4e8c1585..4280eb1af 100644 --- a/tests/metrics_test.go +++ b/tests/metrics_test.go @@ -48,7 +48,7 @@ func TestAddingMetrics(t *testing.T) { ns := getNamespace(t) kubecli := mustNewKubeClient(t) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() depl := newDeployment(fmt.Sprintf("%s-%s", "arangodb-metrics-test", uniuri.NewLen(4))) depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster) diff --git a/tests/operator_upgrade_test.go b/tests/operator_upgrade_test.go index d32a1e40f..a3d36a705 100644 --- a/tests/operator_upgrade_test.go +++ b/tests/operator_upgrade_test.go @@ -27,7 +27,7 @@ const ( func TestOperatorUpgradeFrom038(t *testing.T) { ns := getNamespace(t) kubecli := mustNewKubeClient(t) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() if err := waitForArangoDBPodsGone(ns, kubecli); err != nil { t.Fatalf("Remaining arangodb pods did not vanish, can not start test: %v", err) diff --git a/tests/pc_test.go b/tests/pc_test.go index 589ea35c6..56a7b76c9 100644 --- a/tests/pc_test.go +++ b/tests/pc_test.go @@ -48,7 +48,7 @@ func waitForPriorityOfServerGroup(kube kubernetes.Interface, c versioned.Interfa // Then check if the pods have the desired priority. Then change the class and check that the pods are rotated. func TestPriorityClasses(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/pdb_test.go b/tests/pdb_test.go index e417fcda1..0d161b0ec 100644 --- a/tests/pdb_test.go +++ b/tests/pdb_test.go @@ -67,7 +67,7 @@ func waitForPDBsOfDeployment(kube kubernetes.Interface, apiObject *api.ArangoDep // modified accordingly. func TestPDBCreate(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/persistent_volumes_test.go b/tests/persistent_volumes_test.go index 5d3909fae..99611ab6a 100644 --- a/tests/persistent_volumes_test.go +++ b/tests/persistent_volumes_test.go @@ -70,7 +70,7 @@ func TestPVCExists(t *testing.T) { mode := api.DeploymentModeCluster engine := api.StorageEngineRocksDB - deploymentClient := kubeArangoClient.MustNewInCluster() + deploymentClient := kubeArangoClient.MustNewClient() deploymentTemplate := newDeployment(strings.Replace(fmt.Sprintf("tpers-%s-%s-%s", mode[:2], engine[:2], uniuri.NewLen(4)), ".", "", -1)) deploymentTemplate.Spec.Mode = api.NewMode(mode) deploymentTemplate.Spec.StorageEngine = api.NewStorageEngine(engine) @@ -106,7 +106,7 @@ func TestPVCResize(t *testing.T) { size10GB, _ := resource.ParseQuantity("10Gi") size08GB, _ := resource.ParseQuantity("8Gi") - deploymentClient := kubeArangoClient.MustNewInCluster() + deploymentClient := kubeArangoClient.MustNewClient() deploymentTemplate := newDeployment(strings.Replace(fmt.Sprintf("trsz-%s-%s-%s", mode[:2], engine[:2], uniuri.NewLen(4)), ".", "", -1)) deploymentTemplate.Spec.Mode = api.NewMode(mode) deploymentTemplate.Spec.StorageEngine = api.NewStorageEngine(engine) @@ -192,7 +192,7 @@ func TestPVCTemplateResize(t *testing.T) { size10GB, _ := resource.ParseQuantity("10Gi") size08GB, _ := resource.ParseQuantity("8Gi") - deploymentClient := kubeArangoClient.MustNewInCluster() + deploymentClient := kubeArangoClient.MustNewClient() deploymentTemplate := newDeployment(strings.Replace(fmt.Sprintf("trsz-%s-%s-%s", mode[:2], engine[:2], uniuri.NewLen(4)), ".", "", -1)) deploymentTemplate.Spec.Mode = api.NewMode(mode) deploymentTemplate.Spec.StorageEngine = api.NewStorageEngine(engine) @@ -271,7 +271,7 @@ func TestPVCChangeStorage(t *testing.T) { longOrSkip(t) k8sNameSpace := getNamespace(t) - arangoClient := kubeArangoClient.MustNewInCluster() + arangoClient := kubeArangoClient.MustNewClient() kubecli := mustNewKubeClient(t) mode := api.DeploymentModeCluster @@ -385,7 +385,7 @@ func TestPVCChangeStorageDeprecated(t *testing.T) { longOrSkip(t) k8sNameSpace := getNamespace(t) - arangoClient := kubeArangoClient.MustNewInCluster() + arangoClient := kubeArangoClient.MustNewClient() kubecli := mustNewKubeClient(t) mode := api.DeploymentModeCluster diff --git a/tests/resilience_test.go b/tests/resilience_test.go index 90465ae80..62d8f017c 100644 --- a/tests/resilience_test.go +++ b/tests/resilience_test.go @@ -45,7 +45,7 @@ import ( // Tests handling of individual pod deletions func TestResiliencePod(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -164,7 +164,7 @@ func TestResiliencePVCDBServers(t *testing.T) { // Tests handling of individual PVCs of given group being deleted func testResiliencePVC(testGroup api.ServerGroup, t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -257,7 +257,7 @@ func testResiliencePVC(testGroup api.ServerGroup, t *testing.T) { // Tests handling of entire PVs of dbservers being removed. func TestResiliencePVDBServer(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -361,7 +361,7 @@ func TestResiliencePVDBServer(t *testing.T) { // Tests handling of individual service deletions func TestResilienceService(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/resources_test.go b/tests/resources_test.go index 2d42ce20a..4fc316cc3 100644 --- a/tests/resources_test.go +++ b/tests/resources_test.go @@ -38,9 +38,9 @@ import ( func TestResourcesChangeLimitsCluster(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) - deploymentClient := kubeArangoClient.MustNewInCluster() + deploymentClient := kubeArangoClient.MustNewClient() ns := getNamespace(t) size500m, _ := resource.ParseQuantity("50m") diff --git a/tests/rocksdb_encryption_test.go b/tests/rocksdb_encryption_test.go index d4ac97466..01e62d33f 100644 --- a/tests/rocksdb_encryption_test.go +++ b/tests/rocksdb_encryption_test.go @@ -43,7 +43,7 @@ import ( func TestRocksDBEncryptionSingle(t *testing.T) { longOrSkip(t) image := getEnterpriseImageOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) secrets := kubecli.CoreV1().Secrets(ns) diff --git a/tests/scale_test.go b/tests/scale_test.go index 0fbf20a66..26a1eee00 100644 --- a/tests/scale_test.go +++ b/tests/scale_test.go @@ -38,7 +38,7 @@ import ( // of a cluster. func TestScaleClusterNonTLS(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -109,7 +109,7 @@ func TestScaleClusterNonTLS(t *testing.T) { func TestScaleCluster(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -182,7 +182,7 @@ func TestScaleCluster(t *testing.T) { func TestScaleClusterWithSync(t *testing.T) { longOrSkip(t) img := getEnterpriseImageOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/secret_hashes_test.go b/tests/secret_hashes_test.go index 9122e48ad..a324a25c8 100644 --- a/tests/secret_hashes_test.go +++ b/tests/secret_hashes_test.go @@ -43,7 +43,7 @@ import ( // TestSecretHashesRootUser checks if Status.SecretHashes.Users[root] changed after request for it func TestSecretHashesRootUser(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/service_account_test.go b/tests/service_account_test.go index 8cc6d5552..7b24eec48 100644 --- a/tests/service_account_test.go +++ b/tests/service_account_test.go @@ -43,7 +43,7 @@ import ( // with default settings using a custom service account. func TestServiceAccountSingle(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -91,7 +91,7 @@ func TestServiceAccountSingle(t *testing.T) { // with default settings using a custom service account. func TestServiceAccountActiveFailover(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -141,7 +141,7 @@ func TestServiceAccountActiveFailover(t *testing.T) { // with default settings using a custom service account. func TestServiceAccountCluster(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -194,7 +194,7 @@ func TestServiceAccountCluster(t *testing.T) { func TestServiceAccountClusterWithSync(t *testing.T) { longOrSkip(t) img := getEnterpriseImageOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/sidecar_test.go b/tests/sidecar_test.go index cecbc1dff..4fff87ff4 100644 --- a/tests/sidecar_test.go +++ b/tests/sidecar_test.go @@ -114,7 +114,7 @@ func runSideCarTest(t *testing.T, spec SideCarTest) { ns := getNamespace(t) kubecli := mustNewKubeClient(t) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() depl := newDeployment(fmt.Sprintf("tu-%s-%s", spec.Name(), uniuri.NewLen(4))) depl.Spec.Mode = api.NewMode(spec.Mode()) diff --git a/tests/simple_test.go b/tests/simple_test.go index 99a73682e..9633b76b7 100644 --- a/tests/simple_test.go +++ b/tests/simple_test.go @@ -38,7 +38,7 @@ import ( // TestSimpleSingle tests the creating of a single server deployment // with default settings. func TestSimpleSingle(t *testing.T) { - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -76,7 +76,7 @@ func TestSimpleSingle(t *testing.T) { // TestSimpleActiveFailover tests the creating of a ActiveFailover server deployment // with default settings. func TestSimpleActiveFailover(t *testing.T) { - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -114,7 +114,7 @@ func TestSimpleActiveFailover(t *testing.T) { // TestSimpleCluster tests the creating of a cluster deployment // with default settings. func TestSimpleCluster(t *testing.T) { - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -153,7 +153,7 @@ func TestSimpleCluster(t *testing.T) { // with default settings and sync enabled. func TestSimpleClusterWithSync(t *testing.T) { img := getEnterpriseImageOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/sync/main.go b/tests/sync/main.go index 371a88dfc..ceb6c47ae 100644 --- a/tests/sync/main.go +++ b/tests/sync/main.go @@ -392,7 +392,7 @@ func main() { flag.Parse() ctx := context.Background() kube := k8sutil.MustNewKubeClient() - c := client.MustNewInCluster() + c := client.MustNewClient() defer removeReplicationWaitForCompletion(namespace, replicationResourceName, c) defer removeDeploymentWaitForCompletion(namespace, dstDeploymentName, c) diff --git a/tests/sync_test.go b/tests/sync_test.go index 27a94dbbe..ce07386fd 100644 --- a/tests/sync_test.go +++ b/tests/sync_test.go @@ -57,7 +57,7 @@ func waitUntilReplicationNotFound(ns, name string, cli versioned.Interface) erro func TestSyncSimple(t *testing.T) { longOrSkip(t) img := getEnterpriseImageOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) @@ -159,7 +159,7 @@ func TestSyncSimple(t *testing.T) { func TestSyncToggleEnabled(t *testing.T) { longOrSkip(t) img := getEnterpriseImageOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t) diff --git a/tests/test_util.go b/tests/test_util.go index d02ca6319..689fe6502 100644 --- a/tests/test_util.go +++ b/tests/test_util.go @@ -590,7 +590,7 @@ func createEqualVersionsPredicate(version driver.Version) func(driver.VersionInf // clusterSidecarsEqualSpec returns nil if sidecars from spec and cluster match func waitUntilClusterSidecarsEqualSpec(t *testing.T, spec api.DeploymentMode, depl api.ArangoDeployment) error { - c := cl.MustNewInCluster() + c := cl.MustNewClient() ns := getNamespace(t) var noGood int diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go index 492098b9a..1ec02266b 100644 --- a/tests/upgrade_test.go +++ b/tests/upgrade_test.go @@ -227,7 +227,7 @@ func runUpgradeTest(t *testing.T, spec UpgradeTest) { ns := getNamespace(t) kubecli := mustNewKubeClient(t) - c := kubeArangoClient.MustNewInCluster() + c := kubeArangoClient.MustNewClient() depl := newDeployment(fmt.Sprintf("tu-%s-%s", spec.Name(), uniuri.NewLen(4))) depl.Spec.Mode = api.NewMode(spec.Mode()) diff --git a/tests/version_test.go b/tests/version_test.go index a0fa729ac..a7c93a465 100644 --- a/tests/version_test.go +++ b/tests/version_test.go @@ -14,7 +14,7 @@ import ( func TestIsVersionSet(t *testing.T) { longOrSkip(t) - c := client.MustNewInCluster() + c := client.MustNewClient() kubecli := mustNewKubeClient(t) ns := getNamespace(t)