From 9be005d2a4b6e26f98ff9c520ea53ae4d6cc9455 Mon Sep 17 00:00:00 2001 From: Michael Montgomery Date: Mon, 25 Oct 2021 07:43:14 -0500 Subject: [PATCH] Update golangci-lint/goimports configuration (#4945) * Update goimports settings to consider github.com/elastic/cloud-on-k8s a local prefix in imports * remove comment in golangci.yml * Fix imports Add back linter hints * Fix more imports Add back more linter hints * Update verbiage for ccontributing guidelines Update additional files to group import groups properly * Fix mis-aligned imports * Fix additional bad import statements --- .golangci.yml | 4 ++ CONTRIBUTING.md | 5 ++- cmd/licensing-info/main.go | 5 ++- cmd/main.go | 5 ++- cmd/manager/main.go | 41 ++++++++++--------- cmd/manager/main_test.go | 15 +++---- hack/deployer/cmd/create.go | 3 +- hack/deployer/cmd/execute.go | 3 +- hack/deployer/cmd/get.go | 3 +- pkg/apis/agent/v1alpha1/validations.go | 3 +- pkg/apis/agent/v1alpha1/validations_test.go | 3 +- pkg/apis/agent/v1alpha1/webhook.go | 3 +- pkg/apis/apm/v1/webhook.go | 7 ++-- pkg/apis/apm/v1/webhook_test.go | 7 ++-- pkg/apis/apm/v1beta1/apmserver_types.go | 3 +- pkg/apis/apm/v1beta1/webhook.go | 7 ++-- pkg/apis/apm/v1beta1/webhook_test.go | 5 ++- pkg/apis/beat/v1beta1/webhook.go | 3 +- pkg/apis/common/v1/validations.go | 5 ++- pkg/apis/elasticsearch/v1/autoscaling.go | 5 ++- pkg/apis/elasticsearch/v1/autoscaling_test.go | 3 +- .../elasticsearch/v1/elasticsearch_config.go | 5 ++- .../v1/elasticsearch_config_test.go | 7 ++-- .../elasticsearch/v1/elasticsearch_types.go | 7 ++-- .../v1/elasticsearch_types_test.go | 5 ++- pkg/apis/elasticsearch/v1/name.go | 3 +- .../v1beta1/elasticsearch_config.go | 3 +- .../v1beta1/elasticsearch_config_test.go | 3 +- .../v1beta1/elasticsearch_types.go | 5 ++- pkg/apis/elasticsearch/v1beta1/name.go | 3 +- pkg/apis/elasticsearch/v1beta1/validations.go | 3 +- .../elasticsearch/v1beta1/validations_test.go | 3 +- pkg/apis/elasticsearch/v1beta1/warnings.go | 3 +- pkg/apis/elasticsearch/v1beta1/webhook.go | 3 +- .../v1/enterprisesearch_types.go | 5 ++- pkg/apis/enterprisesearch/v1/webhook.go | 7 ++-- pkg/apis/enterprisesearch/v1/webhook_test.go | 5 ++- .../v1beta1/enterprisesearch_types.go | 3 +- pkg/apis/enterprisesearch/v1beta1/webhook.go | 7 ++-- .../enterprisesearch/v1beta1/webhook_test.go | 5 ++- pkg/apis/kibana/v1/webhook.go | 11 ++--- pkg/apis/kibana/v1/webhook_test.go | 5 ++- pkg/apis/kibana/v1beta1/webhook.go | 7 ++-- pkg/apis/kibana/v1beta1/webhook_test.go | 5 ++- pkg/apis/maps/v1alpha1/maps_types.go | 3 +- pkg/apis/maps/v1alpha1/webhook.go | 7 ++-- pkg/apis/maps/v1alpha1/webhook_test.go | 5 ++- pkg/controller/agent/driver.go | 2 +- pkg/controller/agent/reconcile.go | 17 ++++---- pkg/controller/apmserver/config_test.go | 9 ++-- pkg/controller/apmserver/controller.go | 27 ++++++------ pkg/controller/apmserver/controller_test.go | 13 +++--- pkg/controller/apmserver/deployment_test.go | 15 +++---- pkg/controller/apmserver/pod_test.go | 4 +- pkg/controller/association/ca.go | 9 ++-- pkg/controller/association/ca_test.go | 9 ++-- pkg/controller/association/conf.go | 3 +- pkg/controller/association/conf_test.go | 13 +++--- pkg/controller/association/controller.go | 11 ++--- .../association/controller/agent_es.go | 2 +- .../controller/agent_fleetserver.go | 7 ++-- .../association/controller/agent_kibana.go | 7 ++-- .../association/controller/apm_es.go | 6 +-- .../association/controller/apm_kibana.go | 9 ++-- .../association/controller/beat_es.go | 3 +- .../association/controller/beat_kibana.go | 9 ++-- .../association/controller/kb_monitoring.go | 2 +- .../association/controller/kibana_ent.go | 7 ++-- .../association/controller/kibana_es.go | 7 ++-- .../association/controller/maps_es.go | 7 ++-- pkg/controller/association/dynamic_watches.go | 3 +- pkg/controller/association/fixtures.go | 3 +- pkg/controller/association/gc.go | 7 ++-- pkg/controller/association/gc_test.go | 11 ++--- pkg/controller/association/reconciler_test.go | 19 +++++---- pkg/controller/association/resources_test.go | 3 +- pkg/controller/association/service.go | 5 ++- pkg/controller/association/service_test.go | 3 +- pkg/controller/association/user.go | 13 +++--- pkg/controller/autoscaling/elasticsearch.go | 7 ++-- .../elasticsearch/autoscaler/autoscaler.go | 3 +- .../autoscaler/autoscaler_test.go | 9 ++-- .../elasticsearch/autoscaler/context.go | 3 +- .../elasticsearch/autoscaler/linear_scaler.go | 3 +- .../autoscaler/linear_scaler_test.go | 3 +- .../elasticsearch/autoscaler/nodesets_test.go | 3 +- .../elasticsearch/autoscaler/offline.go | 5 ++- .../elasticsearch/autoscaler/offline_test.go | 7 ++-- .../autoscaler/recommender/memory.go | 7 ++-- .../autoscaler/recommender/recommender.go | 7 ++-- .../autoscaler/recommender/storage.go | 7 ++-- .../autoscaling/elasticsearch/controller.go | 11 ++--- .../elasticsearch/controller_test.go | 19 +++++---- .../autoscaling/elasticsearch/driver.go | 9 ++-- .../autoscaling/elasticsearch/driver_test.go | 5 ++- .../autoscaling/elasticsearch/policy.go | 5 ++- .../autoscaling/elasticsearch/reconcile.go | 13 +++--- .../elasticsearch/resources/resources.go | 3 +- .../elasticsearch/resources/resources_test.go | 5 ++- .../elasticsearch/status/actual.go | 7 ++-- .../elasticsearch/status/actual_test.go | 9 ++-- .../elasticsearch/status/events.go | 3 +- .../elasticsearch/status/status.go | 3 +- pkg/controller/beat/common/config_test.go | 11 ++--- pkg/controller/beat/common/health_test.go | 3 +- pkg/controller/beat/common/pod.go | 5 ++- pkg/controller/beat/common/pod_test.go | 9 ++-- pkg/controller/beat/common/reconcile.go | 15 +++---- pkg/controller/beat/common/reconcile_test.go | 7 ++-- pkg/controller/beat/controller.go | 23 ++++++----- .../common/annotation/association.go | 3 +- .../common/annotation/controller_version.go | 7 ++-- .../annotation/controller_version_test.go | 9 ++-- pkg/controller/common/annotation/pod.go | 5 ++- pkg/controller/common/annotation/pod_test.go | 3 +- .../common/association/association.go | 7 ++-- .../common/association/association_test.go | 2 +- .../common/certificates/ca_reconcile.go | 7 ++-- .../common/certificates/ca_reconcile_test.go | 7 ++-- .../common/certificates/dynamic_watches.go | 3 +- .../common/certificates/http_reconcile.go | 11 ++--- .../certificates/http_reconcile_test.go | 11 ++--- .../common/certificates/reconcile.go | 13 +++--- .../common/certificates/reconcile_test.go | 11 ++--- pkg/controller/common/certificates/secret.go | 7 ++-- pkg/controller/common/configref.go | 11 ++--- pkg/controller/common/controller.go | 7 ++-- .../common/defaults/pod_template.go | 3 +- pkg/controller/common/defaults/pvc.go | 3 +- pkg/controller/common/defaults/service.go | 3 +- .../common/defaults/service_test.go | 3 +- .../common/deployment/reconcile_test.go | 7 ++-- pkg/controller/common/driver/interface.go | 3 +- .../common/expectations/deletions.go | 3 +- .../common/expectations/expectations_test.go | 3 +- .../common/expectations/generations.go | 3 +- .../common/expectations/generations_test.go | 5 ++- .../common/expectations/per_cluster_test.go | 3 +- pkg/controller/common/finalizer/finalizers.go | 3 +- .../common/finalizer/finalizers_test.go | 5 ++- .../common/keystore/initcontainer.go | 3 +- pkg/controller/common/keystore/resources.go | 7 ++-- .../common/keystore/resources_test.go | 11 ++--- pkg/controller/common/keystore/user_secret.go | 13 +++--- pkg/controller/common/license/check.go | 3 +- pkg/controller/common/license/check_test.go | 5 ++- pkg/controller/common/license/crud.go | 7 ++-- pkg/controller/common/license/crud_test.go | 3 +- pkg/controller/common/license/detection.go | 3 +- .../common/license/detection_test.go | 3 +- .../common/license/fixtures_test.go | 3 +- pkg/controller/common/license/labels.go | 3 +- pkg/controller/common/license/model.go | 3 +- pkg/controller/common/license/model_test.go | 5 ++- pkg/controller/common/license/trial.go | 3 +- .../common/license/verifier_test.go | 4 +- pkg/controller/common/name/name.go | 5 ++- .../common/reconciler/reconciler.go | 5 ++- .../common/reconciler/reconciler_test.go | 5 ++- pkg/controller/common/reconciler/results.go | 3 +- pkg/controller/common/reconciler/secret.go | 5 ++- .../common/reconciler/secret_test.go | 7 ++-- pkg/controller/common/scheme/scheme.go | 5 ++- pkg/controller/common/service_control.go | 7 ++-- pkg/controller/common/service_control_test.go | 9 ++-- pkg/controller/common/stackmon/config.go | 2 +- pkg/controller/common/stackmon/config_test.go | 5 ++- .../stackmon/monitoring/monitoring_test.go | 3 +- pkg/controller/common/stackmon/name_test.go | 5 ++- pkg/controller/common/stackmon/sidecar.go | 2 +- .../stackmon/validations/validations.go | 3 +- pkg/controller/common/status.go | 7 ++-- pkg/controller/common/status_test.go | 5 ++- pkg/controller/common/tracing/tracer.go | 3 +- pkg/controller/common/volume/downward_api.go | 3 +- pkg/controller/common/watches/handler.go | 3 +- pkg/controller/common/watches/handler_test.go | 3 +- pkg/controller/common/watches/secrets.go | 3 +- pkg/controller/common/watches/secrets_test.go | 7 ++-- .../elasticsearch/bootstrap/bootstrap.go | 3 +- .../elasticsearch/bootstrap/bootstrap_test.go | 5 ++- .../elasticsearch/certificates/reconcile.go | 7 ++-- .../certificates/remoteca/reconcile.go | 7 ++-- .../certificates/remoteca/reconcile_test.go | 11 ++--- .../certificates/transport/ca.go | 9 ++-- .../certificates/transport/csr.go | 5 ++- .../certificates/transport/csr_test.go | 7 ++-- .../certificates/transport/pod_secret.go | 3 +- .../transport/public_secret_test.go | 9 ++-- .../certificates/transport/reconcile.go | 11 ++--- .../certificates/transport/reconcile_test.go | 13 +++--- .../transport/transport_fixtures_test.go | 9 ++-- .../elasticsearch/cleanup/resources.go | 11 ++--- .../elasticsearch/cleanup/resources_test.go | 7 ++-- .../elasticsearch/client/autoscaling_test.go | 5 ++- pkg/controller/elasticsearch/client/base.go | 5 ++- pkg/controller/elasticsearch/client/client.go | 3 +- .../elasticsearch/client/client_test.go | 9 ++-- .../elasticsearch/client/license_test.go | 5 ++- pkg/controller/elasticsearch/client/model.go | 3 +- pkg/controller/elasticsearch/client/v6.go | 3 +- pkg/controller/elasticsearch/client/v7.go | 3 +- .../elasticsearch/configmap/configmap.go | 2 +- .../elasticsearch/driver/downscale.go | 7 ++-- .../driver/downscale_invariants_test.go | 9 ++-- .../elasticsearch/driver/downscale_test.go | 13 +++--- .../elasticsearch/driver/downscale_utils.go | 3 +- .../elasticsearch/driver/expectations_test.go | 5 ++- .../elasticsearch/driver/fixtures.go | 2 +- pkg/controller/elasticsearch/driver/log.go | 3 +- pkg/controller/elasticsearch/driver/nodes.go | 7 ++-- .../elasticsearch/driver/pvc_expansion.go | 9 ++-- .../driver/pvc_expansion_test.go | 11 ++--- pkg/controller/elasticsearch/driver/pvc_gc.go | 5 ++- .../elasticsearch/driver/pvc_gc_test.go | 9 ++-- .../elasticsearch/driver/pvc_owner.go | 7 ++-- .../elasticsearch/driver/pvc_owner_test.go | 7 ++-- .../elasticsearch/driver/suspend.go | 5 ++- .../elasticsearch/driver/upgrade_forced.go | 5 ++- .../driver/upgrade_forced_test.go | 7 ++-- .../driver/upgrade_pods_deletion.go | 5 ++- .../driver/upgrade_predicates.go | 3 +- .../driver/upgrade_predicates_test.go | 5 ++- .../elasticsearch/driver/upscale.go | 3 +- .../elasticsearch/driver/upscale_state.go | 5 ++- .../driver/upscale_state_test.go | 9 ++-- .../elasticsearch/driver/upscale_test.go | 19 +++++---- .../elasticsearch/driver/version_test.go | 5 ++- .../elasticsearch/elasticsearch_controller.go | 25 +++++------ .../initcontainer/initcontainer.go | 3 +- .../initcontainer/initcontainer_test.go | 3 +- .../elasticsearch/initcontainer/keystore.go | 5 ++- .../elasticsearch/initcontainer/prepare_fs.go | 5 ++- .../elasticsearch/initcontainer/suspend.go | 3 +- .../initcontainer/suspend_test.go | 3 +- pkg/controller/elasticsearch/label/label.go | 7 ++-- .../elasticsearch/label/label_test.go | 7 ++-- pkg/controller/elasticsearch/license/apply.go | 9 ++-- .../elasticsearch/license/reconcile.go | 3 +- .../elasticsearch/nodespec/defaults.go | 2 +- .../elasticsearch/nodespec/lifecycle_hook.go | 3 +- .../elasticsearch/nodespec/podspec_test.go | 11 ++--- .../elasticsearch/nodespec/readiness_probe.go | 3 +- .../elasticsearch/nodespec/resources.go | 2 +- .../elasticsearch/nodespec/statefulset.go | 7 ++-- .../nodespec/statefulset_test.go | 5 ++- .../elasticsearch/observer/manager.go | 5 ++- .../elasticsearch/observer/manager_test.go | 5 ++- .../elasticsearch/observer/observer.go | 5 ++- .../elasticsearch/observer/observer_test.go | 5 ++- .../elasticsearch/observer/state.go | 3 +- .../elasticsearch/observer/state_test.go | 5 ++- .../elasticsearch/observer/watch.go | 3 +- pkg/controller/elasticsearch/pdb/reconcile.go | 13 +++--- .../elasticsearch/pdb/reconcile_test.go | 17 ++++---- .../reconcile/resources_state.go | 7 ++-- .../elasticsearch/reconcile/state.go | 3 +- .../remotecluster/elasticsearch.go | 7 ++-- .../remotecluster/elasticsearch_test.go | 4 +- .../elasticsearch/services/services.go | 5 ++- .../elasticsearch/services/services_test.go | 11 ++--- .../elasticsearch/settings/config_volume.go | 9 ++-- .../settings/config_volume_test.go | 7 ++-- .../elasticsearch/settings/masters.go | 9 ++-- .../elasticsearch/settings/masters_test.go | 9 ++-- .../elasticsearch/settings/merged_config.go | 3 +- .../settings/merged_config_test.go | 7 ++-- pkg/controller/elasticsearch/sset/getter.go | 7 ++-- .../elasticsearch/sset/getter_test.go | 5 ++- pkg/controller/elasticsearch/sset/list.go | 11 ++--- .../elasticsearch/sset/list_test.go | 10 ++--- pkg/controller/elasticsearch/sset/pod.go | 9 ++-- pkg/controller/elasticsearch/sset/pod_test.go | 7 ++-- .../elasticsearch/sset/reconcile_test.go | 13 +++--- .../elasticsearch/sset/validation.go | 3 +- .../elasticsearch/sset/validation_test.go | 5 ++- .../elasticsearch/user/associated.go | 5 ++- .../elasticsearch/user/associated_test.go | 3 +- .../elasticsearch/user/predefined.go | 13 +++--- .../elasticsearch/user/predefined_test.go | 7 ++-- .../elasticsearch/user/reconcile.go | 13 +++--- .../elasticsearch/user/user_provided.go | 11 ++--- .../elasticsearch/user/user_provided_test.go | 5 +-- .../validation/autoscaling_validation.go | 7 ++-- .../validation/autoscaling_validation_test.go | 5 ++- .../elasticsearch/validation/validations.go | 3 +- .../validation/validations_test.go | 5 ++- .../validation/volume_validation.go | 7 ++-- .../validation/volume_validation_test.go | 7 ++-- .../elasticsearch/validation/warnings.go | 3 +- .../elasticsearch/validation/webhook.go | 7 ++-- .../elasticsearch/validation/webhook_test.go | 5 ++- .../version/supported_versions_test.go | 3 +- .../version/zen1/compatibility_test.go | 9 ++-- .../version/zen2/compatibility.go | 3 +- .../version/zen2/compatibility_test.go | 9 ++-- .../version/zen2/initial_master_nodes.go | 3 +- .../version/zen2/voting_exclusions_test.go | 7 ++-- pkg/controller/enterprisesearch/config.go | 9 ++-- .../enterprisesearch/config_test.go | 11 ++--- .../enterprisesearch_controller.go | 23 ++++++----- pkg/controller/enterprisesearch/pod_test.go | 2 +- pkg/controller/kibana/config_settings.go | 13 +++--- pkg/controller/kibana/config_settings_test.go | 11 ++--- pkg/controller/kibana/controller.go | 23 ++++++----- pkg/controller/kibana/driver_test.go | 2 +- pkg/controller/kibana/init_configuration.go | 3 +- pkg/controller/kibana/keystore.go | 5 ++- pkg/controller/kibana/pod.go | 4 +- pkg/controller/kibana/pod_test.go | 7 ++-- pkg/controller/kibana/stackmon/sidecar.go | 3 +- .../kibana/stackmon/sidecar_test.go | 7 ++-- pkg/controller/license/license_controller.go | 23 ++++++----- .../license/license_controller_test.go | 11 ++--- pkg/controller/license/list.go | 5 ++- .../license/trial/trial_controller.go | 13 +++--- .../license/trial/trial_controller_test.go | 7 ++-- pkg/controller/maps/config.go | 5 ++- pkg/controller/maps/config_test.go | 9 ++-- pkg/controller/maps/controller.go | 23 ++++++----- pkg/controller/maps/controller_test.go | 15 +++---- pkg/controller/maps/pod.go | 7 ++-- pkg/controller/remoteca/rbac.go | 5 ++- pkg/controller/remoteca/watches.go | 5 +-- .../webhook_certificates_controller.go | 13 +++--- pkg/dev/portforward/pod_forwarder.go | 5 ++- pkg/dev/portforward/pod_forwarder_test.go | 6 +-- pkg/dev/portforward/service_forwarder_test.go | 3 +- pkg/license/aggregator.go | 7 ++-- pkg/license/aggregator_test.go | 11 ++--- pkg/license/license.go | 11 ++--- pkg/license/license_test.go | 3 +- pkg/license/reporter.go | 3 +- pkg/telemetry/telemetry.go | 9 ++-- pkg/telemetry/telemetry_test.go | 7 ++-- pkg/utils/k8s/client.go | 3 +- pkg/utils/k8s/k8sutils.go | 3 +- pkg/utils/k8s/k8sutils_test.go | 3 +- pkg/utils/log/log.go | 5 ++- pkg/utils/rbac/access_review.go | 3 +- pkg/utils/rbac/access_review_test.go | 3 +- pkg/utils/test/namespace.go | 3 +- pkg/utils/test/retry.go | 3 +- pkg/utils/test/webhook.go | 5 ++- support/reattach-pv/main.go | 9 ++-- test/e2e/cmd/chaos/chaos.go | 5 ++- test/e2e/cmd/chaos/command.go | 3 +- test/e2e/cmd/main.go | 5 ++- test/e2e/cmd/run/command.go | 5 ++- test/e2e/cmd/run/eventlog.go | 3 +- test/e2e/cmd/run/job_manager.go | 3 +- test/e2e/cmd/run/run.go | 11 ++--- test/e2e/test/agent/builder.go | 15 +++---- test/e2e/test/agent/steps.go | 11 ++--- test/e2e/test/apmserver/builder.go | 11 ++--- test/e2e/test/apmserver/checks_apm.go | 7 ++-- test/e2e/test/apmserver/steps_creation.go | 3 +- test/e2e/test/apmserver/steps_deletion.go | 7 ++-- test/e2e/test/apmserver/steps_init.go | 5 ++- test/e2e/test/beat/builder.go | 5 ++- test/e2e/test/beat/pod_builder.go | 7 ++-- test/e2e/test/beat/steps.go | 7 ++-- test/e2e/test/checks/common.go | 7 ++-- test/e2e/test/checks/monitoring.go | 3 +- test/e2e/test/common_steps.go | 6 +-- test/e2e/test/context.go | 5 ++- test/e2e/test/default.go | 3 +- test/e2e/test/elasticsearch/builder.go | 13 +++--- test/e2e/test/elasticsearch/checks_budget.go | 3 +- test/e2e/test/elasticsearch/checks_data.go | 3 +- test/e2e/test/elasticsearch/checks_es.go | 3 +- test/e2e/test/elasticsearch/checks_k8s.go | 7 ++-- .../e2e/test/elasticsearch/checks_keystore.go | 5 ++- .../e2e/test/elasticsearch/checks_reversal.go | 3 +- .../test/elasticsearch/checks_transport.go | 5 ++- test/e2e/test/elasticsearch/checks_volume.go | 3 +- test/e2e/test/elasticsearch/cluster_uuid.go | 3 +- .../e2e/test/elasticsearch/license_fixture.go | 3 +- test/e2e/test/elasticsearch/steps_creation.go | 3 +- test/e2e/test/elasticsearch/steps_deletion.go | 11 ++--- test/e2e/test/elasticsearch/steps_init.go | 7 ++-- test/e2e/test/elasticsearch/steps_license.go | 11 ++--- test/e2e/test/elasticsearch/steps_mutation.go | 7 ++-- test/e2e/test/enterprisesearch/builder.go | 11 ++--- .../test/enterprisesearch/steps_creation.go | 3 +- .../test/enterprisesearch/steps_deletion.go | 7 ++-- test/e2e/test/enterprisesearch/steps_init.go | 5 ++- test/e2e/test/helper/yaml.go | 19 +++++---- test/e2e/test/k8s_client.go | 29 ++++++------- test/e2e/test/kibana/builder.go | 11 ++--- test/e2e/test/kibana/checks_kb.go | 3 +- test/e2e/test/kibana/steps_creation.go | 3 +- test/e2e/test/kibana/steps_deletion.go | 7 ++-- test/e2e/test/kibana/steps_init.go | 5 ++- test/e2e/test/maps/builder.go | 9 ++-- test/e2e/test/maps/steps.go | 7 ++-- test/e2e/test/utils.go | 5 ++- test/e2e/test/version_test.go | 3 +- 398 files changed, 1492 insertions(+), 1127 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 7985f92337..6aab71e440 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,10 @@ linters-settings: or more contributor license agreements. Licensed under the Elastic License 2.0; you may not use this file except in compliance with the Elastic License 2.0. + goimports: + # put imports beginning with prefix after 3rd-party packages; + local-prefixes: github.com/elastic/cloud-on-k8s + nolintlint: allow-leading-space: false allow-unused: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 771b693c2d..9a1a66bafb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,9 +33,10 @@ Check requirements and steps in this [guide](dev-setup.md). ### Format your code and manage imports 1. Run `make lint` to make sure there are no lint warnings. -2. Make sure you only have two groups in your imports: +2. Make sure you only have, at maximum, 3 groups in your imports: - a group for packages from the standard library - - a group for third parties + - (optionally) a group for third parties + - (optionally) a group for 'local' imports (local being 'github.com/elastic/cloud-on-k8s') ### Scripts diff --git a/cmd/licensing-info/main.go b/cmd/licensing-info/main.go index 56b6923d02..31de536ddb 100644 --- a/cmd/licensing-info/main.go +++ b/cmd/licensing-info/main.go @@ -10,12 +10,13 @@ import ( "fmt" "log" - controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" - "github.com/elastic/cloud-on-k8s/pkg/license" "k8s.io/client-go/kubernetes/scheme" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" + + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" + "github.com/elastic/cloud-on-k8s/pkg/license" ) // Simple program that returns the licensing information, including the total memory of all Elastic managed components by diff --git a/cmd/main.go b/cmd/main.go index be73bb7f59..0a11212bfb 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,11 +5,12 @@ package main import ( + "github.com/spf13/cobra" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" + "github.com/elastic/cloud-on-k8s/cmd/manager" "github.com/elastic/cloud-on-k8s/pkg/about" "github.com/elastic/cloud-on-k8s/pkg/dev" - "github.com/spf13/cobra" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) func main() { diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 7d1f4cd2b9..6fb1741054 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -15,6 +15,27 @@ import ( "strings" "time" + "github.com/fsnotify/fsnotify" + "github.com/go-logr/logr" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "go.elastic.co/apm" + "go.uber.org/automaxprocs/maxprocs" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/kubernetes" + clientgoscheme "k8s.io/client-go/kubernetes/scheme" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // allow gcp authentication + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/leaderelection/resourcelock" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/cache" + "sigs.k8s.io/controller-runtime/pkg/client" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/manager/signals" + "github.com/elastic/cloud-on-k8s/pkg/about" agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" @@ -61,26 +82,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/metrics" "github.com/elastic/cloud-on-k8s/pkg/utils/net" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "github.com/fsnotify/fsnotify" - "github.com/go-logr/logr" - "github.com/spf13/cobra" - "github.com/spf13/viper" - "go.elastic.co/apm" - "go.uber.org/automaxprocs/maxprocs" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/kubernetes" - clientgoscheme "k8s.io/client-go/kubernetes/scheme" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // allow gcp authentication - "k8s.io/client-go/rest" - "k8s.io/client-go/tools/leaderelection/resourcelock" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/cache" - "sigs.k8s.io/controller-runtime/pkg/client" - logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/manager/signals" ) const ( diff --git a/cmd/manager/main_test.go b/cmd/manager/main_test.go index eb8b46bc1a..d60ddda432 100644 --- a/cmd/manager/main_test.go +++ b/cmd/manager/main_test.go @@ -8,13 +8,6 @@ import ( "context" "testing" - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -22,6 +15,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" logf "sigs.k8s.io/controller-runtime/pkg/log" + + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func ownedSecret(namespace, name, ownerNs, ownerName, ownerKind string) *corev1.Secret { diff --git a/hack/deployer/cmd/create.go b/hack/deployer/cmd/create.go index 5dabc81fc9..0fdb19de44 100644 --- a/hack/deployer/cmd/create.go +++ b/hack/deployer/cmd/create.go @@ -10,8 +10,9 @@ import ( "os" "path" - "github.com/elastic/cloud-on-k8s/hack/deployer/runner" "github.com/spf13/cobra" + + "github.com/elastic/cloud-on-k8s/hack/deployer/runner" ) func CreateCommand() *cobra.Command { diff --git a/hack/deployer/cmd/execute.go b/hack/deployer/cmd/execute.go index 9d3fb6007f..7049af8471 100644 --- a/hack/deployer/cmd/execute.go +++ b/hack/deployer/cmd/execute.go @@ -5,8 +5,9 @@ package cmd import ( - "github.com/elastic/cloud-on-k8s/hack/deployer/runner" "github.com/spf13/cobra" + + "github.com/elastic/cloud-on-k8s/hack/deployer/runner" ) func ExecuteCommand() *cobra.Command { diff --git a/hack/deployer/cmd/get.go b/hack/deployer/cmd/get.go index 7199b17718..d92b131f7f 100644 --- a/hack/deployer/cmd/get.go +++ b/hack/deployer/cmd/get.go @@ -7,9 +7,10 @@ package cmd import ( "fmt" - "github.com/elastic/cloud-on-k8s/hack/deployer/runner" "github.com/ghodss/yaml" "github.com/spf13/cobra" + + "github.com/elastic/cloud-on-k8s/hack/deployer/runner" ) func GetCommand() *cobra.Command { diff --git a/pkg/apis/agent/v1alpha1/validations.go b/pkg/apis/agent/v1alpha1/validations.go index 74655b6b1f..cbafaf1623 100644 --- a/pkg/apis/agent/v1alpha1/validations.go +++ b/pkg/apis/agent/v1alpha1/validations.go @@ -8,9 +8,10 @@ import ( "fmt" "reflect" + "k8s.io/apimachinery/pkg/util/validation/field" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "k8s.io/apimachinery/pkg/util/validation/field" ) var ( diff --git a/pkg/apis/agent/v1alpha1/validations_test.go b/pkg/apis/agent/v1alpha1/validations_test.go index fc5c331c3b..b0114f3362 100644 --- a/pkg/apis/agent/v1alpha1/validations_test.go +++ b/pkg/apis/agent/v1alpha1/validations_test.go @@ -7,8 +7,9 @@ package v1alpha1 import ( "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/stretchr/testify/assert" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" ) func Test_checkSupportedVersion(t *testing.T) { diff --git a/pkg/apis/agent/v1alpha1/webhook.go b/pkg/apis/agent/v1alpha1/webhook.go index e9cdd27048..8af271381b 100644 --- a/pkg/apis/agent/v1alpha1/webhook.go +++ b/pkg/apis/agent/v1alpha1/webhook.go @@ -7,13 +7,14 @@ package v1alpha1 import ( "errors" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/apm/v1/webhook.go b/pkg/apis/apm/v1/webhook.go index c8e9069069..119757ae15 100644 --- a/pkg/apis/apm/v1/webhook.go +++ b/pkg/apis/apm/v1/webhook.go @@ -8,15 +8,16 @@ import ( "errors" "fmt" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/apm/v1/webhook_test.go b/pkg/apis/apm/v1/webhook_test.go index 06ad9037de..063d34866d 100644 --- a/pkg/apis/apm/v1/webhook_test.go +++ b/pkg/apis/apm/v1/webhook_test.go @@ -9,14 +9,15 @@ import ( "strings" "testing" - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/apis/apm/v1beta1/apmserver_types.go b/pkg/apis/apm/v1beta1/apmserver_types.go index 1f006f683a..1e208a674e 100644 --- a/pkg/apis/apm/v1beta1/apmserver_types.go +++ b/pkg/apis/apm/v1beta1/apmserver_types.go @@ -5,9 +5,10 @@ package v1beta1 import ( - commonv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" ) const APMServerContainerName = "apm-server" diff --git a/pkg/apis/apm/v1beta1/webhook.go b/pkg/apis/apm/v1beta1/webhook.go index 07b83ff197..d95a546d69 100644 --- a/pkg/apis/apm/v1beta1/webhook.go +++ b/pkg/apis/apm/v1beta1/webhook.go @@ -7,15 +7,16 @@ package v1beta1 import ( "errors" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/apm/v1beta1/webhook_test.go b/pkg/apis/apm/v1beta1/webhook_test.go index 67ead75de4..dc4ec90130 100644 --- a/pkg/apis/apm/v1beta1/webhook_test.go +++ b/pkg/apis/apm/v1beta1/webhook_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - apmv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1beta1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + apmv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1beta1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/apis/beat/v1beta1/webhook.go b/pkg/apis/beat/v1beta1/webhook.go index 972e56cd97..33e76539ce 100644 --- a/pkg/apis/beat/v1beta1/webhook.go +++ b/pkg/apis/beat/v1beta1/webhook.go @@ -7,13 +7,14 @@ package v1beta1 import ( "errors" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/common/v1/validations.go b/pkg/apis/common/v1/validations.go index 81211ee6d0..6947580dfa 100644 --- a/pkg/apis/common/v1/validations.go +++ b/pkg/apis/common/v1/validations.go @@ -9,13 +9,14 @@ import ( "fmt" "strings" - common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + + common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) // NoUnknownFields checks whether the last applied config annotation contains json with unknown fields. diff --git a/pkg/apis/elasticsearch/v1/autoscaling.go b/pkg/apis/elasticsearch/v1/autoscaling.go index 52f70f9625..23db954178 100644 --- a/pkg/apis/elasticsearch/v1/autoscaling.go +++ b/pkg/apis/elasticsearch/v1/autoscaling.go @@ -10,11 +10,12 @@ import ( "fmt" "time" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/set" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ElasticsearchAutoscalingSpecAnnotationName = "elasticsearch.alpha.elastic.co/autoscaling-spec" diff --git a/pkg/apis/elasticsearch/v1/autoscaling_test.go b/pkg/apis/elasticsearch/v1/autoscaling_test.go index 5d0b45f7dc..20db57365e 100644 --- a/pkg/apis/elasticsearch/v1/autoscaling_test.go +++ b/pkg/apis/elasticsearch/v1/autoscaling_test.go @@ -8,9 +8,10 @@ import ( "reflect" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/resource" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" ) func TestAutoscalingSpec_GetAutoscaledNodeSets(t *testing.T) { diff --git a/pkg/apis/elasticsearch/v1/elasticsearch_config.go b/pkg/apis/elasticsearch/v1/elasticsearch_config.go index b6af0bbcef..bb5f07f100 100644 --- a/pkg/apis/elasticsearch/v1/elasticsearch_config.go +++ b/pkg/apis/elasticsearch/v1/elasticsearch_config.go @@ -5,11 +5,12 @@ package v1 import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "github.com/elastic/go-ucfg" "k8s.io/utils/pointer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" ) diff --git a/pkg/apis/elasticsearch/v1/elasticsearch_config_test.go b/pkg/apis/elasticsearch/v1/elasticsearch_config_test.go index 11fcabe354..95428e1a3c 100644 --- a/pkg/apis/elasticsearch/v1/elasticsearch_config_test.go +++ b/pkg/apis/elasticsearch/v1/elasticsearch_config_test.go @@ -7,12 +7,13 @@ package v1 import ( "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/compare" "github.com/go-test/deep" "github.com/stretchr/testify/require" "k8s.io/utils/pointer" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/compare" ) func TestConfig_RoleDefaults(t *testing.T) { diff --git a/pkg/apis/elasticsearch/v1/elasticsearch_types.go b/pkg/apis/elasticsearch/v1/elasticsearch_types.go index a44b3bad52..f7708db340 100644 --- a/pkg/apis/elasticsearch/v1/elasticsearch_types.go +++ b/pkg/apis/elasticsearch/v1/elasticsearch_types.go @@ -8,13 +8,14 @@ import ( "fmt" "strings" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" "github.com/elastic/cloud-on-k8s/pkg/utils/set" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/apis/elasticsearch/v1/elasticsearch_types_test.go b/pkg/apis/elasticsearch/v1/elasticsearch_types_test.go index b512663e48..38fa335423 100644 --- a/pkg/apis/elasticsearch/v1/elasticsearch_types_test.go +++ b/pkg/apis/elasticsearch/v1/elasticsearch_types_test.go @@ -11,11 +11,12 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/elastic/cloud-on-k8s/pkg/utils/set" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" + "github.com/elastic/cloud-on-k8s/pkg/utils/set" ) func TestElasticsearchHealth_Less(t *testing.T) { diff --git a/pkg/apis/elasticsearch/v1/name.go b/pkg/apis/elasticsearch/v1/name.go index aed6f4f88f..fef20a83f7 100644 --- a/pkg/apis/elasticsearch/v1/name.go +++ b/pkg/apis/elasticsearch/v1/name.go @@ -8,10 +8,11 @@ import ( "strconv" "strings" - common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/pkg/errors" apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" utilvalidation "k8s.io/apimachinery/pkg/util/validation" + + common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/apis/elasticsearch/v1beta1/elasticsearch_config.go b/pkg/apis/elasticsearch/v1beta1/elasticsearch_config.go index 1b4b815c31..31c5a27806 100644 --- a/pkg/apis/elasticsearch/v1beta1/elasticsearch_config.go +++ b/pkg/apis/elasticsearch/v1beta1/elasticsearch_config.go @@ -5,8 +5,9 @@ package v1beta1 import ( - "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" ucfg "github.com/elastic/go-ucfg" + + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" ) const ( diff --git a/pkg/apis/elasticsearch/v1beta1/elasticsearch_config_test.go b/pkg/apis/elasticsearch/v1beta1/elasticsearch_config_test.go index 78edcd064b..1cc9f040e0 100644 --- a/pkg/apis/elasticsearch/v1beta1/elasticsearch_config_test.go +++ b/pkg/apis/elasticsearch/v1beta1/elasticsearch_config_test.go @@ -7,9 +7,10 @@ package v1beta1 import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" "github.com/go-test/deep" "github.com/stretchr/testify/require" + + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" ) func TestConfig_RoleDefaults(t *testing.T) { diff --git a/pkg/apis/elasticsearch/v1beta1/elasticsearch_types.go b/pkg/apis/elasticsearch/v1beta1/elasticsearch_types.go index 1372bbf9c2..abe9d40744 100644 --- a/pkg/apis/elasticsearch/v1beta1/elasticsearch_types.go +++ b/pkg/apis/elasticsearch/v1beta1/elasticsearch_types.go @@ -5,10 +5,11 @@ package v1beta1 import ( - commonv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" - "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" + "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" ) const ElasticsearchContainerName = "elasticsearch" diff --git a/pkg/apis/elasticsearch/v1beta1/name.go b/pkg/apis/elasticsearch/v1beta1/name.go index 322908bbb2..1eec39eff9 100644 --- a/pkg/apis/elasticsearch/v1beta1/name.go +++ b/pkg/apis/elasticsearch/v1beta1/name.go @@ -8,10 +8,11 @@ import ( "strconv" "strings" - common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/pkg/errors" apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" utilvalidation "k8s.io/apimachinery/pkg/util/validation" + + common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/apis/elasticsearch/v1beta1/validations.go b/pkg/apis/elasticsearch/v1beta1/validations.go index cb4c72780e..878d344370 100644 --- a/pkg/apis/elasticsearch/v1beta1/validations.go +++ b/pkg/apis/elasticsearch/v1beta1/validations.go @@ -9,11 +9,12 @@ import ( "net" "reflect" + "k8s.io/apimachinery/pkg/util/validation/field" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" esversion "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version" netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" - "k8s.io/apimachinery/pkg/util/validation/field" ) const ( diff --git a/pkg/apis/elasticsearch/v1beta1/validations_test.go b/pkg/apis/elasticsearch/v1beta1/validations_test.go index 5296980a08..13076c2a0f 100644 --- a/pkg/apis/elasticsearch/v1beta1/validations_test.go +++ b/pkg/apis/elasticsearch/v1beta1/validations_test.go @@ -7,10 +7,11 @@ package v1beta1 import ( "testing" - common "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + common "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1beta1" ) func Test_checkNodeSetNameUniqueness(t *testing.T) { diff --git a/pkg/apis/elasticsearch/v1beta1/warnings.go b/pkg/apis/elasticsearch/v1beta1/warnings.go index 36f98c1f82..c5f12477e7 100644 --- a/pkg/apis/elasticsearch/v1beta1/warnings.go +++ b/pkg/apis/elasticsearch/v1beta1/warnings.go @@ -5,8 +5,9 @@ package v1beta1 import ( - common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" "k8s.io/apimachinery/pkg/util/validation/field" + + common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" ) var warnings = []validation{ diff --git a/pkg/apis/elasticsearch/v1beta1/webhook.go b/pkg/apis/elasticsearch/v1beta1/webhook.go index 5ff46b10e2..efd760f5d6 100644 --- a/pkg/apis/elasticsearch/v1beta1/webhook.go +++ b/pkg/apis/elasticsearch/v1beta1/webhook.go @@ -7,13 +7,14 @@ package v1beta1 import ( "errors" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) // +kubebuilder:webhook:path=/validate-elasticsearch-k8s-elastic-co-v1beta1-elasticsearch,mutating=false,failurePolicy=ignore,groups=elasticsearch.k8s.elastic.co,resources=elasticsearches,verbs=create;update,versions=v1beta1,name=elastic-es-validation-v1beta1.k8s.elastic.co,sideEffects=None,admissionReviewVersions=v1;v1beta1,matchPolicy=Exact diff --git a/pkg/apis/enterprisesearch/v1/enterprisesearch_types.go b/pkg/apis/enterprisesearch/v1/enterprisesearch_types.go index 4cf46fb422..8873449022 100644 --- a/pkg/apis/enterprisesearch/v1/enterprisesearch_types.go +++ b/pkg/apis/enterprisesearch/v1/enterprisesearch_types.go @@ -7,10 +7,11 @@ package v1 import ( "fmt" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/apis/enterprisesearch/v1/webhook.go b/pkg/apis/enterprisesearch/v1/webhook.go index ee3b6195f3..07b7232179 100644 --- a/pkg/apis/enterprisesearch/v1/webhook.go +++ b/pkg/apis/enterprisesearch/v1/webhook.go @@ -7,15 +7,16 @@ package v1 import ( "errors" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/enterprisesearch/v1/webhook_test.go b/pkg/apis/enterprisesearch/v1/webhook_test.go index 643f3fe695..d32ddb9da5 100644 --- a/pkg/apis/enterprisesearch/v1/webhook_test.go +++ b/pkg/apis/enterprisesearch/v1/webhook_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/apis/enterprisesearch/v1beta1/enterprisesearch_types.go b/pkg/apis/enterprisesearch/v1beta1/enterprisesearch_types.go index 54f952a5e6..a8fcb70fd2 100644 --- a/pkg/apis/enterprisesearch/v1beta1/enterprisesearch_types.go +++ b/pkg/apis/enterprisesearch/v1beta1/enterprisesearch_types.go @@ -7,9 +7,10 @@ package v1beta1 import ( "fmt" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" ) const ( diff --git a/pkg/apis/enterprisesearch/v1beta1/webhook.go b/pkg/apis/enterprisesearch/v1beta1/webhook.go index 7c428b83fc..3824e94080 100644 --- a/pkg/apis/enterprisesearch/v1beta1/webhook.go +++ b/pkg/apis/enterprisesearch/v1beta1/webhook.go @@ -7,15 +7,16 @@ package v1beta1 import ( "errors" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/enterprisesearch/v1beta1/webhook_test.go b/pkg/apis/enterprisesearch/v1beta1/webhook_test.go index b000157215..62787b487e 100644 --- a/pkg/apis/enterprisesearch/v1beta1/webhook_test.go +++ b/pkg/apis/enterprisesearch/v1beta1/webhook_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - entv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1beta1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + entv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1beta1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/apis/kibana/v1/webhook.go b/pkg/apis/kibana/v1/webhook.go index 933b17663a..8c9aa9b0c0 100644 --- a/pkg/apis/kibana/v1/webhook.go +++ b/pkg/apis/kibana/v1/webhook.go @@ -7,17 +7,18 @@ package v1 import ( "errors" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/validations" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/validations" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/kibana/v1/webhook_test.go b/pkg/apis/kibana/v1/webhook_test.go index 12e3b932ad..61ec6e9130 100644 --- a/pkg/apis/kibana/v1/webhook_test.go +++ b/pkg/apis/kibana/v1/webhook_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/apis/kibana/v1beta1/webhook.go b/pkg/apis/kibana/v1beta1/webhook.go index 5f4e6a440c..b8666e8e9c 100644 --- a/pkg/apis/kibana/v1beta1/webhook.go +++ b/pkg/apis/kibana/v1beta1/webhook.go @@ -7,15 +7,16 @@ package v1beta1 import ( "errors" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/kibana/v1beta1/webhook_test.go b/pkg/apis/kibana/v1beta1/webhook_test.go index 770fd73159..73fab7d733 100644 --- a/pkg/apis/kibana/v1beta1/webhook_test.go +++ b/pkg/apis/kibana/v1beta1/webhook_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - kbv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1beta1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + kbv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1beta1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/apis/maps/v1alpha1/maps_types.go b/pkg/apis/maps/v1alpha1/maps_types.go index 31c91979a6..36be53ece5 100644 --- a/pkg/apis/maps/v1alpha1/maps_types.go +++ b/pkg/apis/maps/v1alpha1/maps_types.go @@ -7,9 +7,10 @@ package v1alpha1 import ( "fmt" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" ) const ( diff --git a/pkg/apis/maps/v1alpha1/webhook.go b/pkg/apis/maps/v1alpha1/webhook.go index 44ec3ccf3a..60f0dafd68 100644 --- a/pkg/apis/maps/v1alpha1/webhook.go +++ b/pkg/apis/maps/v1alpha1/webhook.go @@ -5,15 +5,16 @@ package v1alpha1 import ( - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/apis/maps/v1alpha1/webhook_test.go b/pkg/apis/maps/v1alpha1/webhook_test.go index 397ecaff5f..9c3068a8e5 100644 --- a/pkg/apis/maps/v1alpha1/webhook_test.go +++ b/pkg/apis/maps/v1alpha1/webhook_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" - "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" ) func TestWebhook(t *testing.T) { diff --git a/pkg/controller/agent/driver.go b/pkg/controller/agent/driver.go index 405204a92d..2e616179db 100644 --- a/pkg/controller/agent/driver.go +++ b/pkg/controller/agent/driver.go @@ -9,6 +9,7 @@ import ( "crypto/sha256" "fmt" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/tools/record" @@ -27,7 +28,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/go-logr/logr" ) const ( diff --git a/pkg/controller/agent/reconcile.go b/pkg/controller/agent/reconcile.go index f8153cca35..cfebadd439 100644 --- a/pkg/controller/agent/reconcile.go +++ b/pkg/controller/agent/reconcile.go @@ -7,14 +7,6 @@ package agent import ( "context" - agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/daemonset" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/deployment" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -24,6 +16,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/daemonset" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/deployment" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" ) func reconcilePodVehicle(params Params, podTemplate corev1.PodTemplateSpec) *reconciler.Results { diff --git a/pkg/controller/apmserver/config_test.go b/pkg/controller/apmserver/config_test.go index bd1ea13d37..810d3fc03a 100644 --- a/pkg/controller/apmserver/config_test.go +++ b/pkg/controller/apmserver/config_test.go @@ -7,14 +7,15 @@ package apmserver import ( "testing" - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestNewConfigFromSpec(t *testing.T) { diff --git a/pkg/controller/apmserver/controller.go b/pkg/controller/apmserver/controller.go index 3b72698863..d82e56cd82 100644 --- a/pkg/controller/apmserver/controller.go +++ b/pkg/controller/apmserver/controller.go @@ -10,6 +10,20 @@ import ( "reflect" "sync/atomic" + "go.elastic.co/apm" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -27,19 +41,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) const ( diff --git a/pkg/controller/apmserver/controller_test.go b/pkg/controller/apmserver/controller_test.go index 8c5a768ac2..95518a7545 100644 --- a/pkg/controller/apmserver/controller_test.go +++ b/pkg/controller/apmserver/controller_test.go @@ -8,6 +8,13 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -16,12 +23,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/compare" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) func TestReconcileApmServer_doReconcile(t *testing.T) { diff --git a/pkg/controller/apmserver/deployment_test.go b/pkg/controller/apmserver/deployment_test.go index 5ab2255aaa..01fbecb63b 100644 --- a/pkg/controller/apmserver/deployment_test.go +++ b/pkg/controller/apmserver/deployment_test.go @@ -7,6 +7,14 @@ package apmserver import ( "testing" + "github.com/go-test/deep" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/tools/record" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" @@ -15,13 +23,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/go-test/deep" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/tools/record" ) var certSecretName = "test-apm-server-apm-http-certs-internal" //nolint:gosec diff --git a/pkg/controller/apmserver/pod_test.go b/pkg/controller/apmserver/pod_test.go index 9a0d438be4..43af94dc36 100644 --- a/pkg/controller/apmserver/pod_test.go +++ b/pkg/controller/apmserver/pod_test.go @@ -7,6 +7,8 @@ package apmserver import ( "testing" + "github.com/go-test/deep" + "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -15,8 +17,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" - "github.com/go-test/deep" - "github.com/stretchr/testify/assert" ) func TestNewPodSpec(t *testing.T) { diff --git a/pkg/controller/association/ca.go b/pkg/controller/association/ca.go index b69f72bd85..ea39adce8f 100644 --- a/pkg/controller/association/ca.go +++ b/pkg/controller/association/ca.go @@ -7,15 +7,16 @@ package association import ( "context" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) // CASecret is a container to hold information about the Elasticsearch CA secret. diff --git a/pkg/controller/association/ca_test.go b/pkg/controller/association/ca_test.go index 462e2c0a81..16a018ffe4 100644 --- a/pkg/controller/association/ca_test.go +++ b/pkg/controller/association/ca_test.go @@ -8,6 +8,11 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -15,10 +20,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) const kibanaESAssociationName = "kibana-es" diff --git a/pkg/controller/association/conf.go b/pkg/controller/association/conf.go index 3c6e95110f..93a8b2ec1e 100644 --- a/pkg/controller/association/conf.go +++ b/pkg/controller/association/conf.go @@ -21,11 +21,10 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/reconcile" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) diff --git a/pkg/controller/association/conf_test.go b/pkg/controller/association/conf_test.go index b15795e453..2bd32c6daf 100644 --- a/pkg/controller/association/conf_test.go +++ b/pkg/controller/association/conf_test.go @@ -9,18 +9,19 @@ import ( "strconv" "testing" - agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestFetchWithAssociation(t *testing.T) { diff --git a/pkg/controller/association/controller.go b/pkg/controller/association/controller.go index cf40764fbf..73a8fbef42 100644 --- a/pkg/controller/association/controller.go +++ b/pkg/controller/association/controller.go @@ -5,16 +5,17 @@ package association import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/source" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" + "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" ) var ( diff --git a/pkg/controller/association/controller/agent_es.go b/pkg/controller/association/controller/agent_es.go index 516682624c..81aebf3143 100644 --- a/pkg/controller/association/controller/agent_es.go +++ b/pkg/controller/association/controller/agent_es.go @@ -5,11 +5,11 @@ package controller import ( - agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" diff --git a/pkg/controller/association/controller/agent_fleetserver.go b/pkg/controller/association/controller/agent_fleetserver.go index fbb9bcb770..1a0e0ddb02 100644 --- a/pkg/controller/association/controller/agent_fleetserver.go +++ b/pkg/controller/association/controller/agent_fleetserver.go @@ -7,6 +7,10 @@ package controller import ( "context" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/agent" @@ -14,9 +18,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) func AddAgentFleetServer(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params operator.Parameters) error { diff --git a/pkg/controller/association/controller/agent_kibana.go b/pkg/controller/association/controller/agent_kibana.go index b917c33612..2b2b8128d0 100644 --- a/pkg/controller/association/controller/agent_kibana.go +++ b/pkg/controller/association/controller/agent_kibana.go @@ -5,6 +5,10 @@ package controller import ( + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -12,9 +16,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) func AddAgentKibana(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params operator.Parameters) error { diff --git a/pkg/controller/association/controller/apm_es.go b/pkg/controller/association/controller/apm_es.go index 0462045101..8298bc8803 100644 --- a/pkg/controller/association/controller/apm_es.go +++ b/pkg/controller/association/controller/apm_es.go @@ -8,7 +8,10 @@ import ( "context" "strings" + pkgerrors "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" @@ -21,9 +24,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - pkgerrors "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/manager" ) const ( diff --git a/pkg/controller/association/controller/apm_kibana.go b/pkg/controller/association/controller/apm_kibana.go index 4b1f85f54f..40918a8ea8 100644 --- a/pkg/controller/association/controller/apm_kibana.go +++ b/pkg/controller/association/controller/apm_kibana.go @@ -7,6 +7,11 @@ package controller import ( "context" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -16,10 +21,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) func AddApmKibana(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params operator.Parameters) error { diff --git a/pkg/controller/association/controller/beat_es.go b/pkg/controller/association/controller/beat_es.go index d206ebb83b..74ed170c15 100644 --- a/pkg/controller/association/controller/beat_es.go +++ b/pkg/controller/association/controller/beat_es.go @@ -8,10 +8,9 @@ import ( "fmt" "strings" - "sigs.k8s.io/controller-runtime/pkg/client" - pkgerrors "github.com/pkg/errors" "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" diff --git a/pkg/controller/association/controller/beat_kibana.go b/pkg/controller/association/controller/beat_kibana.go index 65d2bbddcd..6646eedf1b 100644 --- a/pkg/controller/association/controller/beat_kibana.go +++ b/pkg/controller/association/controller/beat_kibana.go @@ -8,6 +8,11 @@ import ( "fmt" "strings" + pkgerrors "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -17,10 +22,6 @@ import ( esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - pkgerrors "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) func AddBeatKibana(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params operator.Parameters) error { diff --git a/pkg/controller/association/controller/kb_monitoring.go b/pkg/controller/association/controller/kb_monitoring.go index 79344b03bf..4cf24635d2 100644 --- a/pkg/controller/association/controller/kb_monitoring.go +++ b/pkg/controller/association/controller/kb_monitoring.go @@ -5,13 +5,13 @@ package controller import ( - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" eslabel "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" diff --git a/pkg/controller/association/controller/kibana_ent.go b/pkg/controller/association/controller/kibana_ent.go index 163b1c2765..2c5fb5ee5b 100644 --- a/pkg/controller/association/controller/kibana_ent.go +++ b/pkg/controller/association/controller/kibana_ent.go @@ -7,6 +7,10 @@ package controller import ( "context" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -15,9 +19,6 @@ import ( entctl "github.com/elastic/cloud-on-k8s/pkg/controller/enterprisesearch" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) func AddKibanaEnt(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params operator.Parameters) error { diff --git a/pkg/controller/association/controller/kibana_es.go b/pkg/controller/association/controller/kibana_es.go index 1b0594d060..a311bcb604 100644 --- a/pkg/controller/association/controller/kibana_es.go +++ b/pkg/controller/association/controller/kibana_es.go @@ -7,6 +7,10 @@ package controller import ( "context" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -15,9 +19,6 @@ import ( eslabel "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) const ( diff --git a/pkg/controller/association/controller/maps_es.go b/pkg/controller/association/controller/maps_es.go index 534b8cfc01..660d82a4d0 100644 --- a/pkg/controller/association/controller/maps_es.go +++ b/pkg/controller/association/controller/maps_es.go @@ -5,6 +5,10 @@ package controller import ( + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" @@ -14,9 +18,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" ) const ( diff --git a/pkg/controller/association/dynamic_watches.go b/pkg/controller/association/dynamic_watches.go index be34b3e210..a002391ca4 100644 --- a/pkg/controller/association/dynamic_watches.go +++ b/pkg/controller/association/dynamic_watches.go @@ -7,10 +7,11 @@ package association import ( "fmt" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "k8s.io/apimachinery/pkg/types" ) // referencedResourceWatchName is the name of the watch set on the referenced resource. diff --git a/pkg/controller/association/fixtures.go b/pkg/controller/association/fixtures.go index a3f504363e..53d0d39172 100644 --- a/pkg/controller/association/fixtures.go +++ b/pkg/controller/association/fixtures.go @@ -5,9 +5,10 @@ package association import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) type testAPMServer struct { diff --git a/pkg/controller/association/gc.go b/pkg/controller/association/gc.go index f6f8295c0a..886b6f5a38 100644 --- a/pkg/controller/association/gc.go +++ b/pkg/controller/association/gc.go @@ -7,9 +7,6 @@ package association import ( "context" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -17,6 +14,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/association/gc_test.go b/pkg/controller/association/gc_test.go index 8f1c654e77..9aeef5d385 100644 --- a/pkg/controller/association/gc_test.go +++ b/pkg/controller/association/gc_test.go @@ -8,17 +8,18 @@ import ( "context" "testing" - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/association/reconciler_test.go b/pkg/controller/association/reconciler_test.go index d59f307da8..9f53669616 100644 --- a/pkg/controller/association/reconciler_test.go +++ b/pkg/controller/association/reconciler_test.go @@ -10,6 +10,16 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/elastic/cloud-on-k8s/pkg/about" agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" @@ -26,15 +36,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) var ( diff --git a/pkg/controller/association/resources_test.go b/pkg/controller/association/resources_test.go index e6236dc65f..e45fee9d89 100644 --- a/pkg/controller/association/resources_test.go +++ b/pkg/controller/association/resources_test.go @@ -8,13 +8,12 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "github.com/stretchr/testify/assert" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" diff --git a/pkg/controller/association/service.go b/pkg/controller/association/service.go index 5773eed43f..ddc3d0d977 100644 --- a/pkg/controller/association/service.go +++ b/pkg/controller/association/service.go @@ -8,10 +8,11 @@ import ( "context" "fmt" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // ServiceURL calculates the URL for the service identified by serviceNSN using protocol. diff --git a/pkg/controller/association/service_test.go b/pkg/controller/association/service_test.go index bc30761bb9..ed19cb631c 100644 --- a/pkg/controller/association/service_test.go +++ b/pkg/controller/association/service_test.go @@ -7,10 +7,11 @@ package association import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestServiceURL(t *testing.T) { diff --git a/pkg/controller/association/user.go b/pkg/controller/association/user.go index 9fb4f1e0d8..2b187e8d5b 100644 --- a/pkg/controller/association/user.go +++ b/pkg/controller/association/user.go @@ -7,6 +7,13 @@ package association import ( "context" + "go.elastic.co/apm" + "golang.org/x/crypto/bcrypt" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -15,12 +22,6 @@ import ( eslabel "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "go.elastic.co/apm" - "golang.org/x/crypto/bcrypt" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) // elasticsearchUserName identifies the associated user in Elasticsearch namespace. diff --git a/pkg/controller/autoscaling/elasticsearch.go b/pkg/controller/autoscaling/elasticsearch.go index 4e7893b5f1..136fb57924 100644 --- a/pkg/controller/autoscaling/elasticsearch.go +++ b/pkg/controller/autoscaling/elasticsearch.go @@ -5,13 +5,14 @@ package autoscaling import ( + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/source" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/source" ) const ( diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler.go index dcbb9e8f49..fa445571ce 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler.go @@ -5,8 +5,9 @@ package autoscaler import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" corev1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" ) // GetResources calculates the resources required by all the NodeSets managed by a same autoscaling policy. diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler_test.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler_test.go index e04a75be6d..cbddcda4da 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler_test.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/autoscaler_test.go @@ -7,14 +7,15 @@ package autoscaler import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) func Test_GetResources(t *testing.T) { diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/context.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/context.go index 5b6433196d..a46d10a5c8 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/context.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/context.go @@ -5,11 +5,12 @@ package autoscaler import ( + "github.com/go-logr/logr" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - "github.com/go-logr/logr" ) // Context contains the required objects used by the autoscaler functions. diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler.go index 3a0e8eaa2e..0fdaff6bd9 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler.go @@ -7,10 +7,11 @@ package autoscaler import ( "fmt" + "k8s.io/apimachinery/pkg/api/resource" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" "github.com/elastic/cloud-on-k8s/pkg/utils/math" - "k8s.io/apimachinery/pkg/api/resource" ) // cpuFromMemory computes a CPU quantity within the specified allowed range by the user proportionally diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler_test.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler_test.go index 33fd1289dd..e71bf97221 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler_test.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/linear_scaler_test.go @@ -7,8 +7,9 @@ package autoscaler import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "k8s.io/apimachinery/pkg/api/resource" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) // q is a shorthand for resource.MustParse, the only purpose is to make unit tests more readable. diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/nodesets_test.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/nodesets_test.go index cd64e61f2f..82577dc5e0 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/nodesets_test.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/nodesets_test.go @@ -7,8 +7,9 @@ package autoscaler import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" "github.com/stretchr/testify/assert" + + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" ) func Test_distributeFairly(t *testing.T) { diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/offline.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/offline.go index a9d965bbf7..5b6aee0831 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/offline.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/offline.go @@ -5,11 +5,12 @@ package autoscaler import ( + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" ) // GetOfflineNodeSetsResources attempts to create or restore resources.NodeSetsResources without an actual autoscaling diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/offline_test.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/offline_test.go index 78d9261fa7..b4309ca07c 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/offline_test.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/offline_test.go @@ -8,12 +8,13 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" logf "sigs.k8s.io/controller-runtime/pkg/log" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" ) var logTest = logf.Log.WithName("autoscaling-test") diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/memory.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/memory.go index 57e4307e88..1957f94bbe 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/memory.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/memory.go @@ -7,13 +7,14 @@ package recommender import ( "fmt" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) type memory struct { diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/recommender.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/recommender.go index 86ebe10185..19a9004a18 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/recommender.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/recommender.go @@ -7,14 +7,15 @@ package recommender import ( "fmt" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/math" - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) // Recommender implements the logic to calculate the resource quantity required for a given resource at both node diff --git a/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/storage.go b/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/storage.go index 8bdfba309d..dd6aad6a5d 100644 --- a/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/storage.go +++ b/pkg/controller/autoscaling/elasticsearch/autoscaler/recommender/storage.go @@ -8,14 +8,15 @@ import ( "fmt" "math" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) type storage struct { diff --git a/pkg/controller/autoscaling/elasticsearch/controller.go b/pkg/controller/autoscaling/elasticsearch/controller.go index 49d07b338a..5706e26adb 100644 --- a/pkg/controller/autoscaling/elasticsearch/controller.go +++ b/pkg/controller/autoscaling/elasticsearch/controller.go @@ -9,6 +9,12 @@ import ( "fmt" "time" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -27,11 +33,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" logconf "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/net" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) type EsClientProvider func(ctx context.Context, c k8s.Client, dialer net.Dialer, es esv1.Elasticsearch) (esclient.Client, error) diff --git a/pkg/controller/autoscaling/elasticsearch/controller_test.go b/pkg/controller/autoscaling/elasticsearch/controller_test.go index f324d90cb2..c3e2b1fbc0 100644 --- a/pkg/controller/autoscaling/elasticsearch/controller_test.go +++ b/pkg/controller/autoscaling/elasticsearch/controller_test.go @@ -14,6 +14,16 @@ import ( "testing" "time" + "github.com/ghodss/yaml" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/elastic/cloud-on-k8s/pkg/about" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" @@ -24,15 +34,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/net" - "github.com/ghodss/yaml" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) var ( diff --git a/pkg/controller/autoscaling/elasticsearch/driver.go b/pkg/controller/autoscaling/elasticsearch/driver.go index de5afd6d8c..57d68bc154 100644 --- a/pkg/controller/autoscaling/elasticsearch/driver.go +++ b/pkg/controller/autoscaling/elasticsearch/driver.go @@ -10,6 +10,11 @@ import ( "sort" "strings" + "github.com/go-logr/logr" + "go.elastic.co/apm" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/autoscaler" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" @@ -18,10 +23,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" logconf "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/go-logr/logr" - "go.elastic.co/apm" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) func (r *ReconcileElasticsearch) reconcileInternal( diff --git a/pkg/controller/autoscaling/elasticsearch/driver_test.go b/pkg/controller/autoscaling/elasticsearch/driver_test.go index 12833fde2c..f1ce8efaf0 100644 --- a/pkg/controller/autoscaling/elasticsearch/driver_test.go +++ b/pkg/controller/autoscaling/elasticsearch/driver_test.go @@ -7,10 +7,11 @@ package elasticsearch import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" "github.com/stretchr/testify/assert" logf "sigs.k8s.io/controller-runtime/pkg/log" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" ) var logTest = logf.Log.WithName("autoscaling-test") diff --git a/pkg/controller/autoscaling/elasticsearch/policy.go b/pkg/controller/autoscaling/elasticsearch/policy.go index aa6c3dd971..a3e8635eae 100644 --- a/pkg/controller/autoscaling/elasticsearch/policy.go +++ b/pkg/controller/autoscaling/elasticsearch/policy.go @@ -7,11 +7,12 @@ package elasticsearch import ( "context" + "github.com/go-logr/logr" + "go.elastic.co/apm" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - "github.com/go-logr/logr" - "go.elastic.co/apm" ) // updatePolicies updates the autoscaling policies in the Elasticsearch cluster. diff --git a/pkg/controller/autoscaling/elasticsearch/reconcile.go b/pkg/controller/autoscaling/elasticsearch/reconcile.go index ee645a65b8..18ade1b42a 100644 --- a/pkg/controller/autoscaling/elasticsearch/reconcile.go +++ b/pkg/controller/autoscaling/elasticsearch/reconcile.go @@ -8,12 +8,6 @@ import ( "context" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/validation" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/go-logr/logr" "go.elastic.co/apm" corev1 "k8s.io/api/core/v1" @@ -22,6 +16,13 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/status" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) // reconcileElasticsearch updates the resources in the NodeSets of an Elasticsearch spec according to the NodeSetsResources diff --git a/pkg/controller/autoscaling/elasticsearch/resources/resources.go b/pkg/controller/autoscaling/elasticsearch/resources/resources.go index 45df42fe60..95b522ff2f 100644 --- a/pkg/controller/autoscaling/elasticsearch/resources/resources.go +++ b/pkg/controller/autoscaling/elasticsearch/resources/resources.go @@ -8,10 +8,11 @@ import ( "fmt" "math" - v1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" + + v1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) const ( diff --git a/pkg/controller/autoscaling/elasticsearch/resources/resources_test.go b/pkg/controller/autoscaling/elasticsearch/resources/resources_test.go index 819a485f85..ee9d96ee41 100644 --- a/pkg/controller/autoscaling/elasticsearch/resources/resources_test.go +++ b/pkg/controller/autoscaling/elasticsearch/resources/resources_test.go @@ -8,13 +8,14 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) func TestNodeResources_ToContainerResourcesWith(t *testing.T) { diff --git a/pkg/controller/autoscaling/elasticsearch/status/actual.go b/pkg/controller/autoscaling/elasticsearch/status/actual.go index a8a9f02fe4..891eb7b1a6 100644 --- a/pkg/controller/autoscaling/elasticsearch/status/actual.go +++ b/pkg/controller/autoscaling/elasticsearch/status/actual.go @@ -8,15 +8,16 @@ import ( "context" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // ImportExistingResources attempts to infer the resources to allocate to node sets if an autoscaling policy is not in the Status. diff --git a/pkg/controller/autoscaling/elasticsearch/status/actual_test.go b/pkg/controller/autoscaling/elasticsearch/status/actual_test.go index 3dc564cea1..5dd68cc690 100644 --- a/pkg/controller/autoscaling/elasticsearch/status/actual_test.go +++ b/pkg/controller/autoscaling/elasticsearch/status/actual_test.go @@ -8,15 +8,16 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestNodeSetsResourcesResourcesFromStatefulSets(t *testing.T) { diff --git a/pkg/controller/autoscaling/elasticsearch/status/events.go b/pkg/controller/autoscaling/elasticsearch/status/events.go index 1503fc9df7..7a38a3c8c1 100644 --- a/pkg/controller/autoscaling/elasticsearch/status/events.go +++ b/pkg/controller/autoscaling/elasticsearch/status/events.go @@ -7,9 +7,10 @@ package status import ( "strings" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) // EmitEvents emits a selected type of event on the Kubernetes cluster event channel. diff --git a/pkg/controller/autoscaling/elasticsearch/status/status.go b/pkg/controller/autoscaling/elasticsearch/status/status.go index 0e84a46745..5b5b5ec96f 100644 --- a/pkg/controller/autoscaling/elasticsearch/status/status.go +++ b/pkg/controller/autoscaling/elasticsearch/status/status.go @@ -7,9 +7,10 @@ package status import ( "encoding/json" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/autoscaling/elasticsearch/resources" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( diff --git a/pkg/controller/beat/common/config_test.go b/pkg/controller/beat/common/config_test.go index 2bfe47b1c9..fe867f1cd1 100644 --- a/pkg/controller/beat/common/config_test.go +++ b/pkg/controller/beat/common/config_test.go @@ -8,17 +8,18 @@ import ( "context" "testing" - beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/go-logr/logr" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/log" + + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func merge(cs ...*settings.CanonicalConfig) *settings.CanonicalConfig { diff --git a/pkg/controller/beat/common/health_test.go b/pkg/controller/beat/common/health_test.go index 2e5bffd316..b5fcb7143a 100644 --- a/pkg/controller/beat/common/health_test.go +++ b/pkg/controller/beat/common/health_test.go @@ -7,10 +7,11 @@ package common_test import ( "testing" + "github.com/stretchr/testify/require" + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" beatcommon "github.com/elastic/cloud-on-k8s/pkg/controller/beat/common" - "github.com/stretchr/testify/require" ) func Test_CalculateHealth(t *testing.T) { diff --git a/pkg/controller/beat/common/pod.go b/pkg/controller/beat/common/pod.go index e90382e3e2..1339d19610 100644 --- a/pkg/controller/beat/common/pod.go +++ b/pkg/controller/beat/common/pod.go @@ -8,14 +8,15 @@ import ( "fmt" "hash" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) const ( diff --git a/pkg/controller/beat/common/pod_test.go b/pkg/controller/beat/common/pod_test.go index 949093a3c4..3e4effa239 100644 --- a/pkg/controller/beat/common/pod_test.go +++ b/pkg/controller/beat/common/pod_test.go @@ -10,15 +10,16 @@ import ( "reflect" "testing" + "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/assert" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/google/go-cmp/cmp" - "github.com/stretchr/testify/assert" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func Test_buildPodTemplate(t *testing.T) { diff --git a/pkg/controller/beat/common/reconcile.go b/pkg/controller/beat/common/reconcile.go index ce0915eeff..6a2da641ed 100644 --- a/pkg/controller/beat/common/reconcile.go +++ b/pkg/controller/beat/common/reconcile.go @@ -7,13 +7,6 @@ package common import ( "context" - beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/daemonset" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/deployment" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -23,6 +16,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/daemonset" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/deployment" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" ) func reconcilePodVehicle(podTemplate corev1.PodTemplateSpec, params DriverParams) *reconciler.Results { diff --git a/pkg/controller/beat/common/reconcile_test.go b/pkg/controller/beat/common/reconcile_test.go index 41f89befa2..e842dcb65a 100644 --- a/pkg/controller/beat/common/reconcile_test.go +++ b/pkg/controller/beat/common/reconcile_test.go @@ -8,14 +8,15 @@ import ( "context" "testing" - beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/maps" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" + + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" ) func Test_reconcileDaemonSet(t *testing.T) { diff --git a/pkg/controller/beat/controller.go b/pkg/controller/beat/controller.go index 8c5e4358b0..3e821b42b2 100644 --- a/pkg/controller/beat/controller.go +++ b/pkg/controller/beat/controller.go @@ -7,6 +7,18 @@ package beat import ( "context" + "go.elastic.co/apm" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/beat/auditbeat" @@ -27,17 +39,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) const ( diff --git a/pkg/controller/common/annotation/association.go b/pkg/controller/common/annotation/association.go index 3fcc3cb6eb..81d860dea5 100644 --- a/pkg/controller/common/annotation/association.go +++ b/pkg/controller/common/annotation/association.go @@ -5,8 +5,9 @@ package annotation import ( - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" ) const ( diff --git a/pkg/controller/common/annotation/controller_version.go b/pkg/controller/common/annotation/controller_version.go index b9442f9b97..c20dbb5331 100644 --- a/pkg/controller/common/annotation/controller_version.go +++ b/pkg/controller/common/annotation/controller_version.go @@ -7,15 +7,16 @@ package annotation import ( "context" - tracing "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" "go.elastic.co/apm" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" + + tracing "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/common/annotation/controller_version_test.go b/pkg/controller/common/annotation/controller_version_test.go index 4fba5d1d24..75061f7b93 100644 --- a/pkg/controller/common/annotation/controller_version_test.go +++ b/pkg/controller/common/annotation/controller_version_test.go @@ -8,16 +8,17 @@ import ( "context" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestCheckCompatibility(t *testing.T) { diff --git a/pkg/controller/common/annotation/pod.go b/pkg/controller/common/annotation/pod.go index 21414d21aa..5c1b99af7c 100644 --- a/pkg/controller/common/annotation/pod.go +++ b/pkg/controller/common/annotation/pod.go @@ -8,11 +8,12 @@ import ( "context" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) const ( diff --git a/pkg/controller/common/annotation/pod_test.go b/pkg/controller/common/annotation/pod_test.go index 05e728fc3d..f11153ea57 100644 --- a/pkg/controller/common/annotation/pod_test.go +++ b/pkg/controller/common/annotation/pod_test.go @@ -8,11 +8,12 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestMarkPodAsUpdated(t *testing.T) { diff --git a/pkg/controller/common/association/association.go b/pkg/controller/common/association/association.go index 3616bc01b5..185fa93d32 100644 --- a/pkg/controller/common/association/association.go +++ b/pkg/controller/common/association/association.go @@ -8,12 +8,13 @@ import ( "context" "hash" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // WriteAssocsToConfigHash dereferences auth and CA secrets (if any) to include it in the configHash. diff --git a/pkg/controller/common/association/association_test.go b/pkg/controller/common/association/association_test.go index 4b4df6ba63..0c4104c1aa 100644 --- a/pkg/controller/common/association/association_test.go +++ b/pkg/controller/common/association/association_test.go @@ -8,13 +8,13 @@ import ( "crypto/sha256" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) diff --git a/pkg/controller/common/certificates/ca_reconcile.go b/pkg/controller/common/certificates/ca_reconcile.go index cfdec6469d..2f2568fc3d 100644 --- a/pkg/controller/common/certificates/ca_reconcile.go +++ b/pkg/controller/common/certificates/ca_reconcile.go @@ -13,15 +13,16 @@ import ( "fmt" "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // CAType is a type of CA diff --git a/pkg/controller/common/certificates/ca_reconcile_test.go b/pkg/controller/common/certificates/ca_reconcile_test.go index 45a524bff2..329ad4adc1 100644 --- a/pkg/controller/common/certificates/ca_reconcile_test.go +++ b/pkg/controller/common/certificates/ca_reconcile_test.go @@ -15,15 +15,16 @@ import ( "testing" "time" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/validation" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var testNamer = name.Namer{ diff --git a/pkg/controller/common/certificates/dynamic_watches.go b/pkg/controller/common/certificates/dynamic_watches.go index 28f320213d..51ad89c9b3 100644 --- a/pkg/controller/common/certificates/dynamic_watches.go +++ b/pkg/controller/common/certificates/dynamic_watches.go @@ -5,10 +5,11 @@ package certificates import ( + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "k8s.io/apimachinery/pkg/types" ) // CertificateWatchKey returns the key used by the dynamic watch registration for custom http certificates diff --git a/pkg/controller/common/certificates/http_reconcile.go b/pkg/controller/common/certificates/http_reconcile.go index e39b27cc3b..e6634de1ab 100644 --- a/pkg/controller/common/certificates/http_reconcile.go +++ b/pkg/controller/common/certificates/http_reconcile.go @@ -14,17 +14,18 @@ import ( "strings" "time" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" ) // ReconcilePublicHTTPCerts reconciles the Secret containing the HTTP Certificate currently in use, and the CA of diff --git a/pkg/controller/common/certificates/http_reconcile_test.go b/pkg/controller/common/certificates/http_reconcile_test.go index 9247746e34..844348eb23 100644 --- a/pkg/controller/common/certificates/http_reconcile_test.go +++ b/pkg/controller/common/certificates/http_reconcile_test.go @@ -15,17 +15,18 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" ) const ( diff --git a/pkg/controller/common/certificates/reconcile.go b/pkg/controller/common/certificates/reconcile.go index 2beb707eeb..dd340f9fca 100644 --- a/pkg/controller/common/certificates/reconcile.go +++ b/pkg/controller/common/certificates/reconcile.go @@ -8,6 +8,13 @@ import ( "context" "time" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" commonname "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" @@ -15,12 +22,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) var ( diff --git a/pkg/controller/common/certificates/reconcile_test.go b/pkg/controller/common/certificates/reconcile_test.go index e3a893151e..a7422fea62 100644 --- a/pkg/controller/common/certificates/reconcile_test.go +++ b/pkg/controller/common/certificates/reconcile_test.go @@ -8,16 +8,17 @@ import ( "context" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var ( diff --git a/pkg/controller/common/certificates/secret.go b/pkg/controller/common/certificates/secret.go index 57360f2613..6feeb35e9c 100644 --- a/pkg/controller/common/certificates/secret.go +++ b/pkg/controller/common/certificates/secret.go @@ -9,13 +9,14 @@ import ( "errors" "fmt" + pkgerrors "github.com/pkg/errors" + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - pkgerrors "github.com/pkg/errors" - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/controller/common/configref.go b/pkg/controller/common/configref.go index 8dffb895fd..4eb7186c14 100644 --- a/pkg/controller/common/configref.go +++ b/pkg/controller/common/configref.go @@ -8,16 +8,17 @@ import ( "context" "fmt" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" ) // ConfigRefWatchName returns the name of the watch registered on the secret referenced in `configRef`. diff --git a/pkg/controller/common/controller.go b/pkg/controller/common/controller.go index c97feeff9c..33d6d4fa1a 100644 --- a/pkg/controller/common/controller.go +++ b/pkg/controller/common/controller.go @@ -9,13 +9,14 @@ import ( "strconv" "sync/atomic" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" - logconf "github.com/elastic/cloud-on-k8s/pkg/utils/log" "go.elastic.co/apm" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" + logconf "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) // NewController creates a new controller with the given name, reconciler and parameters and registers it with the manager. diff --git a/pkg/controller/common/defaults/pod_template.go b/pkg/controller/common/defaults/pod_template.go index 8119915c51..89c89a1d25 100644 --- a/pkg/controller/common/defaults/pod_template.go +++ b/pkg/controller/common/defaults/pod_template.go @@ -7,11 +7,12 @@ package defaults import ( "sort" + corev1 "k8s.io/api/core/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - corev1 "k8s.io/api/core/v1" ) // PodDownwardEnvVars returns default environment variables created from the downward API. diff --git a/pkg/controller/common/defaults/pvc.go b/pkg/controller/common/defaults/pvc.go index b6032a53bd..8c35678c70 100644 --- a/pkg/controller/common/defaults/pvc.go +++ b/pkg/controller/common/defaults/pvc.go @@ -5,8 +5,9 @@ package defaults import ( - "github.com/elastic/cloud-on-k8s/pkg/utils/set" corev1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/utils/set" ) // AppendDefaultPVCs appends defaults PVCs to a set of existing ones. diff --git a/pkg/controller/common/defaults/service.go b/pkg/controller/common/defaults/service.go index 8a1f9cf15e..aa3c6d91f7 100644 --- a/pkg/controller/common/defaults/service.go +++ b/pkg/controller/common/defaults/service.go @@ -5,8 +5,9 @@ package defaults import ( - "github.com/elastic/cloud-on-k8s/pkg/utils/maps" v1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" ) // SetServiceDefaults updates the service with the provided defaults if they are not already set. diff --git a/pkg/controller/common/defaults/service_test.go b/pkg/controller/common/defaults/service_test.go index 20ccaa84fc..8e4c3bc4c2 100644 --- a/pkg/controller/common/defaults/service_test.go +++ b/pkg/controller/common/defaults/service_test.go @@ -7,9 +7,10 @@ package defaults import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/compare" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/elastic/cloud-on-k8s/pkg/utils/compare" ) func TestSetServiceDefaults(t *testing.T) { diff --git a/pkg/controller/common/deployment/reconcile_test.go b/pkg/controller/common/deployment/reconcile_test.go index 6a95b3581c..e53f83a9c6 100644 --- a/pkg/controller/common/deployment/reconcile_test.go +++ b/pkg/controller/common/deployment/reconcile_test.go @@ -8,15 +8,16 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + appsv1 "k8s.io/api/apps/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/stretchr/testify/require" - appsv1 "k8s.io/api/apps/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestWithTemplateHash(t *testing.T) { diff --git a/pkg/controller/common/driver/interface.go b/pkg/controller/common/driver/interface.go index ccac22bd24..39bcc8befa 100644 --- a/pkg/controller/common/driver/interface.go +++ b/pkg/controller/common/driver/interface.go @@ -5,9 +5,10 @@ package driver import ( + "k8s.io/client-go/tools/record" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "k8s.io/client-go/tools/record" ) // Interface describes attributes typically found on reconciler or 'driver' implementations. diff --git a/pkg/controller/common/expectations/deletions.go b/pkg/controller/common/expectations/deletions.go index 21e35aea78..ceaebc9870 100644 --- a/pkg/controller/common/expectations/deletions.go +++ b/pkg/controller/common/expectations/deletions.go @@ -7,10 +7,11 @@ package expectations import ( "context" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // ExpectedPodDeletions stores UID of Pods that we did delete, but whose deletion may not be diff --git a/pkg/controller/common/expectations/expectations_test.go b/pkg/controller/common/expectations/expectations_test.go index 8ce37e0a75..54078a67dc 100644 --- a/pkg/controller/common/expectations/expectations_test.go +++ b/pkg/controller/common/expectations/expectations_test.go @@ -8,9 +8,10 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/uuid" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestExpectations_Satisfied(t *testing.T) { diff --git a/pkg/controller/common/expectations/generations.go b/pkg/controller/common/expectations/generations.go index 0df51519c4..73ed7c0e08 100644 --- a/pkg/controller/common/expectations/generations.go +++ b/pkg/controller/common/expectations/generations.go @@ -7,10 +7,11 @@ package expectations import ( "context" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // ExpectedStatefulSetUpdates stores StatefulSets generations that are expected in the cache, diff --git a/pkg/controller/common/expectations/generations_test.go b/pkg/controller/common/expectations/generations_test.go index a554f2b36b..483478b9ca 100644 --- a/pkg/controller/common/expectations/generations_test.go +++ b/pkg/controller/common/expectations/generations_test.go @@ -7,14 +7,15 @@ package expectations import ( "testing" - controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/uuid" + + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func newStatefulSet(name string, uid types.UID, generation int64) appsv1.StatefulSet { diff --git a/pkg/controller/common/expectations/per_cluster_test.go b/pkg/controller/common/expectations/per_cluster_test.go index a5a91db229..d8bd376dae 100644 --- a/pkg/controller/common/expectations/per_cluster_test.go +++ b/pkg/controller/common/expectations/per_cluster_test.go @@ -8,12 +8,13 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/uuid" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestClustersExpectation(t *testing.T) { diff --git a/pkg/controller/common/finalizer/finalizers.go b/pkg/controller/common/finalizer/finalizers.go index 05cfe3e296..7093c5da57 100644 --- a/pkg/controller/common/finalizer/finalizers.go +++ b/pkg/controller/common/finalizer/finalizers.go @@ -8,9 +8,10 @@ import ( "context" "regexp" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "k8s.io/apimachinery/pkg/api/meta" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var finalizersRegExp = regexp.MustCompile(`^finalizer\.(.*)\.k8s.elastic.co\/(.*)$`) diff --git a/pkg/controller/common/finalizer/finalizers_test.go b/pkg/controller/common/finalizer/finalizers_test.go index 1340a6fbe6..3e127ffbe7 100644 --- a/pkg/controller/common/finalizer/finalizers_test.go +++ b/pkg/controller/common/finalizer/finalizers_test.go @@ -8,12 +8,13 @@ import ( "context" "testing" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestRemoveAll(t *testing.T) { diff --git a/pkg/controller/common/keystore/initcontainer.go b/pkg/controller/common/keystore/initcontainer.go index 7226eec71f..01ebc2cfb3 100644 --- a/pkg/controller/common/keystore/initcontainer.go +++ b/pkg/controller/common/keystore/initcontainer.go @@ -8,8 +8,9 @@ import ( "bytes" "text/template" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" corev1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" ) const ( diff --git a/pkg/controller/common/keystore/resources.go b/pkg/controller/common/keystore/resources.go index 16b6e07ee5..6601ce5d41 100644 --- a/pkg/controller/common/keystore/resources.go +++ b/pkg/controller/common/keystore/resources.go @@ -5,13 +5,14 @@ package keystore import ( + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" ) var log = ulog.Log.WithName("keystore") diff --git a/pkg/controller/common/keystore/resources_test.go b/pkg/controller/common/keystore/resources_test.go index dcf2debcbd..4706bf8572 100644 --- a/pkg/controller/common/keystore/resources_test.go +++ b/pkg/controller/common/keystore/resources_test.go @@ -7,17 +7,18 @@ package keystore import ( "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" - watches2 "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/magiconair/properties/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" + watches2 "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var ( diff --git a/pkg/controller/common/keystore/user_secret.go b/pkg/controller/common/keystore/user_secret.go index 03308c3874..4f4535514a 100644 --- a/pkg/controller/common/keystore/user_secret.go +++ b/pkg/controller/common/keystore/user_secret.go @@ -8,6 +8,13 @@ import ( "context" "fmt" + pkgerrors "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" @@ -16,12 +23,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - pkgerrors "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" ) const secureSettingsSecretSuffix = "secure-settings" diff --git a/pkg/controller/common/license/check.go b/pkg/controller/common/license/check.go index 7d7f5c3819..4bd988bd28 100644 --- a/pkg/controller/common/license/check.go +++ b/pkg/controller/common/license/check.go @@ -10,10 +10,11 @@ import ( "sort" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/common/license/check_test.go b/pkg/controller/common/license/check_test.go index 0361d56f4d..8b7a04e538 100644 --- a/pkg/controller/common/license/check_test.go +++ b/pkg/controller/common/license/check_test.go @@ -9,11 +9,12 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const testNS = "test-system" diff --git a/pkg/controller/common/license/crud.go b/pkg/controller/common/license/crud.go index a687fe9e53..b99fc9c92a 100644 --- a/pkg/controller/common/license/crud.go +++ b/pkg/controller/common/license/crud.go @@ -8,14 +8,15 @@ import ( "context" "encoding/json" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/maps" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" ) // EnterpriseLicensesOrErrors lists all Enterprise licenses and all errors encountered during retrieval. diff --git a/pkg/controller/common/license/crud_test.go b/pkg/controller/common/license/crud_test.go index da5ba13f16..45bfd25d50 100644 --- a/pkg/controller/common/license/crud_test.go +++ b/pkg/controller/common/license/crud_test.go @@ -8,11 +8,12 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestUpdateEnterpriseLicense(t *testing.T) { diff --git a/pkg/controller/common/license/detection.go b/pkg/controller/common/license/detection.go index 9cd90a0f1c..69464fd6e7 100644 --- a/pkg/controller/common/license/detection.go +++ b/pkg/controller/common/license/detection.go @@ -5,8 +5,9 @@ package license import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common" corev1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" ) func isLicenseType(secret corev1.Secret, licenseType OperatorLicenseType) bool { diff --git a/pkg/controller/common/license/detection_test.go b/pkg/controller/common/license/detection_test.go index 45ec933a78..c682385cc7 100644 --- a/pkg/controller/common/license/detection_test.go +++ b/pkg/controller/common/license/detection_test.go @@ -7,9 +7,10 @@ package license import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" ) func Test_isLicenseType(t *testing.T) { diff --git a/pkg/controller/common/license/fixtures_test.go b/pkg/controller/common/license/fixtures_test.go index eac9032fff..4177ea52f0 100644 --- a/pkg/controller/common/license/fixtures_test.go +++ b/pkg/controller/common/license/fixtures_test.go @@ -12,11 +12,12 @@ import ( "io/ioutil" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" ) var ( diff --git a/pkg/controller/common/license/labels.go b/pkg/controller/common/license/labels.go index b1a65f0104..39e46dd7cf 100644 --- a/pkg/controller/common/license/labels.go +++ b/pkg/controller/common/license/labels.go @@ -5,8 +5,9 @@ package license import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" ) const ( diff --git a/pkg/controller/common/license/model.go b/pkg/controller/common/license/model.go index 5d0da20738..66ca805180 100644 --- a/pkg/controller/common/license/model.go +++ b/pkg/controller/common/license/model.go @@ -7,8 +7,9 @@ package license import ( "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" pkgerrors "github.com/pkg/errors" + + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) // OperatorLicenseType is the type of operator level license a resource is describing. diff --git a/pkg/controller/common/license/model_test.go b/pkg/controller/common/license/model_test.go index 6c3988ca17..374bbc2927 100644 --- a/pkg/controller/common/license/model_test.go +++ b/pkg/controller/common/license/model_test.go @@ -10,11 +10,12 @@ import ( "testing" "time" + "github.com/go-test/deep" + "github.com/stretchr/testify/require" + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" - "github.com/go-test/deep" - "github.com/stretchr/testify/require" ) func TestLicense_IsValidAt(t *testing.T) { diff --git a/pkg/controller/common/license/trial.go b/pkg/controller/common/license/trial.go index 609db9f989..52b39c7060 100644 --- a/pkg/controller/common/license/trial.go +++ b/pkg/controller/common/license/trial.go @@ -12,12 +12,13 @@ import ( "fmt" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/uuid" + + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" ) const ( diff --git a/pkg/controller/common/license/verifier_test.go b/pkg/controller/common/license/verifier_test.go index 3c82202335..ba023ac148 100644 --- a/pkg/controller/common/license/verifier_test.go +++ b/pkg/controller/common/license/verifier_test.go @@ -14,10 +14,10 @@ import ( "time" "github.com/go-test/deep" - - "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" ) func TestLicenseVerifier_ValidSignature(t *testing.T) { diff --git a/pkg/controller/common/name/name.go b/pkg/controller/common/name/name.go index ff463fe587..1eb3deef4a 100644 --- a/pkg/controller/common/name/name.go +++ b/pkg/controller/common/name/name.go @@ -9,10 +9,11 @@ import ( "strings" "unicode/utf8" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "github.com/hashicorp/go-multierror" "k8s.io/apimachinery/pkg/util/validation" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) const ( diff --git a/pkg/controller/common/reconciler/reconciler.go b/pkg/controller/common/reconciler/reconciler.go index 3d43fe5ead..31270ca0f1 100644 --- a/pkg/controller/common/reconciler/reconciler.go +++ b/pkg/controller/common/reconciler/reconciler.go @@ -9,8 +9,6 @@ import ( "fmt" "reflect" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -19,6 +17,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/controller/common/reconciler/reconciler_test.go b/pkg/controller/common/reconciler/reconciler_test.go index 303f84e834..926f48bd07 100644 --- a/pkg/controller/common/reconciler/reconciler_test.go +++ b/pkg/controller/common/reconciler/reconciler_test.go @@ -9,8 +9,6 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" @@ -20,6 +18,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func withoutControllerRef(obj runtime.Object) runtime.Object { diff --git a/pkg/controller/common/reconciler/results.go b/pkg/controller/common/reconciler/results.go index 27b01c384a..f0ca0df3bd 100644 --- a/pkg/controller/common/reconciler/results.go +++ b/pkg/controller/common/reconciler/results.go @@ -7,10 +7,11 @@ package reconciler import ( "context" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "go.elastic.co/apm" k8serrors "k8s.io/apimachinery/pkg/util/errors" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" ) type resultKind int diff --git a/pkg/controller/common/reconciler/secret.go b/pkg/controller/common/reconciler/secret.go index 32490f2c09..bfd46bab9d 100644 --- a/pkg/controller/common/reconciler/secret.go +++ b/pkg/controller/common/reconciler/secret.go @@ -8,14 +8,15 @@ import ( "context" "reflect" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/maps" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" ) // labels set on secrets which cannot rely on owner references due to https://github.com/kubernetes/kubernetes/issues/65200, diff --git a/pkg/controller/common/reconciler/secret_test.go b/pkg/controller/common/reconciler/secret_test.go index 79be8d6f16..4dbc6dcba1 100644 --- a/pkg/controller/common/reconciler/secret_test.go +++ b/pkg/controller/common/reconciler/secret_test.go @@ -9,9 +9,6 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/maps" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -20,6 +17,10 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" ) const ( diff --git a/pkg/controller/common/scheme/scheme.go b/pkg/controller/common/scheme/scheme.go index 4b810bae7b..8e170a3c6a 100644 --- a/pkg/controller/common/scheme/scheme.go +++ b/pkg/controller/common/scheme/scheme.go @@ -7,6 +7,9 @@ package scheme import ( "sync" + "k8s.io/apimachinery/pkg/runtime" + clientgoscheme "k8s.io/client-go/kubernetes/scheme" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" apmv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1beta1" @@ -20,8 +23,6 @@ import ( kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" kbv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1beta1" emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" - "k8s.io/apimachinery/pkg/runtime" - clientgoscheme "k8s.io/client-go/kubernetes/scheme" ) var addToScheme sync.Once diff --git a/pkg/controller/common/service_control.go b/pkg/controller/common/service_control.go index 41b84f211c..22a12675ef 100644 --- a/pkg/controller/common/service_control.go +++ b/pkg/controller/common/service_control.go @@ -9,15 +9,16 @@ import ( "net" "reflect" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "github.com/elastic/cloud-on-k8s/pkg/utils/compare" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) var log = ulog.Log.WithName("common") diff --git a/pkg/controller/common/service_control_test.go b/pkg/controller/common/service_control_test.go index 8b06f3780d..39dafc8a70 100644 --- a/pkg/controller/common/service_control_test.go +++ b/pkg/controller/common/service_control_test.go @@ -8,14 +8,15 @@ import ( "context" "testing" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/utils/compare" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" + + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/utils/compare" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestReconcileService(t *testing.T) { diff --git a/pkg/controller/common/stackmon/config.go b/pkg/controller/common/stackmon/config.go index 34d8f496cb..26926f6c31 100644 --- a/pkg/controller/common/stackmon/config.go +++ b/pkg/controller/common/stackmon/config.go @@ -12,7 +12,6 @@ import ( "path/filepath" "text/template" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,6 +22,7 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" diff --git a/pkg/controller/common/stackmon/config_test.go b/pkg/controller/common/stackmon/config_test.go index a2c907092a..0aedbbb74f 100644 --- a/pkg/controller/common/stackmon/config_test.go +++ b/pkg/controller/common/stackmon/config_test.go @@ -7,12 +7,13 @@ package stackmon import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestBuildMetricbeatBaseConfig(t *testing.T) { diff --git a/pkg/controller/common/stackmon/monitoring/monitoring_test.go b/pkg/controller/common/stackmon/monitoring/monitoring_test.go index f7914a9646..cc8bcfe54b 100644 --- a/pkg/controller/common/stackmon/monitoring/monitoring_test.go +++ b/pkg/controller/common/stackmon/monitoring/monitoring_test.go @@ -7,9 +7,10 @@ package monitoring import ( "testing" + "github.com/stretchr/testify/assert" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/stretchr/testify/assert" ) var ( diff --git a/pkg/controller/common/stackmon/name_test.go b/pkg/controller/common/stackmon/name_test.go index 2a1b0e072a..3f7a6e47d4 100644 --- a/pkg/controller/common/stackmon/name_test.go +++ b/pkg/controller/common/stackmon/name_test.go @@ -7,11 +7,12 @@ package stackmon import ( "testing" + "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" - "github.com/stretchr/testify/assert" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestConfigVolumeName(t *testing.T) { diff --git a/pkg/controller/common/stackmon/sidecar.go b/pkg/controller/common/stackmon/sidecar.go index cc5732207d..d6b341c484 100644 --- a/pkg/controller/common/stackmon/sidecar.go +++ b/pkg/controller/common/stackmon/sidecar.go @@ -7,7 +7,6 @@ package stackmon import ( "hash" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" @@ -15,6 +14,7 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) diff --git a/pkg/controller/common/stackmon/validations/validations.go b/pkg/controller/common/stackmon/validations/validations.go index c0055e1a82..01a9052a51 100644 --- a/pkg/controller/common/stackmon/validations/validations.go +++ b/pkg/controller/common/stackmon/validations/validations.go @@ -8,9 +8,10 @@ import ( "fmt" "github.com/blang/semver/v4" + "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "k8s.io/apimachinery/pkg/util/validation/field" ) const ( diff --git a/pkg/controller/common/status.go b/pkg/controller/common/status.go index d30784ae66..c84bd42c8b 100644 --- a/pkg/controller/common/status.go +++ b/pkg/controller/common/status.go @@ -7,15 +7,16 @@ package common import ( "context" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // DeploymentStatus returns a DeploymentStatus computed from the given args. diff --git a/pkg/controller/common/status_test.go b/pkg/controller/common/status_test.go index 73ed914166..293a135fba 100644 --- a/pkg/controller/common/status_test.go +++ b/pkg/controller/common/status_test.go @@ -10,14 +10,15 @@ import ( "reflect" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_workaroundStatusUpdateError(t *testing.T) { diff --git a/pkg/controller/common/tracing/tracer.go b/pkg/controller/common/tracing/tracer.go index 8915f5ea5c..ae54d8ee66 100644 --- a/pkg/controller/common/tracing/tracer.go +++ b/pkg/controller/common/tracing/tracer.go @@ -5,9 +5,10 @@ package tracing import ( + "go.elastic.co/apm" + "github.com/elastic/cloud-on-k8s/pkg/about" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" ) var ( diff --git a/pkg/controller/common/volume/downward_api.go b/pkg/controller/common/volume/downward_api.go index ea9295ce62..ab92bfd06f 100644 --- a/pkg/controller/common/volume/downward_api.go +++ b/pkg/controller/common/volume/downward_api.go @@ -5,8 +5,9 @@ package volume import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" corev1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) var downwardAPIVolume = corev1.Volume{ diff --git a/pkg/controller/common/watches/handler.go b/pkg/controller/common/watches/handler.go index 712aafd53d..1080528bfe 100644 --- a/pkg/controller/common/watches/handler.go +++ b/pkg/controller/common/watches/handler.go @@ -7,13 +7,14 @@ package watches import ( "sync" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/runtime/inject" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/pkg/controller/common/watches/handler_test.go b/pkg/controller/common/watches/handler_test.go index 81dfa94e35..b2ebf2e7af 100644 --- a/pkg/controller/common/watches/handler_test.go +++ b/pkg/controller/common/watches/handler_test.go @@ -7,7 +7,6 @@ package watches import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" @@ -21,6 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) type fakeHandler struct { diff --git a/pkg/controller/common/watches/secrets.go b/pkg/controller/common/watches/secrets.go index f68d2960bf..e6664ed1e3 100644 --- a/pkg/controller/common/watches/secrets.go +++ b/pkg/controller/common/watches/secrets.go @@ -5,7 +5,6 @@ package watches import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" @@ -13,6 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" ) // WatchUserProvidedSecrets registers a watch for user-provided secrets. diff --git a/pkg/controller/common/watches/secrets_test.go b/pkg/controller/common/watches/secrets_test.go index af9791e2da..9b82ab5670 100644 --- a/pkg/controller/common/watches/secrets_test.go +++ b/pkg/controller/common/watches/secrets_test.go @@ -7,14 +7,15 @@ package watches import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" ) func Test_reconcileReqForSoftOwner(t *testing.T) { diff --git a/pkg/controller/elasticsearch/bootstrap/bootstrap.go b/pkg/controller/elasticsearch/bootstrap/bootstrap.go index 3a8672e4c2..58ef96be2d 100644 --- a/pkg/controller/elasticsearch/bootstrap/bootstrap.go +++ b/pkg/controller/elasticsearch/bootstrap/bootstrap.go @@ -7,12 +7,13 @@ package bootstrap import ( "context" + "go.elastic.co/apm" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" ) var log = ulog.Log.WithName("elasticsearch-uuid") diff --git a/pkg/controller/elasticsearch/bootstrap/bootstrap_test.go b/pkg/controller/elasticsearch/bootstrap/bootstrap_test.go index 16ae050432..df1971ee6e 100644 --- a/pkg/controller/elasticsearch/bootstrap/bootstrap_test.go +++ b/pkg/controller/elasticsearch/bootstrap/bootstrap_test.go @@ -9,11 +9,12 @@ import ( "errors" "testing" + "github.com/stretchr/testify/require" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func bootstrappedES() *esv1.Elasticsearch { diff --git a/pkg/controller/elasticsearch/certificates/reconcile.go b/pkg/controller/elasticsearch/certificates/reconcile.go index c782c0890a..12c8dc356f 100644 --- a/pkg/controller/elasticsearch/certificates/reconcile.go +++ b/pkg/controller/elasticsearch/certificates/reconcile.go @@ -9,6 +9,10 @@ import ( "crypto/x509" "time" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" @@ -21,9 +25,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) type CertificateResources struct { diff --git a/pkg/controller/elasticsearch/certificates/remoteca/reconcile.go b/pkg/controller/elasticsearch/certificates/remoteca/reconcile.go index 81418dfe0a..0e290e8503 100644 --- a/pkg/controller/elasticsearch/certificates/remoteca/reconcile.go +++ b/pkg/controller/elasticsearch/certificates/remoteca/reconcile.go @@ -9,15 +9,16 @@ import ( "context" "sort" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) const ( diff --git a/pkg/controller/elasticsearch/certificates/remoteca/reconcile_test.go b/pkg/controller/elasticsearch/certificates/remoteca/reconcile_test.go index 1bd8bd2617..076fba242a 100644 --- a/pkg/controller/elasticsearch/certificates/remoteca/reconcile_test.go +++ b/pkg/controller/elasticsearch/certificates/remoteca/reconcile_test.go @@ -8,16 +8,17 @@ import ( "context" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestReconcile(t *testing.T) { diff --git a/pkg/controller/elasticsearch/certificates/transport/ca.go b/pkg/controller/elasticsearch/certificates/transport/ca.go index 7b7311002f..e77f1caada 100644 --- a/pkg/controller/elasticsearch/certificates/transport/ca.go +++ b/pkg/controller/elasticsearch/certificates/transport/ca.go @@ -7,15 +7,16 @@ package transport import ( "context" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) func CustomTransportCertsWatchKey(es types.NamespacedName) string { diff --git a/pkg/controller/elasticsearch/certificates/transport/csr.go b/pkg/controller/elasticsearch/certificates/transport/csr.go index a221872d9d..ea9e01a269 100644 --- a/pkg/controller/elasticsearch/certificates/transport/csr.go +++ b/pkg/controller/elasticsearch/certificates/transport/csr.go @@ -11,13 +11,14 @@ import ( "net" "time" + "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" ) // createValidatedCertificateTemplate validates a CSR and creates a certificate template. diff --git a/pkg/controller/elasticsearch/certificates/transport/csr_test.go b/pkg/controller/elasticsearch/certificates/transport/csr_test.go index d699f7f9d5..47da0447e8 100644 --- a/pkg/controller/elasticsearch/certificates/transport/csr_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/csr_test.go @@ -9,12 +9,13 @@ import ( "net" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" ) // roundTripSerialize does a serialization round-trip of the certificate in order to make sure any extra extensions diff --git a/pkg/controller/elasticsearch/certificates/transport/pod_secret.go b/pkg/controller/elasticsearch/certificates/transport/pod_secret.go index 1072ea8276..d5c0114d0c 100644 --- a/pkg/controller/elasticsearch/certificates/transport/pod_secret.go +++ b/pkg/controller/elasticsearch/certificates/transport/pod_secret.go @@ -13,9 +13,10 @@ import ( "reflect" "time" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - corev1 "k8s.io/api/core/v1" ) // PodKeyFileName returns the name of the private key entry for a specific pod in a transport certificates secret. diff --git a/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go b/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go index bd0040d0f3..73edd096b5 100644 --- a/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go @@ -14,16 +14,17 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" ) func TestReconcileTransportCertsPublicSecret(t *testing.T) { diff --git a/pkg/controller/elasticsearch/certificates/transport/reconcile.go b/pkg/controller/elasticsearch/certificates/transport/reconcile.go index 2ef2e909f5..4f7a0c809a 100644 --- a/pkg/controller/elasticsearch/certificates/transport/reconcile.go +++ b/pkg/controller/elasticsearch/certificates/transport/reconcile.go @@ -11,6 +11,12 @@ import ( "strings" "time" + "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" @@ -21,11 +27,6 @@ import ( ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" "github.com/elastic/cloud-on-k8s/pkg/utils/set" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) var log = ulog.Log.WithName("transport") diff --git a/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go b/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go index 3db1f058e3..f796611dcb 100644 --- a/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go @@ -9,12 +9,6 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -22,6 +16,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestReconcileTransportCertificatesSecrets(t *testing.T) { diff --git a/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go b/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go index 0fefd95303..7b972c5683 100644 --- a/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go @@ -12,14 +12,15 @@ import ( "encoding/pem" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" ) const ( diff --git a/pkg/controller/elasticsearch/cleanup/resources.go b/pkg/controller/elasticsearch/cleanup/resources.go index 8c390ee981..ab4ab2d37c 100644 --- a/pkg/controller/elasticsearch/cleanup/resources.go +++ b/pkg/controller/elasticsearch/cleanup/resources.go @@ -8,11 +8,6 @@ import ( "context" "time" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "go.elastic.co/apm" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -20,6 +15,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var log = ulog.Log.WithName("cleanup") diff --git a/pkg/controller/elasticsearch/cleanup/resources_test.go b/pkg/controller/elasticsearch/cleanup/resources_test.go index 09a617a697..ccdb6ba2e6 100644 --- a/pkg/controller/elasticsearch/cleanup/resources_test.go +++ b/pkg/controller/elasticsearch/cleanup/resources_test.go @@ -9,12 +9,13 @@ import ( "testing" "time" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestIsTooYoungForGC(t *testing.T) { diff --git a/pkg/controller/elasticsearch/client/autoscaling_test.go b/pkg/controller/elasticsearch/client/autoscaling_test.go index 9672153022..9483ad7dd7 100644 --- a/pkg/controller/elasticsearch/client/autoscaling_test.go +++ b/pkg/controller/elasticsearch/client/autoscaling_test.go @@ -13,11 +13,12 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" . "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestClient_CreateAutoscalingPolicy(t *testing.T) { diff --git a/pkg/controller/elasticsearch/client/base.go b/pkg/controller/elasticsearch/client/base.go index 100db23df5..0f821596b6 100644 --- a/pkg/controller/elasticsearch/client/base.go +++ b/pkg/controller/elasticsearch/client/base.go @@ -12,11 +12,12 @@ import ( "io" "net/http" + "github.com/hashicorp/go-multierror" + "k8s.io/apimachinery/pkg/types" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - "github.com/hashicorp/go-multierror" - "k8s.io/apimachinery/pkg/types" ) var log = ulog.Log.WithName("elasticsearch-client") diff --git a/pkg/controller/elasticsearch/client/client.go b/pkg/controller/elasticsearch/client/client.go index e8e6461d80..b33fa321d9 100644 --- a/pkg/controller/elasticsearch/client/client.go +++ b/pkg/controller/elasticsearch/client/client.go @@ -12,12 +12,13 @@ import ( "net/http" "time" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/net" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/controller/elasticsearch/client/client_test.go b/pkg/controller/elasticsearch/client/client_test.go index f2776a1f8d..8f546acb6e 100644 --- a/pkg/controller/elasticsearch/client/client_test.go +++ b/pkg/controller/elasticsearch/client/client_test.go @@ -19,15 +19,16 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" fixtures "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client/test_fixtures" "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) func TestParseShards(t *testing.T) { diff --git a/pkg/controller/elasticsearch/client/license_test.go b/pkg/controller/elasticsearch/client/license_test.go index 28391457ef..7ed58caf77 100644 --- a/pkg/controller/elasticsearch/client/license_test.go +++ b/pkg/controller/elasticsearch/client/license_test.go @@ -12,10 +12,11 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - fixtures "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client/test_fixtures" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + fixtures "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client/test_fixtures" ) func TestClient_GetLicense(t *testing.T) { diff --git a/pkg/controller/elasticsearch/client/model.go b/pkg/controller/elasticsearch/client/model.go index ea8259c838..db0298bfc6 100644 --- a/pkg/controller/elasticsearch/client/model.go +++ b/pkg/controller/elasticsearch/client/model.go @@ -10,10 +10,11 @@ import ( "strings" "time" + "github.com/pkg/errors" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - "github.com/pkg/errors" ) // Info represents the response from / diff --git a/pkg/controller/elasticsearch/client/v6.go b/pkg/controller/elasticsearch/client/v6.go index 5c1933e513..a1feb25eaa 100644 --- a/pkg/controller/elasticsearch/client/v6.go +++ b/pkg/controller/elasticsearch/client/v6.go @@ -9,9 +9,10 @@ import ( "net/http" "net/url" + "github.com/pkg/errors" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - "github.com/pkg/errors" ) var errNotSupportedInEs6x = errors.New("not supported in Elasticsearch 6.x") diff --git a/pkg/controller/elasticsearch/client/v7.go b/pkg/controller/elasticsearch/client/v7.go index 47743da705..70dea1625c 100644 --- a/pkg/controller/elasticsearch/client/v7.go +++ b/pkg/controller/elasticsearch/client/v7.go @@ -10,8 +10,9 @@ import ( "strconv" "strings" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/pkg/errors" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) type clientV7 struct { diff --git a/pkg/controller/elasticsearch/configmap/configmap.go b/pkg/controller/elasticsearch/configmap/configmap.go index f4b87945d2..11ce93acf0 100644 --- a/pkg/controller/elasticsearch/configmap/configmap.go +++ b/pkg/controller/elasticsearch/configmap/configmap.go @@ -7,13 +7,13 @@ package configmap import ( "context" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "go.elastic.co/apm" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/initcontainer" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" diff --git a/pkg/controller/elasticsearch/driver/downscale.go b/pkg/controller/elasticsearch/driver/downscale.go index f9c599949e..7ffc695e0b 100644 --- a/pkg/controller/elasticsearch/driver/downscale.go +++ b/pkg/controller/elasticsearch/driver/downscale.go @@ -7,6 +7,10 @@ package driver import ( "context" + appsv1 "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" @@ -21,9 +25,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen2" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - appsv1 "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" ) // HandleDownscale attempts to downscale actual StatefulSets towards expected ones. diff --git a/pkg/controller/elasticsearch/driver/downscale_invariants_test.go b/pkg/controller/elasticsearch/driver/downscale_invariants_test.go index fba1d279ad..f6af026f86 100644 --- a/pkg/controller/elasticsearch/driver/downscale_invariants_test.go +++ b/pkg/controller/elasticsearch/driver/downscale_invariants_test.go @@ -8,15 +8,16 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" ) func Test_newDownscaleState(t *testing.T) { diff --git a/pkg/controller/elasticsearch/driver/downscale_test.go b/pkg/controller/elasticsearch/driver/downscale_test.go index 7c96f4356f..986b750160 100644 --- a/pkg/controller/elasticsearch/driver/downscale_test.go +++ b/pkg/controller/elasticsearch/driver/downscale_test.go @@ -9,6 +9,13 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" @@ -23,12 +30,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/stretchr/testify/require" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" ) // Sample StatefulSets to use in tests diff --git a/pkg/controller/elasticsearch/driver/downscale_utils.go b/pkg/controller/elasticsearch/driver/downscale_utils.go index 79d098baac..3ead3f4a09 100644 --- a/pkg/controller/elasticsearch/driver/downscale_utils.go +++ b/pkg/controller/elasticsearch/driver/downscale_utils.go @@ -7,6 +7,8 @@ package driver import ( "context" + appsv1 "k8s.io/api/apps/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" @@ -14,7 +16,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - appsv1 "k8s.io/api/apps/v1" ) // downscaleContext holds the context of this downscale, including clients and states, diff --git a/pkg/controller/elasticsearch/driver/expectations_test.go b/pkg/controller/elasticsearch/driver/expectations_test.go index f3bbcd8e04..a1449ffb09 100644 --- a/pkg/controller/elasticsearch/driver/expectations_test.go +++ b/pkg/controller/elasticsearch/driver/expectations_test.go @@ -8,13 +8,14 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/stretchr/testify/require" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func Test_defaultDriver_expectationSatisfied(t *testing.T) { diff --git a/pkg/controller/elasticsearch/driver/fixtures.go b/pkg/controller/elasticsearch/driver/fixtures.go index f1b635ccbe..0f54e0dea5 100644 --- a/pkg/controller/elasticsearch/driver/fixtures.go +++ b/pkg/controller/elasticsearch/driver/fixtures.go @@ -5,7 +5,6 @@ package driver import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -13,6 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" diff --git a/pkg/controller/elasticsearch/driver/log.go b/pkg/controller/elasticsearch/driver/log.go index cb9df18a1e..da60645a9c 100644 --- a/pkg/controller/elasticsearch/driver/log.go +++ b/pkg/controller/elasticsearch/driver/log.go @@ -5,9 +5,10 @@ package driver import ( - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var log = ulog.Log.WithName("driver") diff --git a/pkg/controller/elasticsearch/driver/nodes.go b/pkg/controller/elasticsearch/driver/nodes.go index cdacfa7517..e66b4ee834 100644 --- a/pkg/controller/elasticsearch/driver/nodes.go +++ b/pkg/controller/elasticsearch/driver/nodes.go @@ -9,6 +9,10 @@ import ( "errors" "fmt" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" @@ -23,9 +27,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen2" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" ) func (d *defaultDriver) reconcileNodeSpecs( diff --git a/pkg/controller/elasticsearch/driver/pvc_expansion.go b/pkg/controller/elasticsearch/driver/pvc_expansion.go index 3194650788..805389789d 100644 --- a/pkg/controller/elasticsearch/driver/pvc_expansion.go +++ b/pkg/controller/elasticsearch/driver/pvc_expansion.go @@ -9,10 +9,6 @@ import ( "encoding/json" "strings" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/validation" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -20,6 +16,11 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/validation" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/elasticsearch/driver/pvc_expansion_test.go b/pkg/controller/elasticsearch/driver/pvc_expansion_test.go index 4db806e011..c0ecc4969b 100644 --- a/pkg/controller/elasticsearch/driver/pvc_expansion_test.go +++ b/pkg/controller/elasticsearch/driver/pvc_expansion_test.go @@ -10,11 +10,6 @@ import ( "fmt" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -25,6 +20,12 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var ( diff --git a/pkg/controller/elasticsearch/driver/pvc_gc.go b/pkg/controller/elasticsearch/driver/pvc_gc.go index 728b8aabba..340afe3b5c 100644 --- a/pkg/controller/elasticsearch/driver/pvc_gc.go +++ b/pkg/controller/elasticsearch/driver/pvc_gc.go @@ -7,13 +7,14 @@ package driver import ( "context" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) // GarbageCollectPVCs ensures PersistentVolumeClaims created for the given es resource are deleted diff --git a/pkg/controller/elasticsearch/driver/pvc_gc_test.go b/pkg/controller/elasticsearch/driver/pvc_gc_test.go index aeff76aef1..33e7b78271 100644 --- a/pkg/controller/elasticsearch/driver/pvc_gc_test.go +++ b/pkg/controller/elasticsearch/driver/pvc_gc_test.go @@ -9,15 +9,16 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func buildSsetWithClaims(name string, replicas int32, claims ...string) appsv1.StatefulSet { diff --git a/pkg/controller/elasticsearch/driver/pvc_owner.go b/pkg/controller/elasticsearch/driver/pvc_owner.go index 4112580507..d62a2d5d2a 100644 --- a/pkg/controller/elasticsearch/driver/pvc_owner.go +++ b/pkg/controller/elasticsearch/driver/pvc_owner.go @@ -8,13 +8,14 @@ import ( "context" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // reconcilePVCOwnerRefs sets or removes an owner reference into each PVC for the given Elasticsearch cluster depending diff --git a/pkg/controller/elasticsearch/driver/pvc_owner_test.go b/pkg/controller/elasticsearch/driver/pvc_owner_test.go index 46f3c38d8c..233f1b02b9 100644 --- a/pkg/controller/elasticsearch/driver/pvc_owner_test.go +++ b/pkg/controller/elasticsearch/driver/pvc_owner_test.go @@ -8,13 +8,14 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func Test_reconcilePVCOwnerRefs(t *testing.T) { diff --git a/pkg/controller/elasticsearch/driver/suspend.go b/pkg/controller/elasticsearch/driver/suspend.go index a56ace42b5..96c3097476 100644 --- a/pkg/controller/elasticsearch/driver/suspend.go +++ b/pkg/controller/elasticsearch/driver/suspend.go @@ -7,14 +7,15 @@ package driver import ( "context" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/initcontainer" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) // reconcileSuspendedPods implements the operator side of activating the Pod suspension mechanism: diff --git a/pkg/controller/elasticsearch/driver/upgrade_forced.go b/pkg/controller/elasticsearch/driver/upgrade_forced.go index ce204fd40a..5662daff9d 100644 --- a/pkg/controller/elasticsearch/driver/upgrade_forced.go +++ b/pkg/controller/elasticsearch/driver/upgrade_forced.go @@ -5,12 +5,13 @@ package driver import ( + pkgerrors "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - pkgerrors "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" ) func (d *defaultDriver) MaybeForceUpgrade(statefulSets sset.StatefulSetList) (bool, error) { diff --git a/pkg/controller/elasticsearch/driver/upgrade_forced_test.go b/pkg/controller/elasticsearch/driver/upgrade_forced_test.go index 326ef9e22f..b32355b465 100644 --- a/pkg/controller/elasticsearch/driver/upgrade_forced_test.go +++ b/pkg/controller/elasticsearch/driver/upgrade_forced_test.go @@ -8,12 +8,13 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_defaultDriver_maybeForceUpgradePods(t *testing.T) { diff --git a/pkg/controller/elasticsearch/driver/upgrade_pods_deletion.go b/pkg/controller/elasticsearch/driver/upgrade_pods_deletion.go index 1b3122e370..b6c3cec994 100644 --- a/pkg/controller/elasticsearch/driver/upgrade_pods_deletion.go +++ b/pkg/controller/elasticsearch/driver/upgrade_pods_deletion.go @@ -8,14 +8,15 @@ import ( "context" "sort" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) // Delete runs through a list of potential candidates and select the ones that can be deleted. diff --git a/pkg/controller/elasticsearch/driver/upgrade_predicates.go b/pkg/controller/elasticsearch/driver/upgrade_predicates.go index d6983cbfb5..b4ef957372 100644 --- a/pkg/controller/elasticsearch/driver/upgrade_predicates.go +++ b/pkg/controller/elasticsearch/driver/upgrade_predicates.go @@ -7,11 +7,12 @@ package driver import ( "context" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - corev1 "k8s.io/api/core/v1" ) type PredicateContext struct { diff --git a/pkg/controller/elasticsearch/driver/upgrade_predicates_test.go b/pkg/controller/elasticsearch/driver/upgrade_predicates_test.go index da3800cfbd..27135198f3 100644 --- a/pkg/controller/elasticsearch/driver/upgrade_predicates_test.go +++ b/pkg/controller/elasticsearch/driver/upgrade_predicates_test.go @@ -9,14 +9,15 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/migration" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) // These tests are focused on "type changes", i.e. when the type of a nodeSet is changed. diff --git a/pkg/controller/elasticsearch/driver/upscale.go b/pkg/controller/elasticsearch/driver/upscale.go index 69972cfac8..556c2499f9 100644 --- a/pkg/controller/elasticsearch/driver/upscale.go +++ b/pkg/controller/elasticsearch/driver/upscale.go @@ -8,6 +8,8 @@ import ( "context" "fmt" + appsv1 "k8s.io/api/apps/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" @@ -18,7 +20,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen2" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - appsv1 "k8s.io/api/apps/v1" ) type upscaleCtx struct { diff --git a/pkg/controller/elasticsearch/driver/upscale_state.go b/pkg/controller/elasticsearch/driver/upscale_state.go index f2fdde7136..943bbd1fa8 100644 --- a/pkg/controller/elasticsearch/driver/upscale_state.go +++ b/pkg/controller/elasticsearch/driver/upscale_state.go @@ -7,14 +7,15 @@ package driver import ( "sync" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/bootstrap" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" ) type upscaleState struct { diff --git a/pkg/controller/elasticsearch/driver/upscale_state_test.go b/pkg/controller/elasticsearch/driver/upscale_state_test.go index 142ba61677..fa1b7e8a5c 100644 --- a/pkg/controller/elasticsearch/driver/upscale_state_test.go +++ b/pkg/controller/elasticsearch/driver/upscale_state_test.go @@ -8,16 +8,17 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/bootstrap" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/stretchr/testify/require" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func Test_upscaleState_limitNodesCreation(t *testing.T) { diff --git a/pkg/controller/elasticsearch/driver/upscale_test.go b/pkg/controller/elasticsearch/driver/upscale_test.go index b9988aca71..5592a2e9d0 100644 --- a/pkg/controller/elasticsearch/driver/upscale_test.go +++ b/pkg/controller/elasticsearch/driver/upscale_test.go @@ -9,6 +9,16 @@ import ( "sync" "testing" + "github.com/go-test/deep" + "github.com/stretchr/testify/require" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + storagev1 "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" @@ -20,15 +30,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/go-test/deep" - "github.com/stretchr/testify/require" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - storagev1 "k8s.io/api/storage/v1" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/types" ) var onceDone = &sync.Once{} diff --git a/pkg/controller/elasticsearch/driver/version_test.go b/pkg/controller/elasticsearch/driver/version_test.go index 050c0305a9..031c14f4f4 100644 --- a/pkg/controller/elasticsearch/driver/version_test.go +++ b/pkg/controller/elasticsearch/driver/version_test.go @@ -7,10 +7,11 @@ package driver import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" ) var ( diff --git a/pkg/controller/elasticsearch/elasticsearch_controller.go b/pkg/controller/elasticsearch/elasticsearch_controller.go index 2d20a803c0..610b6da51a 100644 --- a/pkg/controller/elasticsearch/elasticsearch_controller.go +++ b/pkg/controller/elasticsearch/elasticsearch_controller.go @@ -8,6 +8,19 @@ import ( "context" "sync/atomic" + pkgerrors "github.com/pkg/errors" + "go.elastic.co/apm" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -33,18 +46,6 @@ import ( esversion "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - pkgerrors "github.com/pkg/errors" - "go.elastic.co/apm" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) const name = "elasticsearch-controller" diff --git a/pkg/controller/elasticsearch/initcontainer/initcontainer.go b/pkg/controller/elasticsearch/initcontainer/initcontainer.go index 5b067271db..d4e5483f26 100644 --- a/pkg/controller/elasticsearch/initcontainer/initcontainer.go +++ b/pkg/controller/elasticsearch/initcontainer/initcontainer.go @@ -5,9 +5,10 @@ package initcontainer import ( + corev1 "k8s.io/api/core/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" - corev1 "k8s.io/api/core/v1" ) const ( diff --git a/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go b/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go index ca6cc2197b..ed7058bccf 100644 --- a/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go +++ b/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go @@ -7,9 +7,10 @@ package initcontainer import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" - "github.com/stretchr/testify/assert" ) func TestNewInitContainers(t *testing.T) { diff --git a/pkg/controller/elasticsearch/initcontainer/keystore.go b/pkg/controller/elasticsearch/initcontainer/keystore.go index af68c71607..0fb0bc6854 100644 --- a/pkg/controller/elasticsearch/initcontainer/keystore.go +++ b/pkg/controller/elasticsearch/initcontainer/keystore.go @@ -5,10 +5,11 @@ package initcontainer import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" - esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) const ( diff --git a/pkg/controller/elasticsearch/initcontainer/prepare_fs.go b/pkg/controller/elasticsearch/initcontainer/prepare_fs.go index bb4145cb1a..999e44d7ee 100644 --- a/pkg/controller/elasticsearch/initcontainer/prepare_fs.go +++ b/pkg/controller/elasticsearch/initcontainer/prepare_fs.go @@ -7,6 +7,9 @@ package initcontainer import ( "path" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" @@ -14,8 +17,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) const ( diff --git a/pkg/controller/elasticsearch/initcontainer/suspend.go b/pkg/controller/elasticsearch/initcontainer/suspend.go index b51543b594..93f15565e0 100644 --- a/pkg/controller/elasticsearch/initcontainer/suspend.go +++ b/pkg/controller/elasticsearch/initcontainer/suspend.go @@ -9,10 +9,11 @@ import ( "path" "strings" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - corev1 "k8s.io/api/core/v1" ) const ( diff --git a/pkg/controller/elasticsearch/initcontainer/suspend_test.go b/pkg/controller/elasticsearch/initcontainer/suspend_test.go index 1112fa6e19..0d4eb37532 100644 --- a/pkg/controller/elasticsearch/initcontainer/suspend_test.go +++ b/pkg/controller/elasticsearch/initcontainer/suspend_test.go @@ -7,8 +7,9 @@ package initcontainer import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) func TestRenderSuspendConfiguration(t *testing.T) { diff --git a/pkg/controller/elasticsearch/label/label.go b/pkg/controller/elasticsearch/label/label.go index 8fcf51c2a6..f57b67df7e 100644 --- a/pkg/controller/elasticsearch/label/label.go +++ b/pkg/controller/elasticsearch/label/label.go @@ -5,14 +5,15 @@ package label import ( - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) const ( diff --git a/pkg/controller/elasticsearch/label/label_test.go b/pkg/controller/elasticsearch/label/label_test.go index c2c36482c3..1fc4043891 100644 --- a/pkg/controller/elasticsearch/label/label_test.go +++ b/pkg/controller/elasticsearch/label/label_test.go @@ -8,9 +8,6 @@ import ( "reflect" "testing" - v1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/go-test/deep" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" @@ -18,6 +15,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/pointer" + + v1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) func TestClusterFromResourceLabels(t *testing.T) { diff --git a/pkg/controller/elasticsearch/license/apply.go b/pkg/controller/elasticsearch/license/apply.go index 123c36e529..2035b6f036 100644 --- a/pkg/controller/elasticsearch/license/apply.go +++ b/pkg/controller/elasticsearch/license/apply.go @@ -9,15 +9,16 @@ import ( "encoding/json" "fmt" + pkgerrors "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" commonlicense "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - pkgerrors "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) var log = ulog.Log.WithName("elasticsearch-controller") diff --git a/pkg/controller/elasticsearch/license/reconcile.go b/pkg/controller/elasticsearch/license/reconcile.go index 690ec57ad4..26f3469661 100644 --- a/pkg/controller/elasticsearch/license/reconcile.go +++ b/pkg/controller/elasticsearch/license/reconcile.go @@ -7,10 +7,11 @@ package license import ( "context" + "github.com/pkg/errors" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/pkg/errors" ) // Reconcile reconciles the current Elasticsearch license with the desired one. diff --git a/pkg/controller/elasticsearch/nodespec/defaults.go b/pkg/controller/elasticsearch/nodespec/defaults.go index c40dff2f6e..ebfdc6d11b 100644 --- a/pkg/controller/elasticsearch/nodespec/defaults.go +++ b/pkg/controller/elasticsearch/nodespec/defaults.go @@ -7,12 +7,12 @@ package nodespec import ( "path" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" diff --git a/pkg/controller/elasticsearch/nodespec/lifecycle_hook.go b/pkg/controller/elasticsearch/nodespec/lifecycle_hook.go index 09160347f8..efb8068fac 100644 --- a/pkg/controller/elasticsearch/nodespec/lifecycle_hook.go +++ b/pkg/controller/elasticsearch/nodespec/lifecycle_hook.go @@ -7,8 +7,9 @@ package nodespec import ( "path" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" v1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) func NewPreStopHook() *v1.Handler { diff --git a/pkg/controller/elasticsearch/nodespec/podspec_test.go b/pkg/controller/elasticsearch/nodespec/podspec_test.go index d79149e9c3..e118bab39a 100644 --- a/pkg/controller/elasticsearch/nodespec/podspec_test.go +++ b/pkg/controller/elasticsearch/nodespec/podspec_test.go @@ -8,6 +8,12 @@ import ( "sort" "testing" + "github.com/go-test/deep" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" @@ -16,11 +22,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" - "github.com/go-test/deep" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) var sampleES = esv1.Elasticsearch{ diff --git a/pkg/controller/elasticsearch/nodespec/readiness_probe.go b/pkg/controller/elasticsearch/nodespec/readiness_probe.go index 8a398637d6..75eeae30a2 100644 --- a/pkg/controller/elasticsearch/nodespec/readiness_probe.go +++ b/pkg/controller/elasticsearch/nodespec/readiness_probe.go @@ -7,9 +7,10 @@ package nodespec import ( "path" + corev1 "k8s.io/api/core/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - corev1 "k8s.io/api/core/v1" ) func NewReadinessProbe() *corev1.Probe { diff --git a/pkg/controller/elasticsearch/nodespec/resources.go b/pkg/controller/elasticsearch/nodespec/resources.go index c9f1ea10a7..a0d01af2a7 100644 --- a/pkg/controller/elasticsearch/nodespec/resources.go +++ b/pkg/controller/elasticsearch/nodespec/resources.go @@ -5,7 +5,6 @@ package nodespec import ( - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -17,6 +16,7 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/stackmon" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // Resources contain per-NodeSet resources to be created. diff --git a/pkg/controller/elasticsearch/nodespec/statefulset.go b/pkg/controller/elasticsearch/nodespec/statefulset.go index e4ef22a9a4..f374934114 100644 --- a/pkg/controller/elasticsearch/nodespec/statefulset.go +++ b/pkg/controller/elasticsearch/nodespec/statefulset.go @@ -5,6 +5,10 @@ package nodespec import ( + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" @@ -15,9 +19,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // HeadlessServiceName returns the name of the headless service for the given StatefulSet. diff --git a/pkg/controller/elasticsearch/nodespec/statefulset_test.go b/pkg/controller/elasticsearch/nodespec/statefulset_test.go index b1e4a3cbc8..f21c28f45d 100644 --- a/pkg/controller/elasticsearch/nodespec/statefulset_test.go +++ b/pkg/controller/elasticsearch/nodespec/statefulset_test.go @@ -7,11 +7,12 @@ package nodespec import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" ) func Test_setVolumeClaimsControllerReference(t *testing.T) { diff --git a/pkg/controller/elasticsearch/observer/manager.go b/pkg/controller/elasticsearch/observer/manager.go index ceec45809e..729d72d01a 100644 --- a/pkg/controller/elasticsearch/observer/manager.go +++ b/pkg/controller/elasticsearch/observer/manager.go @@ -7,12 +7,13 @@ package observer import ( "sync" + "go.elastic.co/apm" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "go.elastic.co/apm" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/controller/elasticsearch/observer/manager_test.go b/pkg/controller/elasticsearch/observer/manager_test.go index e231bfaac7..2512ce9a10 100644 --- a/pkg/controller/elasticsearch/observer/manager_test.go +++ b/pkg/controller/elasticsearch/observer/manager_test.go @@ -8,12 +8,13 @@ import ( "testing" "time" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/stretchr/testify/require" "go.elastic.co/apm" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) func TestManager_List(t *testing.T) { diff --git a/pkg/controller/elasticsearch/observer/observer.go b/pkg/controller/elasticsearch/observer/observer.go index a9f062de93..bdc4c662ff 100644 --- a/pkg/controller/elasticsearch/observer/observer.go +++ b/pkg/controller/elasticsearch/observer/observer.go @@ -9,10 +9,11 @@ import ( "sync" "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "go.elastic.co/apm" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var log = ulog.Log.WithName("observer") diff --git a/pkg/controller/elasticsearch/observer/observer_test.go b/pkg/controller/elasticsearch/observer/observer_test.go index a4a2160db2..40f15aed3c 100644 --- a/pkg/controller/elasticsearch/observer/observer_test.go +++ b/pkg/controller/elasticsearch/observer/observer_test.go @@ -13,12 +13,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "k8s.io/apimachinery/pkg/types" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" fixtures "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client/test_fixtures" "github.com/elastic/cloud-on-k8s/pkg/utils/test" - "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/types" ) func fakeEsClient200(user client.BasicAuth) client.Client { diff --git a/pkg/controller/elasticsearch/observer/state.go b/pkg/controller/elasticsearch/observer/state.go index 12d1b6e6e4..af85668505 100644 --- a/pkg/controller/elasticsearch/observer/state.go +++ b/pkg/controller/elasticsearch/observer/state.go @@ -7,8 +7,9 @@ package observer import ( "context" - esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "k8s.io/apimachinery/pkg/types" + + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) // State contains information about an observed state of Elasticsearch. diff --git a/pkg/controller/elasticsearch/observer/state_test.go b/pkg/controller/elasticsearch/observer/state_test.go index ae187f31a8..4137947b9e 100644 --- a/pkg/controller/elasticsearch/observer/state_test.go +++ b/pkg/controller/elasticsearch/observer/state_test.go @@ -13,11 +13,12 @@ import ( "strings" "testing" + "github.com/stretchr/testify/require" + "k8s.io/apimachinery/pkg/types" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" fixtures "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client/test_fixtures" - "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/types" ) func fakeEsClient(healthRespErr bool) client.Client { diff --git a/pkg/controller/elasticsearch/observer/watch.go b/pkg/controller/elasticsearch/observer/watch.go index 8b181424c1..82e8c68496 100644 --- a/pkg/controller/elasticsearch/observer/watch.go +++ b/pkg/controller/elasticsearch/observer/watch.go @@ -5,11 +5,12 @@ package observer import ( - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/source" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) // WatchClusterHealthChange returns a Source fed with generic events targeting clusters diff --git a/pkg/controller/elasticsearch/pdb/reconcile.go b/pkg/controller/elasticsearch/pdb/reconcile.go index 1c16d70588..72aab5584b 100644 --- a/pkg/controller/elasticsearch/pdb/reconcile.go +++ b/pkg/controller/elasticsearch/pdb/reconcile.go @@ -7,6 +7,13 @@ package pdb import ( "context" + "k8s.io/api/policy/v1beta1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" @@ -14,12 +21,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - "k8s.io/api/policy/v1beta1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/kubernetes/scheme" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) // Reconcile ensures that a PodDisruptionBudget exists for this cluster, inheriting the spec content. diff --git a/pkg/controller/elasticsearch/pdb/reconcile_test.go b/pkg/controller/elasticsearch/pdb/reconcile_test.go index 08984c8366..ee02c599c8 100644 --- a/pkg/controller/elasticsearch/pdb/reconcile_test.go +++ b/pkg/controller/elasticsearch/pdb/reconcile_test.go @@ -9,14 +9,6 @@ import ( "reflect" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -25,6 +17,15 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestReconcile(t *testing.T) { diff --git a/pkg/controller/elasticsearch/reconcile/resources_state.go b/pkg/controller/elasticsearch/reconcile/resources_state.go index 30fbc55325..d7dcf8fa50 100644 --- a/pkg/controller/elasticsearch/reconcile/resources_state.go +++ b/pkg/controller/elasticsearch/reconcile/resources_state.go @@ -7,14 +7,15 @@ package reconcile import ( "context" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" ) // ResourcesState contains information about a deployments resources. diff --git a/pkg/controller/elasticsearch/reconcile/state.go b/pkg/controller/elasticsearch/reconcile/state.go index da5923fcd9..4ce32d3f77 100644 --- a/pkg/controller/elasticsearch/reconcile/state.go +++ b/pkg/controller/elasticsearch/reconcile/state.go @@ -7,6 +7,8 @@ package reconcile import ( "reflect" + corev1 "k8s.io/api/core/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" @@ -14,7 +16,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - corev1 "k8s.io/api/core/v1" ) var log = ulog.Log.WithName("elasticsearch-controller") diff --git a/pkg/controller/elasticsearch/remotecluster/elasticsearch.go b/pkg/controller/elasticsearch/remotecluster/elasticsearch.go index 7eeec2b5d2..9a58258c0a 100644 --- a/pkg/controller/elasticsearch/remotecluster/elasticsearch.go +++ b/pkg/controller/elasticsearch/remotecluster/elasticsearch.go @@ -8,6 +8,10 @@ import ( "context" "sort" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + "k8s.io/client-go/tools/record" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" @@ -16,9 +20,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - "k8s.io/client-go/tools/record" ) var log = ulog.Log.WithName("remotecluster") diff --git a/pkg/controller/elasticsearch/remotecluster/elasticsearch_test.go b/pkg/controller/elasticsearch/remotecluster/elasticsearch_test.go index 882aa4d183..c617697d37 100644 --- a/pkg/controller/elasticsearch/remotecluster/elasticsearch_test.go +++ b/pkg/controller/elasticsearch/remotecluster/elasticsearch_test.go @@ -8,6 +8,8 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" @@ -15,8 +17,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/assert" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func Test_getCurrentRemoteClusters(t *testing.T) { diff --git a/pkg/controller/elasticsearch/services/services.go b/pkg/controller/elasticsearch/services/services.go index a409ddb9f5..44bd5be24c 100644 --- a/pkg/controller/elasticsearch/services/services.go +++ b/pkg/controller/elasticsearch/services/services.go @@ -10,14 +10,15 @@ import ( "math/rand" "strconv" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/network" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/controller/elasticsearch/services/services_test.go b/pkg/controller/elasticsearch/services/services_test.go index a37a375a8f..0e20ae3ef6 100644 --- a/pkg/controller/elasticsearch/services/services_test.go +++ b/pkg/controller/elasticsearch/services/services_test.go @@ -7,17 +7,18 @@ package services import ( "testing" + "github.com/go-test/deep" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/network" "github.com/elastic/cloud-on-k8s/pkg/utils/compare" - "github.com/go-test/deep" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestExternalServiceURL(t *testing.T) { diff --git a/pkg/controller/elasticsearch/settings/config_volume.go b/pkg/controller/elasticsearch/settings/config_volume.go index a0895a45f0..413754aa57 100644 --- a/pkg/controller/elasticsearch/settings/config_volume.go +++ b/pkg/controller/elasticsearch/settings/config_volume.go @@ -7,16 +7,17 @@ package settings import ( "context" + pkgerrors "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - pkgerrors "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) // Constants to use for the `elasticsearch.yml` config file in an ES pod. diff --git a/pkg/controller/elasticsearch/settings/config_volume_test.go b/pkg/controller/elasticsearch/settings/config_volume_test.go index 6d320bd53e..0fcd26a5dd 100644 --- a/pkg/controller/elasticsearch/settings/config_volume_test.go +++ b/pkg/controller/elasticsearch/settings/config_volume_test.go @@ -8,13 +8,14 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestConfigSecretName(t *testing.T) { diff --git a/pkg/controller/elasticsearch/settings/masters.go b/pkg/controller/elasticsearch/settings/masters.go index 89330cdbd2..e93c4a496d 100644 --- a/pkg/controller/elasticsearch/settings/masters.go +++ b/pkg/controller/elasticsearch/settings/masters.go @@ -12,6 +12,11 @@ import ( "strconv" "strings" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" @@ -20,10 +25,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/network" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) // Quorum computes the quorum of a cluster given the number of masters. diff --git a/pkg/controller/elasticsearch/settings/masters_test.go b/pkg/controller/elasticsearch/settings/masters_test.go index 5576072bf6..2e73b42468 100644 --- a/pkg/controller/elasticsearch/settings/masters_test.go +++ b/pkg/controller/elasticsearch/settings/masters_test.go @@ -8,14 +8,15 @@ import ( "context" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // newPodWithIP creates a new Pod potentially labeled as master with a given podIP diff --git a/pkg/controller/elasticsearch/settings/merged_config.go b/pkg/controller/elasticsearch/settings/merged_config.go index ae73cdb2c7..6d1938691b 100644 --- a/pkg/controller/elasticsearch/settings/merged_config.go +++ b/pkg/controller/elasticsearch/settings/merged_config.go @@ -8,6 +8,8 @@ import ( "fmt" "path" + corev1 "k8s.io/api/core/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" @@ -16,7 +18,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" - corev1 "k8s.io/api/core/v1" ) // the name of the ES attribute indicating the pod's current k8s node diff --git a/pkg/controller/elasticsearch/settings/merged_config_test.go b/pkg/controller/elasticsearch/settings/merged_config_test.go index 5ccd3e47ba..db41a816c7 100644 --- a/pkg/controller/elasticsearch/settings/merged_config_test.go +++ b/pkg/controller/elasticsearch/settings/merged_config_test.go @@ -8,12 +8,13 @@ import ( "bytes" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) func TestNewMergedESConfig(t *testing.T) { diff --git a/pkg/controller/elasticsearch/sset/getter.go b/pkg/controller/elasticsearch/sset/getter.go index 6f316330ca..c82ddfed89 100644 --- a/pkg/controller/elasticsearch/sset/getter.go +++ b/pkg/controller/elasticsearch/sset/getter.go @@ -8,13 +8,14 @@ import ( "context" "fmt" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // GetReplicas returns the replicas configured for this StatefulSet, or 0 if nil. diff --git a/pkg/controller/elasticsearch/sset/getter_test.go b/pkg/controller/elasticsearch/sset/getter_test.go index 02738ea3e6..986b3792bc 100644 --- a/pkg/controller/elasticsearch/sset/getter_test.go +++ b/pkg/controller/elasticsearch/sset/getter_test.go @@ -8,14 +8,15 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/pointer" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestGetClaim(t *testing.T) { diff --git a/pkg/controller/elasticsearch/sset/list.go b/pkg/controller/elasticsearch/sset/list.go index 3ee5630f70..277dcd48fb 100644 --- a/pkg/controller/elasticsearch/sset/list.go +++ b/pkg/controller/elasticsearch/sset/list.go @@ -9,16 +9,17 @@ import ( "fmt" "sort" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/elastic/cloud-on-k8s/pkg/utils/set" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" + "github.com/elastic/cloud-on-k8s/pkg/utils/set" ) var log = ulog.Log.WithName("statefulset") diff --git a/pkg/controller/elasticsearch/sset/list_test.go b/pkg/controller/elasticsearch/sset/list_test.go index 1b8b318b56..270eba0a08 100644 --- a/pkg/controller/elasticsearch/sset/list_test.go +++ b/pkg/controller/elasticsearch/sset/list_test.go @@ -8,16 +8,16 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/types" - - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var ssetv7 = appsv1.StatefulSet{ diff --git a/pkg/controller/elasticsearch/sset/pod.go b/pkg/controller/elasticsearch/sset/pod.go index 4e9b624810..9ae5a96f8c 100644 --- a/pkg/controller/elasticsearch/sset/pod.go +++ b/pkg/controller/elasticsearch/sset/pod.go @@ -10,14 +10,15 @@ import ( "strconv" "strings" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) // PodName returns the name of the pod with the given ordinal for this StatefulSet. diff --git a/pkg/controller/elasticsearch/sset/pod_test.go b/pkg/controller/elasticsearch/sset/pod_test.go index ffe80389de..da569e5620 100644 --- a/pkg/controller/elasticsearch/sset/pod_test.go +++ b/pkg/controller/elasticsearch/sset/pod_test.go @@ -7,15 +7,16 @@ package sset import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" ) func TestPodName(t *testing.T) { diff --git a/pkg/controller/elasticsearch/sset/reconcile_test.go b/pkg/controller/elasticsearch/sset/reconcile_test.go index 8547907464..b826e61498 100644 --- a/pkg/controller/elasticsearch/sset/reconcile_test.go +++ b/pkg/controller/elasticsearch/sset/reconcile_test.go @@ -8,12 +8,6 @@ import ( "context" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" - controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/meta" @@ -22,6 +16,13 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/expectations" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestReconcileStatefulSet(t *testing.T) { diff --git a/pkg/controller/elasticsearch/sset/validation.go b/pkg/controller/elasticsearch/sset/validation.go index fa8564b187..9ce71d5690 100644 --- a/pkg/controller/elasticsearch/sset/validation.go +++ b/pkg/controller/elasticsearch/sset/validation.go @@ -9,13 +9,14 @@ import ( "errors" "fmt" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) type PodTemplateError struct { diff --git a/pkg/controller/elasticsearch/sset/validation_test.go b/pkg/controller/elasticsearch/sset/validation_test.go index dc1990fc6f..05c2b02ad0 100644 --- a/pkg/controller/elasticsearch/sset/validation_test.go +++ b/pkg/controller/elasticsearch/sset/validation_test.go @@ -10,11 +10,12 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_validatePodTemplate(t *testing.T) { diff --git a/pkg/controller/elasticsearch/user/associated.go b/pkg/controller/elasticsearch/user/associated.go index ca0206dd01..36c89d22f5 100644 --- a/pkg/controller/elasticsearch/user/associated.go +++ b/pkg/controller/elasticsearch/user/associated.go @@ -9,12 +9,13 @@ import ( "fmt" "strings" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/client" ) const ( diff --git a/pkg/controller/elasticsearch/user/associated_test.go b/pkg/controller/elasticsearch/user/associated_test.go index f6e439c582..bbcdade230 100644 --- a/pkg/controller/elasticsearch/user/associated_test.go +++ b/pkg/controller/elasticsearch/user/associated_test.go @@ -8,12 +8,11 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/stretchr/testify/require" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) diff --git a/pkg/controller/elasticsearch/user/predefined.go b/pkg/controller/elasticsearch/user/predefined.go index 62e9acb723..e79d551957 100644 --- a/pkg/controller/elasticsearch/user/predefined.go +++ b/pkg/controller/elasticsearch/user/predefined.go @@ -7,18 +7,19 @@ package user import ( "context" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" "golang.org/x/crypto/bcrypt" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/elasticsearch/user/predefined_test.go b/pkg/controller/elasticsearch/user/predefined_test.go index ea7234abf0..3fe7c35f39 100644 --- a/pkg/controller/elasticsearch/user/predefined_test.go +++ b/pkg/controller/elasticsearch/user/predefined_test.go @@ -8,15 +8,16 @@ import ( "context" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" "golang.org/x/crypto/bcrypt" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_reconcileElasticUser(t *testing.T) { diff --git a/pkg/controller/elasticsearch/user/reconcile.go b/pkg/controller/elasticsearch/user/reconcile.go index a1072dbd8a..5aacdb3035 100644 --- a/pkg/controller/elasticsearch/user/reconcile.go +++ b/pkg/controller/elasticsearch/user/reconcile.go @@ -8,6 +8,13 @@ import ( "context" "reflect" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" "github.com/elastic/cloud-on-k8s/pkg/controller/common/tracing" @@ -18,12 +25,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" ) var log = ulog.Log.WithName("elasticsearch-user") diff --git a/pkg/controller/elasticsearch/user/user_provided.go b/pkg/controller/elasticsearch/user/user_provided.go index 281c1b3287..fe16f34393 100644 --- a/pkg/controller/elasticsearch/user/user_provided.go +++ b/pkg/controller/elasticsearch/user/user_provided.go @@ -8,16 +8,17 @@ import ( "context" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // UserProvidedFileRealmWatchName returns the watch registered for user-provided file realm secrets. diff --git a/pkg/controller/elasticsearch/user/user_provided_test.go b/pkg/controller/elasticsearch/user/user_provided_test.go index 4bafc1659e..f86f73e4af 100644 --- a/pkg/controller/elasticsearch/user/user_provided_test.go +++ b/pkg/controller/elasticsearch/user/user_provided_test.go @@ -9,6 +9,8 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" @@ -18,9 +20,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user/filerealm" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" ) func initDynamicWatches(watchNames ...string) watches.DynamicWatches { diff --git a/pkg/controller/elasticsearch/validation/autoscaling_validation.go b/pkg/controller/elasticsearch/validation/autoscaling_validation.go index 14cc14a6b8..425c7e3fbb 100644 --- a/pkg/controller/elasticsearch/validation/autoscaling_validation.go +++ b/pkg/controller/elasticsearch/validation/autoscaling_validation.go @@ -9,13 +9,14 @@ import ( "reflect" "strings" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/apimachinery/pkg/util/validation/field" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/set" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/apimachinery/pkg/util/validation/field" ) const UnexpectedVolumeClaimError = "autoscaling supports only one volume claim" diff --git a/pkg/controller/elasticsearch/validation/autoscaling_validation_test.go b/pkg/controller/elasticsearch/validation/autoscaling_validation_test.go index 53a3181b27..c4c20092b6 100644 --- a/pkg/controller/elasticsearch/validation/autoscaling_validation_test.go +++ b/pkg/controller/elasticsearch/validation/autoscaling_validation_test.go @@ -8,11 +8,12 @@ import ( "strings" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) func TestResourcePolicies_Validate(t *testing.T) { diff --git a/pkg/controller/elasticsearch/validation/validations.go b/pkg/controller/elasticsearch/validation/validations.go index e9529fa9b0..14addf6aa9 100644 --- a/pkg/controller/elasticsearch/validation/validations.go +++ b/pkg/controller/elasticsearch/validation/validations.go @@ -9,6 +9,8 @@ import ( "net" "strings" + "k8s.io/apimachinery/pkg/util/validation/field" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" stackmon "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/validations" @@ -17,7 +19,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" - "k8s.io/apimachinery/pkg/util/validation/field" ) var log = ulog.Log.WithName("es-validation") diff --git a/pkg/controller/elasticsearch/validation/validations_test.go b/pkg/controller/elasticsearch/validation/validations_test.go index 5e4c36dd37..7aacdfad26 100644 --- a/pkg/controller/elasticsearch/validation/validations_test.go +++ b/pkg/controller/elasticsearch/validation/validations_test.go @@ -7,10 +7,11 @@ package validation import ( "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) func Test_checkNodeSetNameUniqueness(t *testing.T) { diff --git a/pkg/controller/elasticsearch/validation/volume_validation.go b/pkg/controller/elasticsearch/validation/volume_validation.go index 154e1a9ec8..a13bebd6e7 100644 --- a/pkg/controller/elasticsearch/validation/volume_validation.go +++ b/pkg/controller/elasticsearch/validation/volume_validation.go @@ -9,9 +9,6 @@ import ( "errors" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" @@ -20,6 +17,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/validation/field" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func validPVCNaming(proposed esv1.Elasticsearch) field.ErrorList { diff --git a/pkg/controller/elasticsearch/validation/volume_validation_test.go b/pkg/controller/elasticsearch/validation/volume_validation_test.go index 632aa5f08a..1881251f85 100644 --- a/pkg/controller/elasticsearch/validation/volume_validation_test.go +++ b/pkg/controller/elasticsearch/validation/volume_validation_test.go @@ -8,9 +8,6 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -18,6 +15,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/comparison" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var ( diff --git a/pkg/controller/elasticsearch/validation/warnings.go b/pkg/controller/elasticsearch/validation/warnings.go index 997bbcc991..a560f37655 100644 --- a/pkg/controller/elasticsearch/validation/warnings.go +++ b/pkg/controller/elasticsearch/validation/warnings.go @@ -5,9 +5,10 @@ package validation import ( + "k8s.io/apimachinery/pkg/util/validation/field" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "k8s.io/apimachinery/pkg/util/validation/field" ) var warnings = []validation{ diff --git a/pkg/controller/elasticsearch/validation/webhook.go b/pkg/controller/elasticsearch/validation/webhook.go index 75a2dd9d8e..53976d7451 100644 --- a/pkg/controller/elasticsearch/validation/webhook.go +++ b/pkg/controller/elasticsearch/validation/webhook.go @@ -8,9 +8,6 @@ import ( "context" "net/http" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" admissionv1 "k8s.io/api/admission/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" @@ -18,6 +15,10 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) // +kubebuilder:webhook:path=/validate-elasticsearch-k8s-elastic-co-v1-elasticsearch,mutating=false,failurePolicy=ignore,groups=elasticsearch.k8s.elastic.co,resources=elasticsearches,verbs=create;update,versions=v1,name=elastic-es-validation-v1.k8s.elastic.co,sideEffects=None,admissionReviewVersions=v1;v1beta1,matchPolicy=Exact diff --git a/pkg/controller/elasticsearch/validation/webhook_test.go b/pkg/controller/elasticsearch/validation/webhook_test.go index 3dee41f872..5d1ea5cda8 100644 --- a/pkg/controller/elasticsearch/validation/webhook_test.go +++ b/pkg/controller/elasticsearch/validation/webhook_test.go @@ -9,13 +9,14 @@ import ( "encoding/json" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" admissionv1 "k8s.io/api/admission/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func asJSON(obj interface{}) []byte { diff --git a/pkg/controller/elasticsearch/version/supported_versions_test.go b/pkg/controller/elasticsearch/version/supported_versions_test.go index a40486f61e..d33e9a8684 100644 --- a/pkg/controller/elasticsearch/version/supported_versions_test.go +++ b/pkg/controller/elasticsearch/version/supported_versions_test.go @@ -8,8 +8,9 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/stretchr/testify/require" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) func TestSupportedVersions(t *testing.T) { diff --git a/pkg/controller/elasticsearch/version/zen1/compatibility_test.go b/pkg/controller/elasticsearch/version/zen1/compatibility_test.go index 588e63818e..7f0a4cce22 100644 --- a/pkg/controller/elasticsearch/version/zen1/compatibility_test.go +++ b/pkg/controller/elasticsearch/version/zen1/compatibility_test.go @@ -7,14 +7,15 @@ package zen1 import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func createStatefulSetWithVersion(version string) appsv1.StatefulSet { diff --git a/pkg/controller/elasticsearch/version/zen2/compatibility.go b/pkg/controller/elasticsearch/version/zen2/compatibility.go index 8047f57872..a450326ed0 100644 --- a/pkg/controller/elasticsearch/version/zen2/compatibility.go +++ b/pkg/controller/elasticsearch/version/zen2/compatibility.go @@ -5,12 +5,13 @@ package zen2 import ( + appsv1 "k8s.io/api/apps/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - appsv1 "k8s.io/api/apps/v1" ) // zen2VersionMatch returns true if the given Elasticsearch versionCompatibleWithZen2 is compatible with zen2. diff --git a/pkg/controller/elasticsearch/version/zen2/compatibility_test.go b/pkg/controller/elasticsearch/version/zen2/compatibility_test.go index 5159e767b4..52fd0ded20 100644 --- a/pkg/controller/elasticsearch/version/zen2/compatibility_test.go +++ b/pkg/controller/elasticsearch/version/zen2/compatibility_test.go @@ -7,15 +7,16 @@ package zen2 import ( "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func createStatefulSetWithESVersion(version string) appsv1.StatefulSet { diff --git a/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go index 0d5a9e463c..f73a64a46b 100644 --- a/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go +++ b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go @@ -8,6 +8,8 @@ import ( "context" "strings" + pkgerrors "github.com/pkg/errors" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/bootstrap" @@ -16,7 +18,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - pkgerrors "github.com/pkg/errors" ) const ( diff --git a/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go b/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go index 2f372f6161..cfb6caf99f 100644 --- a/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go +++ b/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go @@ -8,13 +8,14 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) type fakeVotingConfigExclusionsESClient struct { diff --git a/pkg/controller/enterprisesearch/config.go b/pkg/controller/enterprisesearch/config.go index 6b00f7c996..d184484718 100644 --- a/pkg/controller/enterprisesearch/config.go +++ b/pkg/controller/enterprisesearch/config.go @@ -10,6 +10,11 @@ import ( "net" "path/filepath" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" @@ -22,10 +27,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/controller/enterprisesearch/config_test.go b/pkg/controller/enterprisesearch/config_test.go index 8e8e64b669..d6dc2fb417 100644 --- a/pkg/controller/enterprisesearch/config_test.go +++ b/pkg/controller/enterprisesearch/config_test.go @@ -9,17 +9,18 @@ import ( "context" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func entWithConfigRef(secretName string) entv1.EnterpriseSearch { diff --git a/pkg/controller/enterprisesearch/enterprisesearch_controller.go b/pkg/controller/enterprisesearch/enterprisesearch_controller.go index 62c464f58c..735720925b 100644 --- a/pkg/controller/enterprisesearch/enterprisesearch_controller.go +++ b/pkg/controller/enterprisesearch/enterprisesearch_controller.go @@ -11,6 +11,18 @@ import ( "reflect" "sync/atomic" + "go.elastic.co/apm" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -26,17 +38,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) const ( diff --git a/pkg/controller/enterprisesearch/pod_test.go b/pkg/controller/enterprisesearch/pod_test.go index a128e8e85f..ce7bef535b 100644 --- a/pkg/controller/enterprisesearch/pod_test.go +++ b/pkg/controller/enterprisesearch/pod_test.go @@ -7,10 +7,10 @@ package enterprisesearch import ( "testing" + "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" - "github.com/stretchr/testify/assert" ) func Test_newPodSpec(t *testing.T) { diff --git a/pkg/controller/kibana/config_settings.go b/pkg/controller/kibana/config_settings.go index 6bee3dc599..b5451e5af5 100644 --- a/pkg/controller/kibana/config_settings.go +++ b/pkg/controller/kibana/config_settings.go @@ -9,6 +9,13 @@ import ( "path" "path/filepath" + "github.com/elastic/go-ucfg" + "github.com/pkg/errors" + "go.elastic.co/apm" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" @@ -21,12 +28,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/stackmon" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/net" - "github.com/elastic/go-ucfg" - "github.com/pkg/errors" - "go.elastic.co/apm" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/pkg/controller/kibana/config_settings_test.go b/pkg/controller/kibana/config_settings_test.go index 37783b128a..e3846c4789 100644 --- a/pkg/controller/kibana/config_settings_test.go +++ b/pkg/controller/kibana/config_settings_test.go @@ -9,11 +9,6 @@ import ( "fmt" "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ucfg "github.com/elastic/go-ucfg" uyaml "github.com/elastic/go-ucfg/yaml" "github.com/go-test/deep" @@ -21,6 +16,12 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var defaultConfig = []byte(` diff --git a/pkg/controller/kibana/controller.go b/pkg/controller/kibana/controller.go index d899f28710..2b007bb3e0 100644 --- a/pkg/controller/kibana/controller.go +++ b/pkg/controller/kibana/controller.go @@ -9,6 +9,18 @@ import ( "reflect" "sync/atomic" + "go.elastic.co/apm" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -23,17 +35,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "go.elastic.co/apm" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) const ( diff --git a/pkg/controller/kibana/driver_test.go b/pkg/controller/kibana/driver_test.go index 3c271942e7..92626c8349 100644 --- a/pkg/controller/kibana/driver_test.go +++ b/pkg/controller/kibana/driver_test.go @@ -9,7 +9,6 @@ import ( "fmt" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" "github.com/go-test/deep" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -28,6 +27,7 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/deployment" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" "github.com/elastic/cloud-on-k8s/pkg/utils/compare" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) diff --git a/pkg/controller/kibana/init_configuration.go b/pkg/controller/kibana/init_configuration.go index 2668beab7e..f77daf431d 100644 --- a/pkg/controller/kibana/init_configuration.go +++ b/pkg/controller/kibana/init_configuration.go @@ -5,9 +5,10 @@ package kibana import ( - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" + + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" ) const ( diff --git a/pkg/controller/kibana/keystore.go b/pkg/controller/kibana/keystore.go index 76624a8769..3cb39cb1c1 100644 --- a/pkg/controller/kibana/keystore.go +++ b/pkg/controller/kibana/keystore.go @@ -5,11 +5,12 @@ package kibana import ( + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) // keystoreInConfigDirVersion is the version in which the keystore is no longer stored in the data directory but in the config one. diff --git a/pkg/controller/kibana/pod.go b/pkg/controller/kibana/pod.go index 7fe702920c..13cdb5ee4d 100644 --- a/pkg/controller/kibana/pod.go +++ b/pkg/controller/kibana/pod.go @@ -5,8 +5,6 @@ package kibana import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" - "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/stackmon" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/intstr" @@ -19,6 +17,8 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" "github.com/elastic/cloud-on-k8s/pkg/controller/common/pod" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/stackmon" ) const ( diff --git a/pkg/controller/kibana/pod_test.go b/pkg/controller/kibana/pod_test.go index db2f574553..1ad381ef62 100644 --- a/pkg/controller/kibana/pod_test.go +++ b/pkg/controller/kibana/pod_test.go @@ -7,10 +7,6 @@ package kibana import ( "testing" - commonvolume "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" @@ -21,6 +17,9 @@ import ( kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + commonvolume "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestNewPodTemplateSpec(t *testing.T) { diff --git a/pkg/controller/kibana/stackmon/sidecar.go b/pkg/controller/kibana/stackmon/sidecar.go index ddbed106b0..8ffb1be438 100644 --- a/pkg/controller/kibana/stackmon/sidecar.go +++ b/pkg/controller/kibana/stackmon/sidecar.go @@ -9,6 +9,8 @@ import ( "errors" "fmt" + corev1 "k8s.io/api/core/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" @@ -18,7 +20,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - corev1 "k8s.io/api/core/v1" ) const ( diff --git a/pkg/controller/kibana/stackmon/sidecar_test.go b/pkg/controller/kibana/stackmon/sidecar_test.go index fa9263ca76..9381c04198 100644 --- a/pkg/controller/kibana/stackmon/sidecar_test.go +++ b/pkg/controller/kibana/stackmon/sidecar_test.go @@ -8,14 +8,15 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/assert" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/assert" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestWithMonitoring(t *testing.T) { diff --git a/pkg/controller/license/license_controller.go b/pkg/controller/license/license_controller.go index 57df8e3eba..f1d6d07dae 100644 --- a/pkg/controller/license/license_controller.go +++ b/pkg/controller/license/license_controller.go @@ -9,17 +9,6 @@ import ( "encoding/json" "time" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - eslabel "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -31,6 +20,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + eslabel "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) const ( diff --git a/pkg/controller/license/license_controller_test.go b/pkg/controller/license/license_controller_test.go index 5aec5e285e..1d1d2eb4e3 100644 --- a/pkg/controller/license/license_controller_test.go +++ b/pkg/controller/license/license_controller_test.go @@ -11,17 +11,18 @@ import ( "testing" "time" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - commonlicense "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + commonlicense "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_nextReconcileRelativeTo(t *testing.T) { diff --git a/pkg/controller/license/list.go b/pkg/controller/license/list.go index 214c3bb5bc..be2b1f704f 100644 --- a/pkg/controller/license/list.go +++ b/pkg/controller/license/list.go @@ -7,10 +7,11 @@ package license import ( "context" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func reconcileRequestsForAllClusters(c k8s.Client) ([]reconcile.Request, error) { diff --git a/pkg/controller/license/trial/trial_controller.go b/pkg/controller/license/trial/trial_controller.go index c55a811219..c9e8dc658d 100644 --- a/pkg/controller/license/trial/trial_controller.go +++ b/pkg/controller/license/trial/trial_controller.go @@ -12,12 +12,6 @@ import ( "sync/atomic" "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - licensing "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -29,6 +23,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + licensing "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) const ( diff --git a/pkg/controller/license/trial/trial_controller_test.go b/pkg/controller/license/trial/trial_controller_test.go index e24960b999..8fc4e3064b 100644 --- a/pkg/controller/license/trial/trial_controller_test.go +++ b/pkg/controller/license/trial/trial_controller_test.go @@ -12,15 +12,16 @@ import ( "testing" "time" - licensing "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + licensing "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/maps/config.go b/pkg/controller/maps/config.go index bf0749570a..b14f304ba1 100644 --- a/pkg/controller/maps/config.go +++ b/pkg/controller/maps/config.go @@ -8,6 +8,9 @@ import ( "path" "path/filepath" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" @@ -19,8 +22,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/pkg/utils/net" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( diff --git a/pkg/controller/maps/config_test.go b/pkg/controller/maps/config_test.go index cebdd419bc..68ad8c0550 100644 --- a/pkg/controller/maps/config_test.go +++ b/pkg/controller/maps/config_test.go @@ -7,15 +7,16 @@ package maps import ( "testing" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" + + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_newConfig(t *testing.T) { diff --git a/pkg/controller/maps/controller.go b/pkg/controller/maps/controller.go index 84f62af575..02ade5b3e0 100644 --- a/pkg/controller/maps/controller.go +++ b/pkg/controller/maps/controller.go @@ -12,6 +12,18 @@ import ( "sync/atomic" "time" + "go.elastic.co/apm" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" + emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" "github.com/elastic/cloud-on-k8s/pkg/controller/association" "github.com/elastic/cloud-on-k8s/pkg/controller/common" @@ -30,17 +42,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - "go.elastic.co/apm" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) const ( diff --git a/pkg/controller/maps/controller_test.go b/pkg/controller/maps/controller_test.go index 5475057ea3..535bbf5812 100644 --- a/pkg/controller/maps/controller_test.go +++ b/pkg/controller/maps/controller_test.go @@ -8,6 +8,14 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/elastic/cloud-on-k8s/pkg/about" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" @@ -18,13 +26,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) var nsnFixture = types.NamespacedName{ diff --git a/pkg/controller/maps/pod.go b/pkg/controller/maps/pod.go index 303da51821..2cec130cc3 100644 --- a/pkg/controller/maps/pod.go +++ b/pkg/controller/maps/pod.go @@ -5,14 +5,15 @@ package maps import ( + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/apimachinery/pkg/util/intstr" + emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/container" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/apimachinery/pkg/util/intstr" ) const ( diff --git a/pkg/controller/remoteca/rbac.go b/pkg/controller/remoteca/rbac.go index 41a671d332..00317cd808 100644 --- a/pkg/controller/remoteca/rbac.go +++ b/pkg/controller/remoteca/rbac.go @@ -7,12 +7,13 @@ package remoteca import ( "context" + corev1 "k8s.io/api/core/v1" + "k8s.io/client-go/tools/record" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/rbac" - corev1 "k8s.io/api/core/v1" - "k8s.io/client-go/tools/record" ) var log = ulog.Log.WithName("remotecluster-remoteca") diff --git a/pkg/controller/remoteca/watches.go b/pkg/controller/remoteca/watches.go index 7116a46ea8..0971caf9c3 100644 --- a/pkg/controller/remoteca/watches.go +++ b/pkg/controller/remoteca/watches.go @@ -7,9 +7,6 @@ package remoteca import ( "fmt" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/utils/maps" - v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" @@ -19,9 +16,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/certificates/remoteca" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/certificates/transport" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" ) // AddWatches set watches on objects needed to manage the association between a local and a remote cluster. diff --git a/pkg/controller/webhook/webhook_certificates_controller.go b/pkg/controller/webhook/webhook_certificates_controller.go index 150275b1d9..a4a5bf72a6 100644 --- a/pkg/controller/webhook/webhook_certificates_controller.go +++ b/pkg/controller/webhook/webhook_certificates_controller.go @@ -8,12 +8,6 @@ import ( "context" "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,6 +17,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) const ( diff --git a/pkg/dev/portforward/pod_forwarder.go b/pkg/dev/portforward/pod_forwarder.go index 08a6d117f2..4a226b0549 100644 --- a/pkg/dev/portforward/pod_forwarder.go +++ b/pkg/dev/portforward/pod_forwarder.go @@ -13,14 +13,15 @@ import ( "strings" "sync" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - utilsnet "github.com/elastic/cloud-on-k8s/pkg/utils/net" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client/config" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + utilsnet "github.com/elastic/cloud-on-k8s/pkg/utils/net" ) // PodForwarder enables redirecting tcp connections through "kubectl port-forward" tooling diff --git a/pkg/dev/portforward/pod_forwarder_test.go b/pkg/dev/portforward/pod_forwarder_test.go index 57d4a87402..0b82290cda 100644 --- a/pkg/dev/portforward/pod_forwarder_test.go +++ b/pkg/dev/portforward/pod_forwarder_test.go @@ -12,11 +12,9 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/types" - - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "k8s.io/apimachinery/pkg/types" ) type capturingDialer struct { diff --git a/pkg/dev/portforward/service_forwarder_test.go b/pkg/dev/portforward/service_forwarder_test.go index b841847af4..9dab767122 100644 --- a/pkg/dev/portforward/service_forwarder_test.go +++ b/pkg/dev/portforward/service_forwarder_test.go @@ -11,13 +11,14 @@ import ( "net" "testing" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_parseServiceAddr(t *testing.T) { diff --git a/pkg/license/aggregator.go b/pkg/license/aggregator.go index 6681ef7ff0..a390957e60 100644 --- a/pkg/license/aggregator.go +++ b/pkg/license/aggregator.go @@ -11,6 +11,10 @@ import ( "strconv" "strings" + "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" @@ -21,9 +25,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/enterprisesearch" "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" ) // Aggregator aggregates the total of resources of all Elastic managed components diff --git a/pkg/license/aggregator_test.go b/pkg/license/aggregator_test.go index 5afef02281..682cc532e2 100644 --- a/pkg/license/aggregator_test.go +++ b/pkg/license/aggregator_test.go @@ -11,17 +11,18 @@ import ( "os" "testing" - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" - kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/yaml" + + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestMemFromJavaOpts(t *testing.T) { diff --git a/pkg/license/license.go b/pkg/license/license.go index f119062134..7a53fc470c 100644 --- a/pkg/license/license.go +++ b/pkg/license/license.go @@ -11,16 +11,17 @@ import ( "strconv" "time" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/metrics" "github.com/prometheus/client_golang/prometheus" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/metrics" ) const ( diff --git a/pkg/license/license_test.go b/pkg/license/license_test.go index bbb44920df..4b82314c42 100644 --- a/pkg/license/license_test.go +++ b/pkg/license/license_test.go @@ -7,8 +7,9 @@ package license import ( "testing" - commonlicense "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" "github.com/stretchr/testify/assert" + + commonlicense "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" ) func TestToMap(t *testing.T) { diff --git a/pkg/license/reporter.go b/pkg/license/reporter.go index 7e7aa71ed1..ea6349fd17 100644 --- a/pkg/license/reporter.go +++ b/pkg/license/reporter.go @@ -7,8 +7,9 @@ package license import ( "time" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "sigs.k8s.io/controller-runtime/pkg/client" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) // ResourceReporterFrequency defines the reporting frequency of the resource reporter diff --git a/pkg/telemetry/telemetry.go b/pkg/telemetry/telemetry.go index 855eed0ba6..72ff584185 100644 --- a/pkg/telemetry/telemetry.go +++ b/pkg/telemetry/telemetry.go @@ -9,6 +9,11 @@ import ( "fmt" "time" + "github.com/ghodss/yaml" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/elastic/cloud-on-k8s/pkg/about" agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" @@ -23,10 +28,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/license" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/ghodss/yaml" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" ) const ( diff --git a/pkg/telemetry/telemetry_test.go b/pkg/telemetry/telemetry_test.go index 934ad8cc09..8149608648 100644 --- a/pkg/telemetry/telemetry_test.go +++ b/pkg/telemetry/telemetry_test.go @@ -9,6 +9,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/elastic/cloud-on-k8s/pkg/about" agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" @@ -20,9 +24,6 @@ import ( mapsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) var testOperatorInfo = about.OperatorInfo{ diff --git a/pkg/utils/k8s/client.go b/pkg/utils/k8s/client.go index 8e31b2b4da..25e828c879 100644 --- a/pkg/utils/k8s/client.go +++ b/pkg/utils/k8s/client.go @@ -5,10 +5,11 @@ package k8s import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" ) func init() { diff --git a/pkg/utils/k8s/k8sutils.go b/pkg/utils/k8s/k8sutils.go index 3784484635..8618a807e0 100644 --- a/pkg/utils/k8s/k8sutils.go +++ b/pkg/utils/k8s/k8sutils.go @@ -9,7 +9,6 @@ import ( "fmt" "net" - netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,6 +16,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" + + netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" ) // DeepCopyObject creates a deep copy of a client.Object. diff --git a/pkg/utils/k8s/k8sutils_test.go b/pkg/utils/k8s/k8sutils_test.go index b33f026fde..a8ac5475c3 100644 --- a/pkg/utils/k8s/k8sutils_test.go +++ b/pkg/utils/k8s/k8sutils_test.go @@ -9,7 +9,6 @@ import ( "reflect" "testing" - netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" "github.com/go-test/deep" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -18,6 +17,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" ) func TestDeepCopyObject(t *testing.T) { diff --git a/pkg/utils/log/log.go b/pkg/utils/log/log.go index 35ee4b4df7..88ccdccd7c 100644 --- a/pkg/utils/log/log.go +++ b/pkg/utils/log/log.go @@ -10,8 +10,6 @@ import ( "os" "strconv" - "github.com/elastic/cloud-on-k8s/pkg/about" - "github.com/elastic/cloud-on-k8s/pkg/dev" "github.com/go-logr/logr" "github.com/spf13/pflag" "go.elastic.co/apm" @@ -20,6 +18,9 @@ import ( "k8s.io/klog/v2" crlog "sigs.k8s.io/controller-runtime/pkg/log" crzap "sigs.k8s.io/controller-runtime/pkg/log/zap" + + "github.com/elastic/cloud-on-k8s/pkg/about" + "github.com/elastic/cloud-on-k8s/pkg/dev" ) const ( diff --git a/pkg/utils/rbac/access_review.go b/pkg/utils/rbac/access_review.go index cd1017b21b..e10e2b783b 100644 --- a/pkg/utils/rbac/access_review.go +++ b/pkg/utils/rbac/access_review.go @@ -8,7 +8,6 @@ import ( "context" "strings" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/gobuffalo/flect" authorizationapi "k8s.io/api/authorization/v1" "k8s.io/apimachinery/pkg/api/meta" @@ -17,6 +16,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/kubernetes" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) const ( diff --git a/pkg/utils/rbac/access_review_test.go b/pkg/utils/rbac/access_review_test.go index b464f49bcf..a22b620a6e 100644 --- a/pkg/utils/rbac/access_review_test.go +++ b/pkg/utils/rbac/access_review_test.go @@ -10,13 +10,14 @@ import ( "reflect" "testing" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" authorizationapi "k8s.io/api/authorization/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" ) type fakeClientProvider func() kubernetes.Interface diff --git a/pkg/utils/test/namespace.go b/pkg/utils/test/namespace.go index 2335835e27..e936926560 100644 --- a/pkg/utils/test/namespace.go +++ b/pkg/utils/test/namespace.go @@ -7,11 +7,12 @@ package test import ( "context" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func EnsureNamespace(c k8s.Client, ns string) error { diff --git a/pkg/utils/test/retry.go b/pkg/utils/test/retry.go index e9cfd7cd22..210950eb44 100644 --- a/pkg/utils/test/retry.go +++ b/pkg/utils/test/retry.go @@ -8,8 +8,9 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/retry" "github.com/stretchr/testify/require" + + "github.com/elastic/cloud-on-k8s/pkg/utils/retry" ) // Default values to be used for testing purpose. diff --git a/pkg/utils/test/webhook.go b/pkg/utils/test/webhook.go index 789014ecf8..8945e38ad2 100644 --- a/pkg/utils/test/webhook.go +++ b/pkg/utils/test/webhook.go @@ -17,8 +17,6 @@ import ( "testing" "time" - controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/stretchr/testify/require" admissionv1beta1 "k8s.io/api/admission/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,6 +25,9 @@ import ( "k8s.io/apimachinery/pkg/types" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + controllerscheme "github.com/elastic/cloud-on-k8s/pkg/controller/common/scheme" + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var log = ulog.Log.WithName("test-webhook") diff --git a/support/reattach-pv/main.go b/support/reattach-pv/main.go index f35da4701b..08c1a74b76 100644 --- a/support/reattach-pv/main.go +++ b/support/reattach-pv/main.go @@ -11,10 +11,6 @@ import ( "os" "strings" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/spf13/cobra" "github.com/spf13/viper" v1 "k8s.io/api/core/v1" @@ -24,6 +20,11 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // allow gcp authentication "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/test/e2e/cmd/chaos/chaos.go b/test/e2e/cmd/chaos/chaos.go index 342f4188f5..9d86b8ddd1 100644 --- a/test/e2e/cmd/chaos/chaos.go +++ b/test/e2e/cmd/chaos/chaos.go @@ -12,8 +12,6 @@ import ( "net/http" "time" - "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" - logconf "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/prometheus/common/expfmt" "github.com/spf13/viper" corev1 "k8s.io/api/core/v1" @@ -22,6 +20,9 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/manager/signals" + + "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" + logconf "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) // doRun runs the main chaos process. It randomly deletes operator Pods, scale up and down operator replicas and attempts diff --git a/test/e2e/cmd/chaos/command.go b/test/e2e/cmd/chaos/command.go index f99318d3df..ce8f9410cc 100644 --- a/test/e2e/cmd/chaos/command.go +++ b/test/e2e/cmd/chaos/command.go @@ -7,9 +7,10 @@ package chaos import ( "time" - ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/spf13/cobra" "github.com/spf13/viper" + + ulog "github.com/elastic/cloud-on-k8s/pkg/utils/log" ) var ( diff --git a/test/e2e/cmd/main.go b/test/e2e/cmd/main.go index 1bbcd6c22b..758d7bcf4d 100644 --- a/test/e2e/cmd/main.go +++ b/test/e2e/cmd/main.go @@ -7,11 +7,12 @@ package main import ( "os" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/chaos" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func main() { diff --git a/test/e2e/cmd/run/command.go b/test/e2e/cmd/run/command.go index c23dea7ab3..840567035f 100644 --- a/test/e2e/cmd/run/command.go +++ b/test/e2e/cmd/run/command.go @@ -11,13 +11,14 @@ import ( "strings" "time" - logutil "github.com/elastic/cloud-on-k8s/pkg/utils/log" - "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/go-logr/logr" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" logf "sigs.k8s.io/controller-runtime/pkg/log" + + logutil "github.com/elastic/cloud-on-k8s/pkg/utils/log" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) type runFlags struct { diff --git a/test/e2e/cmd/run/eventlog.go b/test/e2e/cmd/run/eventlog.go index 7c51791e53..9961206a6c 100644 --- a/test/e2e/cmd/run/eventlog.go +++ b/test/e2e/cmd/run/eventlog.go @@ -9,7 +9,6 @@ import ( "os" "time" - "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19,6 +18,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" + + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) type eventLogEntry struct { diff --git a/test/e2e/cmd/run/job_manager.go b/test/e2e/cmd/run/job_manager.go index 4bc4756755..467cab4fcb 100644 --- a/test/e2e/cmd/run/job_manager.go +++ b/test/e2e/cmd/run/job_manager.go @@ -9,7 +9,6 @@ import ( "fmt" "time" - "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,6 +16,8 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" + + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) // JobsManager represents a test session running on a remote K8S cluster. diff --git a/test/e2e/cmd/run/run.go b/test/e2e/cmd/run/run.go index b465062cee..f87ef3405d 100644 --- a/test/e2e/cmd/run/run.go +++ b/test/e2e/cmd/run/run.go @@ -21,16 +21,17 @@ import ( "time" sprig "github.com/Masterminds/sprig/v3" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/retry" - "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/elastic/cloud-on-k8s/test/e2e/test/command" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/retry" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/command" ) const ( diff --git a/test/e2e/test/agent/builder.go b/test/e2e/test/agent/builder.go index f17212407c..a88afc4786 100644 --- a/test/e2e/test/agent/builder.go +++ b/test/e2e/test/agent/builder.go @@ -8,13 +8,6 @@ import ( "fmt" "testing" - agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" - "github.com/elastic/cloud-on-k8s/test/e2e/test" ghodssyaml "github.com/ghodss/yaml" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" @@ -23,6 +16,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) const ( diff --git a/test/e2e/test/agent/steps.go b/test/e2e/test/agent/steps.go index 4603271203..eaff7b784d 100644 --- a/test/e2e/test/agent/steps.go +++ b/test/e2e/test/agent/steps.go @@ -10,6 +10,12 @@ import ( "reflect" "testing" + "github.com/pkg/errors" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" @@ -17,11 +23,6 @@ import ( "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" - "github.com/pkg/errors" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) func (b Builder) InitTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/apmserver/builder.go b/test/e2e/test/apmserver/builder.go index b9a9f36a80..f2f7bc37ad 100644 --- a/test/e2e/test/apmserver/builder.go +++ b/test/e2e/test/apmserver/builder.go @@ -5,16 +5,17 @@ package apmserver import ( - apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" - commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" - "github.com/elastic/cloud-on-k8s/test/e2e/test" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" + + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) // Builder to create APM Servers diff --git a/test/e2e/test/apmserver/checks_apm.go b/test/e2e/test/apmserver/checks_apm.go index 87a8c42f1b..fa07491d57 100644 --- a/test/e2e/test/apmserver/checks_apm.go +++ b/test/e2e/test/apmserver/checks_apm.go @@ -14,6 +14,10 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "k8s.io/apimachinery/pkg/types" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" @@ -23,9 +27,6 @@ import ( "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/elastic/cloud-on-k8s/test/e2e/test/kibana" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/types" ) type apmClusterChecks struct { diff --git a/test/e2e/test/apmserver/steps_creation.go b/test/e2e/test/apmserver/steps_creation.go index de6f002102..912ff74d84 100644 --- a/test/e2e/test/apmserver/steps_creation.go +++ b/test/e2e/test/apmserver/steps_creation.go @@ -8,10 +8,11 @@ import ( "context" "fmt" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) func (b Builder) CreationTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/apmserver/steps_deletion.go b/test/e2e/test/apmserver/steps_deletion.go index 9a216d7d8b..8926ba25af 100644 --- a/test/e2e/test/apmserver/steps_deletion.go +++ b/test/e2e/test/apmserver/steps_deletion.go @@ -7,13 +7,14 @@ package apmserver import ( "context" + "github.com/pkg/errors" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/pkg/errors" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) func (b Builder) DeletionTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/apmserver/steps_init.go b/test/e2e/test/apmserver/steps_init.go index fb9e8742dd..fcf25ae5da 100644 --- a/test/e2e/test/apmserver/steps_init.go +++ b/test/e2e/test/apmserver/steps_init.go @@ -7,11 +7,12 @@ package apmserver import ( "context" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" ) func (b Builder) InitTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/beat/builder.go b/test/e2e/test/beat/builder.go index 8970390c02..7fa2dee18b 100644 --- a/test/e2e/test/beat/builder.go +++ b/test/e2e/test/beat/builder.go @@ -15,6 +15,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + "github.com/stretchr/testify/require" + k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" beatcommon "github.com/elastic/cloud-on-k8s/pkg/controller/beat/common" @@ -23,8 +26,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/require" - k8sclient "sigs.k8s.io/controller-runtime/pkg/client" ) const ( diff --git a/test/e2e/test/beat/pod_builder.go b/test/e2e/test/beat/pod_builder.go index 8a107ce172..f79fe544bc 100644 --- a/test/e2e/test/beat/pod_builder.go +++ b/test/e2e/test/beat/pod_builder.go @@ -8,9 +8,6 @@ import ( "context" "fmt" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" - "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -18,6 +15,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) // Builder to create a Pod. It can be used as a source of logging/metric data for Beat (deployed separately) to collect. diff --git a/test/e2e/test/beat/steps.go b/test/e2e/test/beat/steps.go index e3da8ab782..2d6c08287e 100644 --- a/test/e2e/test/beat/steps.go +++ b/test/e2e/test/beat/steps.go @@ -8,6 +8,10 @@ import ( "context" "fmt" + "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" @@ -15,9 +19,6 @@ import ( "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" ) func (b Builder) InitTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/checks/common.go b/test/e2e/test/checks/common.go index cf0ea6fd86..8481907187 100644 --- a/test/e2e/test/checks/common.go +++ b/test/e2e/test/checks/common.go @@ -8,13 +8,14 @@ import ( "context" "fmt" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/test/e2e/test" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) // CheckDeployment checks the Deployment resource exists diff --git a/test/e2e/test/checks/monitoring.go b/test/e2e/test/checks/monitoring.go index 132f48b9e8..9fe232421f 100644 --- a/test/e2e/test/checks/monitoring.go +++ b/test/e2e/test/checks/monitoring.go @@ -12,12 +12,13 @@ import ( "net/http" "strconv" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" esClient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" - "k8s.io/apimachinery/pkg/types" ) type Monitored interface { diff --git a/test/e2e/test/common_steps.go b/test/e2e/test/common_steps.go index 477bc1bf49..254080eb87 100644 --- a/test/e2e/test/common_steps.go +++ b/test/e2e/test/common_steps.go @@ -9,15 +9,15 @@ import ( "io/ioutil" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" - corev1 "k8s.io/api/core/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" ) func AnnotatePodsWithBuilderHash(subj, prev Subject, k *K8sClient) StepList { diff --git a/test/e2e/test/context.go b/test/e2e/test/context.go index c94cba672b..241c5c314c 100644 --- a/test/e2e/test/context.go +++ b/test/e2e/test/context.go @@ -12,11 +12,12 @@ import ( "sync" "time" + "github.com/go-logr/logr" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" logutil "github.com/elastic/cloud-on-k8s/pkg/utils/log" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" - "github.com/go-logr/logr" - logf "sigs.k8s.io/controller-runtime/pkg/log" ) const ( diff --git a/test/e2e/test/default.go b/test/e2e/test/default.go index 9ab3605430..df701ddff0 100644 --- a/test/e2e/test/default.go +++ b/test/e2e/test/default.go @@ -5,8 +5,9 @@ package test import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" corev1 "k8s.io/api/core/v1" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) // DefaultSecurityContext returns a minimalist, restricted, security context. diff --git a/test/e2e/test/elasticsearch/builder.go b/test/e2e/test/elasticsearch/builder.go index 1130da9dc9..8eddff86c5 100644 --- a/test/e2e/test/elasticsearch/builder.go +++ b/test/e2e/test/elasticsearch/builder.go @@ -8,6 +8,13 @@ import ( "fmt" "reflect" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" + "sigs.k8s.io/controller-runtime/pkg/client" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" @@ -15,12 +22,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/pointer" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/rand" - "sigs.k8s.io/controller-runtime/pkg/client" ) const ( diff --git a/test/e2e/test/elasticsearch/checks_budget.go b/test/e2e/test/elasticsearch/checks_budget.go index 9098b95957..dfe68beff6 100644 --- a/test/e2e/test/elasticsearch/checks_budget.go +++ b/test/e2e/test/elasticsearch/checks_budget.go @@ -9,11 +9,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/assert" ) // NewMasterChangeBudgetWatcher returns a watcher that checks whether at most one master pod at a time is added/removed. diff --git a/test/e2e/test/elasticsearch/checks_data.go b/test/e2e/test/elasticsearch/checks_data.go index c26bfa4037..b549a2f8d3 100644 --- a/test/e2e/test/elasticsearch/checks_data.go +++ b/test/e2e/test/elasticsearch/checks_data.go @@ -14,9 +14,10 @@ import ( "net/http" "strings" + "github.com/go-test/deep" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/go-test/deep" ) const ( diff --git a/test/e2e/test/elasticsearch/checks_es.go b/test/e2e/test/elasticsearch/checks_es.go index 0edb341769..e85fbb7196 100644 --- a/test/e2e/test/elasticsearch/checks_es.go +++ b/test/e2e/test/elasticsearch/checks_es.go @@ -10,11 +10,12 @@ import ( "strconv" "strings" + "k8s.io/apimachinery/pkg/api/resource" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "k8s.io/apimachinery/pkg/api/resource" ) type esClusterChecks struct { diff --git a/test/e2e/test/elasticsearch/checks_k8s.go b/test/e2e/test/elasticsearch/checks_k8s.go index 1b010b4b3e..55be0ceb43 100644 --- a/test/e2e/test/elasticsearch/checks_k8s.go +++ b/test/e2e/test/elasticsearch/checks_k8s.go @@ -14,6 +14,10 @@ import ( "sort" "time" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" @@ -23,9 +27,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" ) const ( diff --git a/test/e2e/test/elasticsearch/checks_keystore.go b/test/e2e/test/elasticsearch/checks_keystore.go index b9c7fe3577..00632e40f0 100644 --- a/test/e2e/test/elasticsearch/checks_keystore.go +++ b/test/e2e/test/elasticsearch/checks_keystore.go @@ -9,11 +9,12 @@ import ( "reflect" "strings" + "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/initcontainer" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" ) func CheckESKeystoreEntries(k *test.K8sClient, b Builder, expectedKeys []string) test.Step { diff --git a/test/e2e/test/elasticsearch/checks_reversal.go b/test/e2e/test/elasticsearch/checks_reversal.go index ff8144f369..01b6d29c53 100644 --- a/test/e2e/test/elasticsearch/checks_reversal.go +++ b/test/e2e/test/elasticsearch/checks_reversal.go @@ -8,10 +8,11 @@ import ( "errors" "testing" + "github.com/stretchr/testify/require" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/require" ) func (b Builder) MutationReversalTestContext() test.ReversalTestContext { diff --git a/test/e2e/test/elasticsearch/checks_transport.go b/test/e2e/test/elasticsearch/checks_transport.go index c1cb8aa6d4..4a92ebc9ce 100644 --- a/test/e2e/test/elasticsearch/checks_transport.go +++ b/test/e2e/test/elasticsearch/checks_transport.go @@ -13,14 +13,15 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/utils/cryptutil" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/types" ) // CheckTransportCACertificate attempts a TLS handshake to inspect the peer certificates presented by the Elasticsearch diff --git a/test/e2e/test/elasticsearch/checks_volume.go b/test/e2e/test/elasticsearch/checks_volume.go index 8dff437937..b8e166e863 100644 --- a/test/e2e/test/elasticsearch/checks_volume.go +++ b/test/e2e/test/elasticsearch/checks_volume.go @@ -7,10 +7,11 @@ package elasticsearch import ( "testing" + "github.com/stretchr/testify/require" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/require" ) func usesEmptyDir(es esv1.Elasticsearch) bool { diff --git a/test/e2e/test/elasticsearch/cluster_uuid.go b/test/e2e/test/elasticsearch/cluster_uuid.go index 2ae63199c1..6ceb13c8c9 100644 --- a/test/e2e/test/elasticsearch/cluster_uuid.go +++ b/test/e2e/test/elasticsearch/cluster_uuid.go @@ -9,9 +9,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/require" ) func clusterUUID(es esv1.Elasticsearch, k *test.K8sClient) (string, error) { diff --git a/test/e2e/test/elasticsearch/license_fixture.go b/test/e2e/test/elasticsearch/license_fixture.go index 36bfc865de..0175a17121 100644 --- a/test/e2e/test/elasticsearch/license_fixture.go +++ b/test/e2e/test/elasticsearch/license_fixture.go @@ -8,10 +8,11 @@ import ( "encoding/json" "time" + "github.com/google/uuid" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" - "github.com/google/uuid" ) type ESLicense struct { diff --git a/test/e2e/test/elasticsearch/steps_creation.go b/test/e2e/test/elasticsearch/steps_creation.go index a4ecf6b4b8..5b73170e24 100644 --- a/test/e2e/test/elasticsearch/steps_creation.go +++ b/test/e2e/test/elasticsearch/steps_creation.go @@ -8,10 +8,11 @@ import ( "context" "fmt" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) func (b Builder) CreationTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/elasticsearch/steps_deletion.go b/test/e2e/test/elasticsearch/steps_deletion.go index bd85b84b95..808a3c6156 100644 --- a/test/e2e/test/elasticsearch/steps_deletion.go +++ b/test/e2e/test/elasticsearch/steps_deletion.go @@ -8,16 +8,17 @@ import ( "context" "fmt" - esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) func (b Builder) DeletionTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/elasticsearch/steps_init.go b/test/e2e/test/elasticsearch/steps_init.go index d42da874fe..668eb69694 100644 --- a/test/e2e/test/elasticsearch/steps_init.go +++ b/test/e2e/test/elasticsearch/steps_init.go @@ -8,13 +8,14 @@ import ( "context" "fmt" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) const webhookServiceName = "elastic-webhook-server" diff --git a/test/e2e/test/elasticsearch/steps_license.go b/test/e2e/test/elasticsearch/steps_license.go index cbb3edf6a3..a44df5d226 100644 --- a/test/e2e/test/elasticsearch/steps_license.go +++ b/test/e2e/test/elasticsearch/steps_license.go @@ -11,17 +11,18 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common" "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) type LicenseTestContext struct { diff --git a/test/e2e/test/elasticsearch/steps_mutation.go b/test/e2e/test/elasticsearch/steps_mutation.go index 201ff7593b..99ab850395 100644 --- a/test/e2e/test/elasticsearch/steps_mutation.go +++ b/test/e2e/test/elasticsearch/steps_mutation.go @@ -11,14 +11,15 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - k8serrors "k8s.io/apimachinery/pkg/api/errors" ) const ( diff --git a/test/e2e/test/enterprisesearch/builder.go b/test/e2e/test/enterprisesearch/builder.go index b9dc4f781c..7a050559e7 100644 --- a/test/e2e/test/enterprisesearch/builder.go +++ b/test/e2e/test/enterprisesearch/builder.go @@ -6,17 +6,18 @@ package enterprisesearch import ( "github.com/blang/semver/v4" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" + "sigs.k8s.io/controller-runtime/pkg/client" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/rand" - "sigs.k8s.io/controller-runtime/pkg/client" ) var ( diff --git a/test/e2e/test/enterprisesearch/steps_creation.go b/test/e2e/test/enterprisesearch/steps_creation.go index 4ae169a0c1..e93f73ef98 100644 --- a/test/e2e/test/enterprisesearch/steps_creation.go +++ b/test/e2e/test/enterprisesearch/steps_creation.go @@ -8,10 +8,11 @@ import ( "context" "fmt" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) func (b Builder) CreationTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/enterprisesearch/steps_deletion.go b/test/e2e/test/enterprisesearch/steps_deletion.go index 33ed80b0c7..09213e6610 100644 --- a/test/e2e/test/enterprisesearch/steps_deletion.go +++ b/test/e2e/test/enterprisesearch/steps_deletion.go @@ -7,13 +7,14 @@ package enterprisesearch import ( "context" + "github.com/pkg/errors" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/pkg/errors" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) func (b Builder) DeletionTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/enterprisesearch/steps_init.go b/test/e2e/test/enterprisesearch/steps_init.go index 25f6d73d9e..3d226be866 100644 --- a/test/e2e/test/enterprisesearch/steps_init.go +++ b/test/e2e/test/enterprisesearch/steps_init.go @@ -7,11 +7,12 @@ package enterprisesearch import ( "context" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + entv1 "github.com/elastic/cloud-on-k8s/pkg/apis/enterprisesearch/v1" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" ) func (b Builder) InitTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/helper/yaml.go b/test/e2e/test/helper/yaml.go index 038dc4af62..1a3b669aae 100644 --- a/test/e2e/test/helper/yaml.go +++ b/test/e2e/test/helper/yaml.go @@ -16,6 +16,16 @@ import ( "strings" "testing" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + meta2 "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" + "k8s.io/apimachinery/pkg/util/yaml" + "sigs.k8s.io/controller-runtime/pkg/client" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" @@ -32,15 +42,6 @@ import ( "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/elastic/cloud-on-k8s/test/e2e/test/enterprisesearch" "github.com/elastic/cloud-on-k8s/test/e2e/test/kibana" - "github.com/stretchr/testify/require" - corev1 "k8s.io/api/core/v1" - rbacv1 "k8s.io/api/rbac/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - meta2 "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/apimachinery/pkg/util/yaml" - "sigs.k8s.io/controller-runtime/pkg/client" ) type BuilderTransform func(test.Builder) test.Builder diff --git a/test/e2e/test/k8s_client.go b/test/e2e/test/k8s_client.go index aad63077d9..1c8f74d856 100644 --- a/test/e2e/test/k8s_client.go +++ b/test/e2e/test/k8s_client.go @@ -11,6 +11,21 @@ import ( "fmt" "os" + "github.com/pkg/errors" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/version" + "k8s.io/client-go/discovery" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke + "k8s.io/client-go/tools/remotecommand" + k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/client/config" + agentv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/agent/v1alpha1" apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1" beatv1beta1 "github.com/elastic/cloud-on-k8s/pkg/apis/beat/v1beta1" @@ -28,20 +43,6 @@ import ( "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" "github.com/elastic/cloud-on-k8s/pkg/controller/maps" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/pkg/errors" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" - "k8s.io/client-go/discovery" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/kubernetes/scheme" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke - "k8s.io/client-go/tools/remotecommand" - k8sclient "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/client/config" ) type K8sClient struct { diff --git a/test/e2e/test/kibana/builder.go b/test/e2e/test/kibana/builder.go index b742eadd2d..62ea7157b0 100644 --- a/test/e2e/test/kibana/builder.go +++ b/test/e2e/test/kibana/builder.go @@ -7,17 +7,18 @@ package kibana import ( "fmt" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" + "sigs.k8s.io/controller-runtime/pkg/client" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/rand" - "sigs.k8s.io/controller-runtime/pkg/client" ) // Builder to create Kibana instances diff --git a/test/e2e/test/kibana/checks_kb.go b/test/e2e/test/kibana/checks_kb.go index c916c483c6..56c4a54411 100644 --- a/test/e2e/test/kibana/checks_kb.go +++ b/test/e2e/test/kibana/checks_kb.go @@ -8,9 +8,10 @@ import ( "encoding/json" "fmt" + "github.com/pkg/errors" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/pkg/errors" ) type kbChecks struct { diff --git a/test/e2e/test/kibana/steps_creation.go b/test/e2e/test/kibana/steps_creation.go index b1560c9d92..ac988ae564 100644 --- a/test/e2e/test/kibana/steps_creation.go +++ b/test/e2e/test/kibana/steps_creation.go @@ -8,10 +8,11 @@ import ( "context" "fmt" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) func (b Builder) CreationTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/kibana/steps_deletion.go b/test/e2e/test/kibana/steps_deletion.go index 50ef26ace9..49c1645481 100644 --- a/test/e2e/test/kibana/steps_deletion.go +++ b/test/e2e/test/kibana/steps_deletion.go @@ -7,13 +7,14 @@ package kibana import ( "context" + "github.com/pkg/errors" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/test" - "github.com/pkg/errors" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) func (b Builder) DeletionTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/kibana/steps_init.go b/test/e2e/test/kibana/steps_init.go index fe2c9e1455..3063108c76 100644 --- a/test/e2e/test/kibana/steps_init.go +++ b/test/e2e/test/kibana/steps_init.go @@ -7,11 +7,12 @@ package kibana import ( "context" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" ) func (b Builder) InitTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/maps/builder.go b/test/e2e/test/maps/builder.go index 35d3402254..b57b06d6e8 100644 --- a/test/e2e/test/maps/builder.go +++ b/test/e2e/test/maps/builder.go @@ -5,16 +5,17 @@ package maps import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" + "sigs.k8s.io/controller-runtime/pkg/client" + commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/rand" - "sigs.k8s.io/controller-runtime/pkg/client" ) type Builder struct { diff --git a/test/e2e/test/maps/steps.go b/test/e2e/test/maps/steps.go index d8dbaa5428..5fe1de7ee9 100644 --- a/test/e2e/test/maps/steps.go +++ b/test/e2e/test/maps/steps.go @@ -8,6 +8,10 @@ import ( "context" "fmt" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + emsv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/maps/v1alpha1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" "github.com/elastic/cloud-on-k8s/pkg/controller/maps" @@ -15,9 +19,6 @@ import ( "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/elastic/cloud-on-k8s/test/e2e/test/checks" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/types" ) func (b Builder) InitTestSteps(k *test.K8sClient) test.StepList { diff --git a/test/e2e/test/utils.go b/test/e2e/test/utils.go index ff3c347ab2..27039eda4f 100644 --- a/test/e2e/test/utils.go +++ b/test/e2e/test/utils.go @@ -13,13 +13,14 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/pkg/utils/retry" "github.com/pkg/errors" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/retry" ) const ( diff --git a/test/e2e/test/version_test.go b/test/e2e/test/version_test.go index dd1951abde..c3712d0d20 100644 --- a/test/e2e/test/version_test.go +++ b/test/e2e/test/version_test.go @@ -7,8 +7,9 @@ package test import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/stretchr/testify/require" + + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) func TestIsValidUpgrade(t *testing.T) {