From f9b202381279f8d6095396cc8105c01f8e8cfbb2 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 10:25:07 -0500 Subject: [PATCH 1/8] Move operators dir --- operators/Dockerfile => Dockerfile | 0 operators/Gopkg.lock => Gopkg.lock | 0 operators/Gopkg.toml => Gopkg.toml | 0 operators/Makefile => Makefile | 0 operators/PROJECT => PROJECT | 0 README.md | 2 + operators/VERSION => VERSION | 0 .../cmd => cmd}/license-initializer/main.go | 0 .../license-initializer/main_test.go | 0 .../license-initializer/testdata/expected.src | 0 .../license-initializer/testdata/test.key | Bin {operators/cmd => cmd}/main.go | 0 {operators/cmd => cmd}/manager/main.go | 0 config/all-in-one.yaml | 970 ++++++++++++++++++ .../crds/apm_v1alpha1_apmserver.yaml | 0 .../elasticsearch_v1alpha1_elasticsearch.yaml | 0 .../crds/kibana_v1alpha1_kibana.yaml | 0 .../config => config}/dev/elastic-psp.yaml | 0 .../dev/gke-default-storage.yaml | 0 .../config => config}/dev/registry.yaml | 0 .../config => config}/e2e/batch_job.yaml | 0 .../e2e/global_operator.yaml | 0 .../e2e/managed_namespaces.yaml | 0 .../e2e/namespace_operator.yaml | 0 .../e2e/operator_namespaces.yaml | 0 {operators/config => config}/e2e/rbac.yaml | 0 .../config => config}/operator/Makefile | 0 .../config => config}/operator/README.md | 0 .../all-in-one/cluster_role.template.yaml | 0 .../cluster_role_bindings.template.yaml | 0 .../all-in-one/namespace.template.yaml | 0 .../all-in-one/operator.template.yaml | 0 .../all-in-one/service_account.template.yaml | 0 .../global/cluster_role.template.yaml | 0 .../cluster_role_bindings.template.yaml | 0 .../operator/global/namespace.template.yaml | 0 .../operator/global/operator.template.yaml | 0 .../global/service_account.template.yaml | 0 .../namespace/cluster_role.template.yaml | 0 .../namespace/namespace.template.yaml | 0 .../operator/namespace/operator.template.yaml | 0 .../namespace/role_bindings.template.yaml | 0 .../namespace/service_account.template.yaml | 0 .../samples/apm/apm_es_kibana.yaml | 0 .../samples/apm/apmserver.yaml | 0 .../samples/elasticsearch/elasticsearch.yaml | 0 .../samples/kibana/kibana.yaml | 0 .../samples/kibana/kibana_es.yaml | 0 operators/dev-setup.md => dev-setup.md | 0 {operators/hack => hack}/boilerplate.go.txt | 0 {operators/hack => hack}/check-requisites.sh | 0 {operators/hack => hack}/deployer/README.md | 0 .../hack => hack}/deployer/cmd/create.go | 0 .../hack => hack}/deployer/cmd/execute.go | 0 {operators/hack => hack}/deployer/cmd/get.go | 0 {operators/hack => hack}/deployer/cmd/root.go | 0 .../hack => hack}/deployer/config/plans.yml | 0 {operators/hack => hack}/deployer/main.go | 0 .../hack => hack}/deployer/runner/aks.go | 0 .../hack => hack}/deployer/runner/command.go | 0 .../hack => hack}/deployer/runner/driver.go | 0 .../hack => hack}/deployer/runner/gke.go | 0 .../hack => hack}/deployer/runner/settings.go | 0 .../hack => hack}/deployer/runner/vault.go | 0 {operators/hack => hack}/eck-dump.sh | 0 {operators/hack => hack}/minikube-cluster.sh | 0 {operators/hack => hack}/registry.sh | 0 {operators/hack => hack}/release_notes.go | 0 .../hack => hack}/release_notes_test.go | 0 .../hack => hack}/update-doc-stack-version.sh | 0 operators/README.md | 7 - {operators/pkg => pkg}/about/base.go | 0 {operators/pkg => pkg}/about/info.go | 0 {operators/pkg => pkg}/about/info_test.go | 0 .../apis/addtoscheme_apm_v1alpha1.go | 0 .../apis/addtoscheme_associations_v1alpha1.go | 0 .../apis/addtoscheme_common_v1alpha1.go | 0 .../addtoscheme_elasticsearch_v1alpha1.go | 0 .../apis/addtoscheme_kibana_v1alpha1.go | 0 {operators/pkg => pkg}/apis/apis.go | 0 {operators/pkg => pkg}/apis/apm/group.go | 0 .../apis/apm/v1alpha1/apmserver_types.go | 0 .../pkg => pkg}/apis/apm/v1alpha1/doc.go | 0 .../pkg => pkg}/apis/apm/v1alpha1/register.go | 0 .../apm/v1alpha1/zz_generated.deepcopy.go | 0 .../pkg => pkg}/apis/associations/group.go | 0 .../apis/associations/v1alpha1/doc.go | 0 .../apis/associations/v1alpha1/register.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 {operators/pkg => pkg}/apis/common/group.go | 0 .../apis/common/v1alpha1/association.go | 0 .../apis/common/v1alpha1/authentication.go | 0 .../apis/common/v1alpha1/common.go | 0 .../apis/common/v1alpha1/common_test.go | 0 .../apis/common/v1alpha1/config.go | 0 .../apis/common/v1alpha1/config_test.go | 0 .../pkg => pkg}/apis/common/v1alpha1/doc.go | 0 .../apis/common/v1alpha1/feature_flags.go | 0 .../common/v1alpha1/feature_flags_test.go | 0 .../apis/common/v1alpha1/register.go | 0 .../common/v1alpha1/zz_generated.deepcopy.go | 0 .../pkg => pkg}/apis/elasticsearch/group.go | 0 .../apis/elasticsearch/v1alpha1/doc.go | 0 .../v1alpha1/elasticsearch_config.go | 0 .../v1alpha1/elasticsearch_config_test.go | 0 .../v1alpha1/elasticsearch_types.go | 0 .../v1alpha1/elasticsearch_types_test.go | 0 .../apis/elasticsearch/v1alpha1/register.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 {operators/pkg => pkg}/apis/kibana/group.go | 0 .../pkg => pkg}/apis/kibana/v1alpha1/doc.go | 0 .../apis/kibana/v1alpha1/kibana_types.go | 0 .../apis/kibana/v1alpha1/kibana_types_test.go | 0 .../apis/kibana/v1alpha1/register.go | 0 .../kibana/v1alpha1/zz_generated.deepcopy.go | 0 .../pkg => pkg}/controller/add_apmserver.go | 0 .../add_apmserverelasticsearchassociation.go | 0 .../pkg => pkg}/controller/add_association.go | 0 .../controller/add_elasticsearch.go | 0 .../pkg => pkg}/controller/add_kibana.go | 0 .../pkg => pkg}/controller/add_license.go | 0 .../apmserver/apmserver_controller.go | 0 .../apmserver/apmserver_controller_test.go | 0 .../apmserver/certificates/reconcile.go | 0 .../controller/apmserver/config/config.go | 0 .../controller/apmserver/config/reconcile.go | 0 .../apmserver/deployment_control.go | 0 .../controller/apmserver/labels/labels.go | 0 .../controller/apmserver/name/name.go | 0 .../pkg => pkg}/controller/apmserver/pod.go | 0 .../controller/apmserver/pod_test.go | 0 .../controller/apmserver/services.go | 0 .../pkg => pkg}/controller/apmserver/state.go | 0 ...rverelasticsearchassociation_controller.go | 0 ...lasticsearchassociation_controller_test.go | 0 .../labels.go | 0 .../common/annotation/association_status.go | 0 .../common/annotation/controller_version.go | 0 .../annotation/controller_version_test.go | 0 .../controller/common/annotation/pod.go | 0 .../controller/common/annotation/pod_test.go | 0 .../common/association/association.go | 0 .../common/association/association_test.go | 0 .../controller/common/association/user.go | 0 .../common/association/user_test.go | 0 .../controller/common/certificates/ca.go | 0 .../common/certificates/ca_reconcile.go | 0 .../common/certificates/ca_reconcile_test.go | 0 .../controller/common/certificates/ca_test.go | 0 .../common/certificates/expiration.go | 0 .../common/certificates/expiration_test.go | 0 .../controller/common/certificates/fields.go | 0 .../certificates/http/certificates_secret.go | 0 .../http/certificates_secret_test.go | 0 .../certificates/http/dynamic_watches.go | 0 .../common/certificates/http/public_secret.go | 0 .../certificates/http/public_secret_test.go | 0 .../common/certificates/http/reconcile.go | 0 .../certificates/http/reconcile_test.go | 0 .../common/certificates/http/testdata/ca.crt | 0 .../certificates/http/testdata/chain.crt | 0 .../certificates/http/testdata/corrupted.key | 0 .../common/certificates/http/testdata/tls.crt | 0 .../common/certificates/http/testdata/tls.key | 0 .../common/certificates/http/volume.go | 0 .../controller/common/certificates/keys.go | 0 .../common/certificates/keys_test.go | 0 .../controller/common/certificates/name.go | 0 .../controller/common/certificates/pem.go | 0 .../common/certificates/x509_othername.go | 0 .../certificates/x509_othername_test.go | 0 .../controller/common/defaults/labels.go | 0 .../controller/common/defaults/labels_test.go | 0 .../common/defaults/pod_template.go | 0 .../common/defaults/pod_template_test.go | 0 .../controller/common/defaults/pvc.go | 0 .../controller/common/defaults/pvc_test.go | 0 .../controller/common/defaults/service.go | 0 .../common/defaults/service_test.go | 0 .../controller/common/events/events.go | 0 .../controller/common/finalizer/handler.go | 0 .../common/finalizer/handler_test.go | 0 .../controller/common/hash/hash.go | 0 .../controller/common/hash/hash_test.go | 0 .../pkg => pkg}/controller/common/int.go | 0 .../common/keystore/initcontainer.go | 0 .../controller/common/keystore/resources.go | 0 .../common/keystore/resources_test.go | 0 .../controller/common/keystore/user_secret.go | 0 .../common/keystore/user_secret_test.go | 0 .../controller/common/keystore/volumes.go | 0 .../pkg => pkg}/controller/common/labels.go | 0 .../controller/common/labels_test.go | 0 .../controller/common/license/check.go | 0 .../controller/common/license/check_test.go | 0 .../controller/common/license/crud.go | 0 .../controller/common/license/detection.go | 0 .../common/license/detection_test.go | 0 .../common/license/fixtures_test.go | 0 .../controller/common/license/labels.go | 0 .../controller/common/license/license.go | 0 .../controller/common/license/match.go | 0 .../controller/common/license/match_test.go | 0 .../controller/common/license/model.go | 0 .../controller/common/license/model_test.go | 0 .../controller/common/license/parser.go | 0 .../controller/common/license/parser_test.go | 0 .../controller/common/license/pubkey.go | 0 .../controller/common/license/pubkey_dev.go | 0 .../common/license/testdata/test-error.json | 0 .../common/license/testdata/test-license.json | 0 .../controller/common/license/trial.go | 0 .../controller/common/license/trial_test.go | 0 .../controller/common/license/verifier.go | 0 .../common/license/verifier_test.go | 0 .../controller/common/license/watches.go | 0 .../controller/common/name/name.go | 0 .../controller/common/name/name_test.go | 0 .../controller/common/operator/const.go | 0 .../controller/common/operator/parameters.go | 0 .../controller/common/operator/roles.go | 0 .../controller/common/operator/roles_test.go | 0 .../pkg => pkg}/controller/common/pause.go | 0 .../controller/common/pause_test.go | 0 .../pkg => pkg}/controller/common/pod/spec.go | 0 .../common/reconciler/expectations.go | 0 .../common/reconciler/expectations_test.go | 0 .../controller/common/reconciler/handler.go | 0 .../common/reconciler/reconciler.go | 0 .../common/reconciler/reconciler_test.go | 0 .../controller/common/reconciler/results.go | 0 .../common/reconciler/results_test.go | 0 .../controller/common/service_control.go | 0 .../controller/common/service_control_test.go | 0 .../common/settings/canonical_config.go | 0 .../common/settings/canonical_config_test.go | 0 .../controller/common/user/external.go | 0 .../controller/common/user/external_test.go | 0 .../controller/common/user/finalizer.go | 0 .../controller/common/user/label.go | 0 .../controller/common/user/user.go | 0 .../controller/common/user/utils.go | 0 .../common/validation/validation.go | 0 .../controller/common/version/version.go | 0 .../controller/common/version/version_test.go | 0 .../controller/common/volume/configmap.go | 0 .../controller/common/volume/emptydir.go | 0 .../controller/common/volume/emptydir_test.go | 0 .../controller/common/volume/secret.go | 0 .../controller/common/volume/secret_test.go | 0 .../controller/common/volume/volume.go | 0 .../controller/common/watches/handler.go | 0 .../watches/handler_integration_test.go | 0 .../controller/common/watches/handler_test.go | 0 .../controller/common/watches/named_watch.go | 0 .../controller/common/watches/owner_watch.go | 0 .../controller/common/watches/state.go | 0 .../pkg => pkg}/controller/controller.go | 0 .../certificates/ca_reconcile.go | 0 .../elasticsearch/certificates/doc.go | 0 .../certificates/transport/csr.go | 0 .../certificates/transport/csr_test.go | 0 .../certificates/transport/doc.go | 0 .../certificates/transport/pod_secret.go | 0 .../certificates/transport/pod_secret_test.go | 0 .../certificates/transport/public_secret.go | 0 .../transport/public_secret_test.go | 0 .../certificates/transport/reconcile.go | 0 .../certificates/transport/reconcile_test.go | 0 .../transport/transport_fixtures_test.go | 0 .../elasticsearch/cleanup/resources.go | 0 .../elasticsearch/cleanup/resources_test.go | 0 .../controller/elasticsearch/client/base.go | 0 .../controller/elasticsearch/client/client.go | 0 .../elasticsearch/client/client_test.go | 0 .../controller/elasticsearch/client/mock.go | 0 .../controller/elasticsearch/client/model.go | 0 .../elasticsearch/client/model_test.go | 0 .../client/test_fixtures/cluster_state.go | 0 .../client/test_fixtures/errors.go | 0 .../client/test_fixtures/health.go | 0 .../client/test_fixtures/info.go | 0 .../client/test_fixtures/license.go | 0 .../client/test_fixtures/nodes.go | 0 .../client/test_fixtures/nodes_stats.go | 0 .../controller/elasticsearch/client/v6.go | 0 .../controller/elasticsearch/client/v7.go | 0 .../elasticsearch/configmap/configmap.go | 0 .../configmap/configmap_control.go | 0 .../elasticsearch/driver/downscale.go | 0 .../driver/downscale_invariants.go | 0 .../driver/downscale_invariants_test.go | 0 .../elasticsearch/driver/downscale_test.go | 0 .../elasticsearch/driver/downscale_utils.go | 0 .../driver/downscale_utils_test.go | 0 .../controller/elasticsearch/driver/driver.go | 0 .../elasticsearch/driver/esstate.go | 0 .../controller/elasticsearch/driver/log.go | 0 .../controller/elasticsearch/driver/nodes.go | 0 .../elasticsearch/driver/nodes_test.go | 0 .../elasticsearch/driver/upgrade.go | 0 .../elasticsearch/driver/upgrade_test.go | 0 .../elasticsearch/driver/upscale.go | 0 .../elasticsearch/driver/upscale_test.go | 0 .../elasticsearch/elasticsearch_controller.go | 0 .../initcontainer/initcontainer.go | 0 .../initcontainer/initcontainer_test.go | 0 .../elasticsearch/initcontainer/keystore.go | 0 .../initcontainer/linked_files.go | 0 .../initcontainer/os_settings.go | 0 .../elasticsearch/initcontainer/prepare_fs.go | 0 .../initcontainer/prepare_fs_script.go | 0 .../initcontainer/prepare_fs_script_test.go | 0 .../initcontainer/shared_volumes.go | 0 .../controller/elasticsearch/label/label.go | 0 .../elasticsearch/label/label_test.go | 0 .../controller/elasticsearch/license/apply.go | 0 .../elasticsearch/license/apply_test.go | 0 .../elasticsearch/license/reconcile.go | 0 .../elasticsearch/migration/migrate_data.go | 0 .../migration/migrate_data_test.go | 0 .../controller/elasticsearch/name/name.go | 0 .../controller/elasticsearch/network/ports.go | 0 .../elasticsearch/nodespec/defaults.go | 0 .../elasticsearch/nodespec/fixtures.go | 0 .../elasticsearch/nodespec/podspec.go | 0 .../elasticsearch/nodespec/podspec_test.go | 0 .../elasticsearch/nodespec/readiness_probe.go | 0 .../elasticsearch/nodespec/resources.go | 0 .../elasticsearch/nodespec/resources_test.go | 0 .../elasticsearch/nodespec/statefulset.go | 0 .../elasticsearch/nodespec/volumes.go | 0 .../elasticsearch/observer/finalizer.go | 0 .../elasticsearch/observer/manager.go | 0 .../elasticsearch/observer/manager_test.go | 0 .../elasticsearch/observer/observer.go | 0 .../elasticsearch/observer/observer_test.go | 0 .../elasticsearch/observer/state.go | 0 .../elasticsearch/observer/state_test.go | 0 .../elasticsearch/observer/watch.go | 0 .../elasticsearch/observer/watch_test.go | 0 .../controller/elasticsearch/pdb/reconcile.go | 0 .../elasticsearch/pdb/reconcile_test.go | 0 .../reconcile/resources_state.go | 0 .../elasticsearch/reconcile/state.go | 0 .../elasticsearch/reconcile/state_test.go | 0 .../elasticsearch/services/services.go | 0 .../elasticsearch/services/services_test.go | 0 .../settings/canonical_config.go | 0 .../elasticsearch/settings/config_volume.go | 0 .../settings/config_volume_test.go | 0 .../elasticsearch/settings/environment.go | 0 .../elasticsearch/settings/fields.go | 0 .../elasticsearch/settings/masters.go | 0 .../elasticsearch/settings/masters_test.go | 0 .../elasticsearch/settings/merged_config.go | 0 .../elasticsearch/settings/secure_settings.go | 0 .../settings/secure_settings_test.go | 0 .../elasticsearch/settings/settings.go | 0 .../controller/elasticsearch/sset/getter.go | 0 .../elasticsearch/sset/getter_test.go | 0 .../controller/elasticsearch/sset/list.go | 0 .../elasticsearch/sset/list_test.go | 0 .../controller/elasticsearch/sset/pod.go | 0 .../controller/elasticsearch/sset/pod_test.go | 0 .../elasticsearch/sset/reconcile.go | 0 .../elasticsearch/sset/reconcile_test.go | 0 .../elasticsearch/user/credentials.go | 0 .../elasticsearch/user/credentials_test.go | 0 .../elasticsearch/user/predefined_users.go | 0 .../user/predefined_users_test.go | 0 .../elasticsearch/user/reconciler.go | 0 .../elasticsearch/user/reconciler_test.go | 0 .../controller/elasticsearch/user/user.go | 0 .../validation/upgrade_checks.go | 0 .../validation/upgrade_checks_test.go | 0 .../elasticsearch/validation/validation.go | 0 .../validation/validation_test.go | 0 .../elasticsearch/validation/validations.go | 0 .../validation/validations_test.go | 0 .../elasticsearch/version/running_versions.go | 0 .../version/running_versions_test.go | 0 .../version/supported_versions.go | 0 .../version/supported_versions_test.go | 0 .../version/zen1/compatibility.go | 0 .../version/zen1/compatibility_test.go | 0 .../version/zen1/minimum_masters.go | 0 .../version/zen1/minimum_masters_test.go | 0 .../version/zen2/compatibility.go | 0 .../version/zen2/compatibility_test.go | 0 .../version/zen2/initial_master_nodes.go | 0 .../version/zen2/initial_master_nodes_test.go | 0 .../version/zen2/voting_exclusions.go | 0 .../version/zen2/voting_exclusions_test.go | 0 .../elasticsearch/volume/defaults.go | 0 .../controller/elasticsearch/volume/names.go | 0 .../kibana/certificates/reconcile.go | 0 .../controller/kibana/config/fields.go | 0 .../controller/kibana/config/reconciler.go | 0 .../kibana/config/reconciler_test.go | 0 .../controller/kibana/config/secret_volume.go | 0 .../controller/kibana/config/settings.go | 0 .../controller/kibana/config/settings_test.go | 0 .../controller/kibana/config/telemetry.go | 0 .../controller/kibana/deployment_control.go | 0 .../kibana/deployment_control_test.go | 0 .../pkg => pkg}/controller/kibana/driver.go | 0 .../controller/kibana/driver_test.go | 0 .../controller/kibana/es/secret.go | 0 .../controller/kibana/kibana_controller.go | 0 .../controller/kibana/label/labels.go | 0 .../controller/kibana/name/name.go | 0 .../controller/kibana/name/name_test.go | 0 .../pkg => pkg}/controller/kibana/pod/pod.go | 0 .../controller/kibana/pod/pod_test.go | 0 .../pkg => pkg}/controller/kibana/services.go | 0 .../pkg => pkg}/controller/kibana/state.go | 0 .../kibana/version/version6/settings.go | 0 .../kibana/version/version7/settings.go | 0 .../controller/kibana/volume/volumes.go | 0 .../association_controller.go | 0 .../association_controller_test.go | 0 .../controller/kibanaassociation/ca.go | 0 .../controller/kibanaassociation/ca_test.go | 0 .../controller/kibanaassociation/labels.go | 0 .../controller/kibanaassociation/watch.go | 0 .../controller/license/license_controller.go | 0 .../license_controller_integration_test.go | 0 .../license/license_controller_test.go | 0 .../pkg => pkg}/controller/license/list.go | 0 .../controller/license/list_test.go | 0 .../license/trial/trial_controller.go | 0 .../trial_controller_integration_test.go | 0 .../license/validation/validations.go | 0 .../license/validation/validations_test.go | 0 {operators/pkg => pkg}/dev/mode.go | 0 .../dev/portforward/client_portforward.go | 0 .../pkg => pkg}/dev/portforward/dialer.go | 0 .../dev/portforward/dialer_test.go | 0 {operators/pkg => pkg}/dev/portforward/doc.go | 0 .../dev/portforward/forwarder_store.go | 0 .../dev/portforward/pod_forwarder.go | 0 .../dev/portforward/pod_forwarder_test.go | 0 .../dev/portforward/service_forwarder.go | 0 .../dev/portforward/service_forwarder_test.go | 0 {operators/pkg => pkg}/utils/chrono/millis.go | 0 .../pkg => pkg}/utils/chrono/millis.test.go | 0 .../pkg => pkg}/utils/cryptutil/tls_verify.go | 0 {operators/pkg => pkg}/utils/diff/diff.go | 0 {operators/pkg => pkg}/utils/k8s/client.go | 0 .../pkg => pkg}/utils/k8s/client_test.go | 0 {operators/pkg => pkg}/utils/k8s/k8sutils.go | 0 .../pkg => pkg}/utils/k8s/k8sutils_test.go | 0 {operators/pkg => pkg}/utils/maps/maps.go | 0 .../pkg => pkg}/utils/maps/maps_test.go | 0 {operators/pkg => pkg}/utils/net/dialer.go | 0 {operators/pkg => pkg}/utils/net/ip.go | 0 {operators/pkg => pkg}/utils/net/port.go | 0 {operators/pkg => pkg}/utils/retry/retry.go | 0 .../pkg => pkg}/utils/retry/retry_test.go | 0 {operators/pkg => pkg}/utils/set/set.go | 0 {operators/pkg => pkg}/utils/set/set_test.go | 0 .../pkg => pkg}/utils/stringsutil/strings.go | 0 .../utils/stringsutil/strings_test.go | 0 .../pkg => pkg}/utils/test/integration.go | 0 {operators/pkg => pkg}/utils/test/retry.go | 0 .../pkg => pkg}/webhook/add_validations.go | 0 .../webhook/elasticsearch/handler.go | 0 .../webhook/elasticsearch/handler_test.go | 0 .../pkg => pkg}/webhook/license/handler.go | 0 .../webhook/license/handler_test.go | 0 {operators/pkg => pkg}/webhook/params.go | 0 {operators/pkg => pkg}/webhook/server.go | 0 {operators/pkg => pkg}/webhook/webhook.go | 0 {operators/test => test}/e2e/Dockerfile | 0 .../test => test}/e2e/apm/association_test.go | 0 .../e2e/apm/configuration_test.go | 0 .../test => test}/e2e/apm/sample_test.go | 0 .../test => test}/e2e/apm/standalone_test.go | 0 {operators/test => test}/e2e/cmd/main.go | 0 .../test => test}/e2e/cmd/run/command.go | 0 .../test => test}/e2e/cmd/run/eventlog.go | 0 {operators/test => test}/e2e/cmd/run/run.go | 0 {operators/test => test}/e2e/es/certs_test.go | 0 .../test => test}/e2e/es/failure_test.go | 0 .../test => test}/e2e/es/keystore_test.go | 0 .../test => test}/e2e/es/license_test.go | 0 .../test => test}/e2e/es/mutation_test.go | 0 .../test => test}/e2e/es/podtemplate_test.go | 0 .../test => test}/e2e/es/reversal_test.go | 0 .../test => test}/e2e/es/volume_test.go | 0 .../test => test}/e2e/kb/association_test.go | 0 .../test => test}/e2e/kb/failure_test.go | 0 .../test => test}/e2e/kb/keystore_test.go | 0 .../test => test}/e2e/kb/resource_test.go | 0 .../test => test}/e2e/kb/sample_test.go | 0 .../test => test}/e2e/kb/telemetry_test.go | 0 {operators/test => test}/e2e/run.sh | 0 {operators/test => test}/e2e/samples.go | 0 {operators/test => test}/e2e/smoke_test.go | 0 .../e2e/test/apmserver/builder.go | 0 .../e2e/test/apmserver/checks_apm.go | 0 .../e2e/test/apmserver/checks_k8s.go | 0 .../e2e/test/apmserver/http_client.go | 0 .../e2e/test/apmserver/steps_creation.go | 0 .../e2e/test/apmserver/steps_deletion.go | 0 .../e2e/test/apmserver/steps_init.go | 0 .../e2e/test/apmserver/steps_mutation.go | 0 {operators/test => test}/e2e/test/builder.go | 0 {operators/test => test}/e2e/test/checks.go | 0 .../test => test}/e2e/test/command/command.go | 0 .../test => test}/e2e/test/command/kubectl.go | 0 {operators/test => test}/e2e/test/context.go | 0 {operators/test => test}/e2e/test/default.go | 0 .../e2e/test/elasticsearch/builder.go | 0 .../e2e/test/elasticsearch/checks_data.go | 0 .../e2e/test/elasticsearch/checks_es.go | 0 .../e2e/test/elasticsearch/checks_k8s.go | 0 .../e2e/test/elasticsearch/checks_keystore.go | 0 .../e2e/test/elasticsearch/checks_reversal.go | 0 .../e2e/test/elasticsearch/checks_volume.go | 0 .../e2e/test/elasticsearch/cluster_uuid.go | 0 .../e2e/test/elasticsearch/default.go | 0 .../e2e/test/elasticsearch/http_client.go | 0 .../e2e/test/elasticsearch/pause.go | 0 .../e2e/test/elasticsearch/steps_creation.go | 0 .../e2e/test/elasticsearch/steps_deletion.go | 0 .../e2e/test/elasticsearch/steps_init.go | 0 .../e2e/test/elasticsearch/steps_license.go | 0 .../e2e/test/elasticsearch/steps_mutation.go | 0 .../test => test}/e2e/test/http_client.go | 0 .../test => test}/e2e/test/k8s_client.go | 0 .../test => test}/e2e/test/kibana/builder.go | 0 .../e2e/test/kibana/checks_k8s.go | 0 .../e2e/test/kibana/checks_kb.go | 0 .../e2e/test/kibana/http_client.go | 0 .../e2e/test/kibana/steps_creation.go | 0 .../e2e/test/kibana/steps_deletion.go | 0 .../e2e/test/kibana/steps_init.go | 0 .../e2e/test/kibana/steps_mutation.go | 0 {operators/test => test}/e2e/test/run.go | 0 .../test => test}/e2e/test/run_failure.go | 0 .../test => test}/e2e/test/run_mutation.go | 0 .../test => test}/e2e/test/run_reversal.go | 0 {operators/test => test}/e2e/test/step.go | 0 {operators/test => test}/e2e/test/utils.go | 0 {operators/test => test}/e2e/test/version.go | 0 547 files changed, 972 insertions(+), 7 deletions(-) rename operators/Dockerfile => Dockerfile (100%) rename operators/Gopkg.lock => Gopkg.lock (100%) rename operators/Gopkg.toml => Gopkg.toml (100%) rename operators/Makefile => Makefile (100%) rename operators/PROJECT => PROJECT (100%) rename operators/VERSION => VERSION (100%) rename {operators/cmd => cmd}/license-initializer/main.go (100%) rename {operators/cmd => cmd}/license-initializer/main_test.go (100%) rename {operators/cmd => cmd}/license-initializer/testdata/expected.src (100%) rename {operators/cmd => cmd}/license-initializer/testdata/test.key (100%) rename {operators/cmd => cmd}/main.go (100%) rename {operators/cmd => cmd}/manager/main.go (100%) create mode 100644 config/all-in-one.yaml rename {operators/config => config}/crds/apm_v1alpha1_apmserver.yaml (100%) rename {operators/config => config}/crds/elasticsearch_v1alpha1_elasticsearch.yaml (100%) rename {operators/config => config}/crds/kibana_v1alpha1_kibana.yaml (100%) rename {operators/config => config}/dev/elastic-psp.yaml (100%) rename {operators/config => config}/dev/gke-default-storage.yaml (100%) rename {operators/config => config}/dev/registry.yaml (100%) rename {operators/config => config}/e2e/batch_job.yaml (100%) rename {operators/config => config}/e2e/global_operator.yaml (100%) rename {operators/config => config}/e2e/managed_namespaces.yaml (100%) rename {operators/config => config}/e2e/namespace_operator.yaml (100%) rename {operators/config => config}/e2e/operator_namespaces.yaml (100%) rename {operators/config => config}/e2e/rbac.yaml (100%) rename {operators/config => config}/operator/Makefile (100%) rename {operators/config => config}/operator/README.md (100%) rename {operators/config => config}/operator/all-in-one/cluster_role.template.yaml (100%) rename {operators/config => config}/operator/all-in-one/cluster_role_bindings.template.yaml (100%) rename {operators/config => config}/operator/all-in-one/namespace.template.yaml (100%) rename {operators/config => config}/operator/all-in-one/operator.template.yaml (100%) rename {operators/config => config}/operator/all-in-one/service_account.template.yaml (100%) rename {operators/config => config}/operator/global/cluster_role.template.yaml (100%) rename {operators/config => config}/operator/global/cluster_role_bindings.template.yaml (100%) rename {operators/config => config}/operator/global/namespace.template.yaml (100%) rename {operators/config => config}/operator/global/operator.template.yaml (100%) rename {operators/config => config}/operator/global/service_account.template.yaml (100%) rename {operators/config => config}/operator/namespace/cluster_role.template.yaml (100%) rename {operators/config => config}/operator/namespace/namespace.template.yaml (100%) rename {operators/config => config}/operator/namespace/operator.template.yaml (100%) rename {operators/config => config}/operator/namespace/role_bindings.template.yaml (100%) rename {operators/config => config}/operator/namespace/service_account.template.yaml (100%) rename {operators/config => config}/samples/apm/apm_es_kibana.yaml (100%) rename {operators/config => config}/samples/apm/apmserver.yaml (100%) rename {operators/config => config}/samples/elasticsearch/elasticsearch.yaml (100%) rename {operators/config => config}/samples/kibana/kibana.yaml (100%) rename {operators/config => config}/samples/kibana/kibana_es.yaml (100%) rename operators/dev-setup.md => dev-setup.md (100%) rename {operators/hack => hack}/boilerplate.go.txt (100%) rename {operators/hack => hack}/check-requisites.sh (100%) rename {operators/hack => hack}/deployer/README.md (100%) rename {operators/hack => hack}/deployer/cmd/create.go (100%) rename {operators/hack => hack}/deployer/cmd/execute.go (100%) rename {operators/hack => hack}/deployer/cmd/get.go (100%) rename {operators/hack => hack}/deployer/cmd/root.go (100%) rename {operators/hack => hack}/deployer/config/plans.yml (100%) rename {operators/hack => hack}/deployer/main.go (100%) rename {operators/hack => hack}/deployer/runner/aks.go (100%) rename {operators/hack => hack}/deployer/runner/command.go (100%) rename {operators/hack => hack}/deployer/runner/driver.go (100%) rename {operators/hack => hack}/deployer/runner/gke.go (100%) rename {operators/hack => hack}/deployer/runner/settings.go (100%) rename {operators/hack => hack}/deployer/runner/vault.go (100%) rename {operators/hack => hack}/eck-dump.sh (100%) rename {operators/hack => hack}/minikube-cluster.sh (100%) rename {operators/hack => hack}/registry.sh (100%) rename {operators/hack => hack}/release_notes.go (100%) rename {operators/hack => hack}/release_notes_test.go (100%) rename {operators/hack => hack}/update-doc-stack-version.sh (100%) delete mode 100644 operators/README.md rename {operators/pkg => pkg}/about/base.go (100%) rename {operators/pkg => pkg}/about/info.go (100%) rename {operators/pkg => pkg}/about/info_test.go (100%) rename {operators/pkg => pkg}/apis/addtoscheme_apm_v1alpha1.go (100%) rename {operators/pkg => pkg}/apis/addtoscheme_associations_v1alpha1.go (100%) rename {operators/pkg => pkg}/apis/addtoscheme_common_v1alpha1.go (100%) rename {operators/pkg => pkg}/apis/addtoscheme_elasticsearch_v1alpha1.go (100%) rename {operators/pkg => pkg}/apis/addtoscheme_kibana_v1alpha1.go (100%) rename {operators/pkg => pkg}/apis/apis.go (100%) rename {operators/pkg => pkg}/apis/apm/group.go (100%) rename {operators/pkg => pkg}/apis/apm/v1alpha1/apmserver_types.go (100%) rename {operators/pkg => pkg}/apis/apm/v1alpha1/doc.go (100%) rename {operators/pkg => pkg}/apis/apm/v1alpha1/register.go (100%) rename {operators/pkg => pkg}/apis/apm/v1alpha1/zz_generated.deepcopy.go (100%) rename {operators/pkg => pkg}/apis/associations/group.go (100%) rename {operators/pkg => pkg}/apis/associations/v1alpha1/doc.go (100%) rename {operators/pkg => pkg}/apis/associations/v1alpha1/register.go (100%) rename {operators/pkg => pkg}/apis/associations/v1alpha1/zz_generated.deepcopy.go (100%) rename {operators/pkg => pkg}/apis/common/group.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/association.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/authentication.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/common.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/common_test.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/config.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/config_test.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/doc.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/feature_flags.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/feature_flags_test.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/register.go (100%) rename {operators/pkg => pkg}/apis/common/v1alpha1/zz_generated.deepcopy.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/group.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/doc.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/elasticsearch_config.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/elasticsearch_types.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/elasticsearch_types_test.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/register.go (100%) rename {operators/pkg => pkg}/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go (100%) rename {operators/pkg => pkg}/apis/kibana/group.go (100%) rename {operators/pkg => pkg}/apis/kibana/v1alpha1/doc.go (100%) rename {operators/pkg => pkg}/apis/kibana/v1alpha1/kibana_types.go (100%) rename {operators/pkg => pkg}/apis/kibana/v1alpha1/kibana_types_test.go (100%) rename {operators/pkg => pkg}/apis/kibana/v1alpha1/register.go (100%) rename {operators/pkg => pkg}/apis/kibana/v1alpha1/zz_generated.deepcopy.go (100%) rename {operators/pkg => pkg}/controller/add_apmserver.go (100%) rename {operators/pkg => pkg}/controller/add_apmserverelasticsearchassociation.go (100%) rename {operators/pkg => pkg}/controller/add_association.go (100%) rename {operators/pkg => pkg}/controller/add_elasticsearch.go (100%) rename {operators/pkg => pkg}/controller/add_kibana.go (100%) rename {operators/pkg => pkg}/controller/add_license.go (100%) rename {operators/pkg => pkg}/controller/apmserver/apmserver_controller.go (100%) rename {operators/pkg => pkg}/controller/apmserver/apmserver_controller_test.go (100%) rename {operators/pkg => pkg}/controller/apmserver/certificates/reconcile.go (100%) rename {operators/pkg => pkg}/controller/apmserver/config/config.go (100%) rename {operators/pkg => pkg}/controller/apmserver/config/reconcile.go (100%) rename {operators/pkg => pkg}/controller/apmserver/deployment_control.go (100%) rename {operators/pkg => pkg}/controller/apmserver/labels/labels.go (100%) rename {operators/pkg => pkg}/controller/apmserver/name/name.go (100%) rename {operators/pkg => pkg}/controller/apmserver/pod.go (100%) rename {operators/pkg => pkg}/controller/apmserver/pod_test.go (100%) rename {operators/pkg => pkg}/controller/apmserver/services.go (100%) rename {operators/pkg => pkg}/controller/apmserver/state.go (100%) rename {operators/pkg => pkg}/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go (100%) rename {operators/pkg => pkg}/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go (100%) rename {operators/pkg => pkg}/controller/apmserverelasticsearchassociation/labels.go (100%) rename {operators/pkg => pkg}/controller/common/annotation/association_status.go (100%) rename {operators/pkg => pkg}/controller/common/annotation/controller_version.go (100%) rename {operators/pkg => pkg}/controller/common/annotation/controller_version_test.go (100%) rename {operators/pkg => pkg}/controller/common/annotation/pod.go (100%) rename {operators/pkg => pkg}/controller/common/annotation/pod_test.go (100%) rename {operators/pkg => pkg}/controller/common/association/association.go (100%) rename {operators/pkg => pkg}/controller/common/association/association_test.go (100%) rename {operators/pkg => pkg}/controller/common/association/user.go (100%) rename {operators/pkg => pkg}/controller/common/association/user_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/ca.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/ca_reconcile.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/ca_reconcile_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/ca_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/expiration.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/expiration_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/fields.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/certificates_secret.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/certificates_secret_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/dynamic_watches.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/public_secret.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/public_secret_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/reconcile.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/reconcile_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/testdata/ca.crt (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/testdata/chain.crt (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/testdata/corrupted.key (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/testdata/tls.crt (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/testdata/tls.key (100%) rename {operators/pkg => pkg}/controller/common/certificates/http/volume.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/keys.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/keys_test.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/name.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/pem.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/x509_othername.go (100%) rename {operators/pkg => pkg}/controller/common/certificates/x509_othername_test.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/labels.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/labels_test.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/pod_template.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/pod_template_test.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/pvc.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/pvc_test.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/service.go (100%) rename {operators/pkg => pkg}/controller/common/defaults/service_test.go (100%) rename {operators/pkg => pkg}/controller/common/events/events.go (100%) rename {operators/pkg => pkg}/controller/common/finalizer/handler.go (100%) rename {operators/pkg => pkg}/controller/common/finalizer/handler_test.go (100%) rename {operators/pkg => pkg}/controller/common/hash/hash.go (100%) rename {operators/pkg => pkg}/controller/common/hash/hash_test.go (100%) rename {operators/pkg => pkg}/controller/common/int.go (100%) rename {operators/pkg => pkg}/controller/common/keystore/initcontainer.go (100%) rename {operators/pkg => pkg}/controller/common/keystore/resources.go (100%) rename {operators/pkg => pkg}/controller/common/keystore/resources_test.go (100%) rename {operators/pkg => pkg}/controller/common/keystore/user_secret.go (100%) rename {operators/pkg => pkg}/controller/common/keystore/user_secret_test.go (100%) rename {operators/pkg => pkg}/controller/common/keystore/volumes.go (100%) rename {operators/pkg => pkg}/controller/common/labels.go (100%) rename {operators/pkg => pkg}/controller/common/labels_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/check.go (100%) rename {operators/pkg => pkg}/controller/common/license/check_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/crud.go (100%) rename {operators/pkg => pkg}/controller/common/license/detection.go (100%) rename {operators/pkg => pkg}/controller/common/license/detection_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/fixtures_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/labels.go (100%) rename {operators/pkg => pkg}/controller/common/license/license.go (100%) rename {operators/pkg => pkg}/controller/common/license/match.go (100%) rename {operators/pkg => pkg}/controller/common/license/match_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/model.go (100%) rename {operators/pkg => pkg}/controller/common/license/model_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/parser.go (100%) rename {operators/pkg => pkg}/controller/common/license/parser_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/pubkey.go (100%) rename {operators/pkg => pkg}/controller/common/license/pubkey_dev.go (100%) rename {operators/pkg => pkg}/controller/common/license/testdata/test-error.json (100%) rename {operators/pkg => pkg}/controller/common/license/testdata/test-license.json (100%) rename {operators/pkg => pkg}/controller/common/license/trial.go (100%) rename {operators/pkg => pkg}/controller/common/license/trial_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/verifier.go (100%) rename {operators/pkg => pkg}/controller/common/license/verifier_test.go (100%) rename {operators/pkg => pkg}/controller/common/license/watches.go (100%) rename {operators/pkg => pkg}/controller/common/name/name.go (100%) rename {operators/pkg => pkg}/controller/common/name/name_test.go (100%) rename {operators/pkg => pkg}/controller/common/operator/const.go (100%) rename {operators/pkg => pkg}/controller/common/operator/parameters.go (100%) rename {operators/pkg => pkg}/controller/common/operator/roles.go (100%) rename {operators/pkg => pkg}/controller/common/operator/roles_test.go (100%) rename {operators/pkg => pkg}/controller/common/pause.go (100%) rename {operators/pkg => pkg}/controller/common/pause_test.go (100%) rename {operators/pkg => pkg}/controller/common/pod/spec.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/expectations.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/expectations_test.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/handler.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/reconciler.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/reconciler_test.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/results.go (100%) rename {operators/pkg => pkg}/controller/common/reconciler/results_test.go (100%) rename {operators/pkg => pkg}/controller/common/service_control.go (100%) rename {operators/pkg => pkg}/controller/common/service_control_test.go (100%) rename {operators/pkg => pkg}/controller/common/settings/canonical_config.go (100%) rename {operators/pkg => pkg}/controller/common/settings/canonical_config_test.go (100%) rename {operators/pkg => pkg}/controller/common/user/external.go (100%) rename {operators/pkg => pkg}/controller/common/user/external_test.go (100%) rename {operators/pkg => pkg}/controller/common/user/finalizer.go (100%) rename {operators/pkg => pkg}/controller/common/user/label.go (100%) rename {operators/pkg => pkg}/controller/common/user/user.go (100%) rename {operators/pkg => pkg}/controller/common/user/utils.go (100%) rename {operators/pkg => pkg}/controller/common/validation/validation.go (100%) rename {operators/pkg => pkg}/controller/common/version/version.go (100%) rename {operators/pkg => pkg}/controller/common/version/version_test.go (100%) rename {operators/pkg => pkg}/controller/common/volume/configmap.go (100%) rename {operators/pkg => pkg}/controller/common/volume/emptydir.go (100%) rename {operators/pkg => pkg}/controller/common/volume/emptydir_test.go (100%) rename {operators/pkg => pkg}/controller/common/volume/secret.go (100%) rename {operators/pkg => pkg}/controller/common/volume/secret_test.go (100%) rename {operators/pkg => pkg}/controller/common/volume/volume.go (100%) rename {operators/pkg => pkg}/controller/common/watches/handler.go (100%) rename {operators/pkg => pkg}/controller/common/watches/handler_integration_test.go (100%) rename {operators/pkg => pkg}/controller/common/watches/handler_test.go (100%) rename {operators/pkg => pkg}/controller/common/watches/named_watch.go (100%) rename {operators/pkg => pkg}/controller/common/watches/owner_watch.go (100%) rename {operators/pkg => pkg}/controller/common/watches/state.go (100%) rename {operators/pkg => pkg}/controller/controller.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/ca_reconcile.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/doc.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/csr.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/csr_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/doc.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/pod_secret.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/pod_secret_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/public_secret.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/public_secret_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/reconcile.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/reconcile_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/certificates/transport/transport_fixtures_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/cleanup/resources.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/cleanup/resources_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/base.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/client.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/client_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/mock.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/model.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/model_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/cluster_state.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/errors.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/health.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/info.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/license.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/nodes.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/test_fixtures/nodes_stats.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/v6.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/client/v7.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/configmap/configmap.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/configmap/configmap_control.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/downscale.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/downscale_invariants.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/downscale_invariants_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/downscale_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/downscale_utils.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/downscale_utils_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/driver.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/esstate.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/log.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/nodes.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/nodes_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/upgrade.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/upgrade_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/upscale.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/driver/upscale_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/elasticsearch_controller.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/initcontainer.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/initcontainer_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/keystore.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/linked_files.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/os_settings.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/prepare_fs.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/prepare_fs_script.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/prepare_fs_script_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/initcontainer/shared_volumes.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/label/label.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/label/label_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/license/apply.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/license/apply_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/license/reconcile.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/migration/migrate_data.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/migration/migrate_data_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/name/name.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/network/ports.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/defaults.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/fixtures.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/podspec.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/podspec_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/readiness_probe.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/resources.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/resources_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/statefulset.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/nodespec/volumes.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/finalizer.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/manager.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/manager_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/observer.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/observer_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/state.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/state_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/watch.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/observer/watch_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/pdb/reconcile.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/pdb/reconcile_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/reconcile/resources_state.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/reconcile/state.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/reconcile/state_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/services/services.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/services/services_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/canonical_config.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/config_volume.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/config_volume_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/environment.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/fields.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/masters.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/masters_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/merged_config.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/secure_settings.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/secure_settings_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/settings/settings.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/getter.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/getter_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/list.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/list_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/pod.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/pod_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/reconcile.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/sset/reconcile_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/credentials.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/credentials_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/predefined_users.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/predefined_users_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/reconciler.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/reconciler_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/user/user.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/validation/upgrade_checks.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/validation/upgrade_checks_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/validation/validation.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/validation/validation_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/validation/validations.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/validation/validations_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/running_versions.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/running_versions_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/supported_versions.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/supported_versions_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen1/compatibility.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen1/compatibility_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen1/minimum_masters.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen1/minimum_masters_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen2/compatibility.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen2/compatibility_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen2/initial_master_nodes.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen2/initial_master_nodes_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen2/voting_exclusions.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/version/zen2/voting_exclusions_test.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/volume/defaults.go (100%) rename {operators/pkg => pkg}/controller/elasticsearch/volume/names.go (100%) rename {operators/pkg => pkg}/controller/kibana/certificates/reconcile.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/fields.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/reconciler.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/reconciler_test.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/secret_volume.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/settings.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/settings_test.go (100%) rename {operators/pkg => pkg}/controller/kibana/config/telemetry.go (100%) rename {operators/pkg => pkg}/controller/kibana/deployment_control.go (100%) rename {operators/pkg => pkg}/controller/kibana/deployment_control_test.go (100%) rename {operators/pkg => pkg}/controller/kibana/driver.go (100%) rename {operators/pkg => pkg}/controller/kibana/driver_test.go (100%) rename {operators/pkg => pkg}/controller/kibana/es/secret.go (100%) rename {operators/pkg => pkg}/controller/kibana/kibana_controller.go (100%) rename {operators/pkg => pkg}/controller/kibana/label/labels.go (100%) rename {operators/pkg => pkg}/controller/kibana/name/name.go (100%) rename {operators/pkg => pkg}/controller/kibana/name/name_test.go (100%) rename {operators/pkg => pkg}/controller/kibana/pod/pod.go (100%) rename {operators/pkg => pkg}/controller/kibana/pod/pod_test.go (100%) rename {operators/pkg => pkg}/controller/kibana/services.go (100%) rename {operators/pkg => pkg}/controller/kibana/state.go (100%) rename {operators/pkg => pkg}/controller/kibana/version/version6/settings.go (100%) rename {operators/pkg => pkg}/controller/kibana/version/version7/settings.go (100%) rename {operators/pkg => pkg}/controller/kibana/volume/volumes.go (100%) rename {operators/pkg => pkg}/controller/kibanaassociation/association_controller.go (100%) rename {operators/pkg => pkg}/controller/kibanaassociation/association_controller_test.go (100%) rename {operators/pkg => pkg}/controller/kibanaassociation/ca.go (100%) rename {operators/pkg => pkg}/controller/kibanaassociation/ca_test.go (100%) rename {operators/pkg => pkg}/controller/kibanaassociation/labels.go (100%) rename {operators/pkg => pkg}/controller/kibanaassociation/watch.go (100%) rename {operators/pkg => pkg}/controller/license/license_controller.go (100%) rename {operators/pkg => pkg}/controller/license/license_controller_integration_test.go (100%) rename {operators/pkg => pkg}/controller/license/license_controller_test.go (100%) rename {operators/pkg => pkg}/controller/license/list.go (100%) rename {operators/pkg => pkg}/controller/license/list_test.go (100%) rename {operators/pkg => pkg}/controller/license/trial/trial_controller.go (100%) rename {operators/pkg => pkg}/controller/license/trial/trial_controller_integration_test.go (100%) rename {operators/pkg => pkg}/controller/license/validation/validations.go (100%) rename {operators/pkg => pkg}/controller/license/validation/validations_test.go (100%) rename {operators/pkg => pkg}/dev/mode.go (100%) rename {operators/pkg => pkg}/dev/portforward/client_portforward.go (100%) rename {operators/pkg => pkg}/dev/portforward/dialer.go (100%) rename {operators/pkg => pkg}/dev/portforward/dialer_test.go (100%) rename {operators/pkg => pkg}/dev/portforward/doc.go (100%) rename {operators/pkg => pkg}/dev/portforward/forwarder_store.go (100%) rename {operators/pkg => pkg}/dev/portforward/pod_forwarder.go (100%) rename {operators/pkg => pkg}/dev/portforward/pod_forwarder_test.go (100%) rename {operators/pkg => pkg}/dev/portforward/service_forwarder.go (100%) rename {operators/pkg => pkg}/dev/portforward/service_forwarder_test.go (100%) rename {operators/pkg => pkg}/utils/chrono/millis.go (100%) rename {operators/pkg => pkg}/utils/chrono/millis.test.go (100%) rename {operators/pkg => pkg}/utils/cryptutil/tls_verify.go (100%) rename {operators/pkg => pkg}/utils/diff/diff.go (100%) rename {operators/pkg => pkg}/utils/k8s/client.go (100%) rename {operators/pkg => pkg}/utils/k8s/client_test.go (100%) rename {operators/pkg => pkg}/utils/k8s/k8sutils.go (100%) rename {operators/pkg => pkg}/utils/k8s/k8sutils_test.go (100%) rename {operators/pkg => pkg}/utils/maps/maps.go (100%) rename {operators/pkg => pkg}/utils/maps/maps_test.go (100%) rename {operators/pkg => pkg}/utils/net/dialer.go (100%) rename {operators/pkg => pkg}/utils/net/ip.go (100%) rename {operators/pkg => pkg}/utils/net/port.go (100%) rename {operators/pkg => pkg}/utils/retry/retry.go (100%) rename {operators/pkg => pkg}/utils/retry/retry_test.go (100%) rename {operators/pkg => pkg}/utils/set/set.go (100%) rename {operators/pkg => pkg}/utils/set/set_test.go (100%) rename {operators/pkg => pkg}/utils/stringsutil/strings.go (100%) rename {operators/pkg => pkg}/utils/stringsutil/strings_test.go (100%) rename {operators/pkg => pkg}/utils/test/integration.go (100%) rename {operators/pkg => pkg}/utils/test/retry.go (100%) rename {operators/pkg => pkg}/webhook/add_validations.go (100%) rename {operators/pkg => pkg}/webhook/elasticsearch/handler.go (100%) rename {operators/pkg => pkg}/webhook/elasticsearch/handler_test.go (100%) rename {operators/pkg => pkg}/webhook/license/handler.go (100%) rename {operators/pkg => pkg}/webhook/license/handler_test.go (100%) rename {operators/pkg => pkg}/webhook/params.go (100%) rename {operators/pkg => pkg}/webhook/server.go (100%) rename {operators/pkg => pkg}/webhook/webhook.go (100%) rename {operators/test => test}/e2e/Dockerfile (100%) rename {operators/test => test}/e2e/apm/association_test.go (100%) rename {operators/test => test}/e2e/apm/configuration_test.go (100%) rename {operators/test => test}/e2e/apm/sample_test.go (100%) rename {operators/test => test}/e2e/apm/standalone_test.go (100%) rename {operators/test => test}/e2e/cmd/main.go (100%) rename {operators/test => test}/e2e/cmd/run/command.go (100%) rename {operators/test => test}/e2e/cmd/run/eventlog.go (100%) rename {operators/test => test}/e2e/cmd/run/run.go (100%) rename {operators/test => test}/e2e/es/certs_test.go (100%) rename {operators/test => test}/e2e/es/failure_test.go (100%) rename {operators/test => test}/e2e/es/keystore_test.go (100%) rename {operators/test => test}/e2e/es/license_test.go (100%) rename {operators/test => test}/e2e/es/mutation_test.go (100%) rename {operators/test => test}/e2e/es/podtemplate_test.go (100%) rename {operators/test => test}/e2e/es/reversal_test.go (100%) rename {operators/test => test}/e2e/es/volume_test.go (100%) rename {operators/test => test}/e2e/kb/association_test.go (100%) rename {operators/test => test}/e2e/kb/failure_test.go (100%) rename {operators/test => test}/e2e/kb/keystore_test.go (100%) rename {operators/test => test}/e2e/kb/resource_test.go (100%) rename {operators/test => test}/e2e/kb/sample_test.go (100%) rename {operators/test => test}/e2e/kb/telemetry_test.go (100%) rename {operators/test => test}/e2e/run.sh (100%) rename {operators/test => test}/e2e/samples.go (100%) rename {operators/test => test}/e2e/smoke_test.go (100%) rename {operators/test => test}/e2e/test/apmserver/builder.go (100%) rename {operators/test => test}/e2e/test/apmserver/checks_apm.go (100%) rename {operators/test => test}/e2e/test/apmserver/checks_k8s.go (100%) rename {operators/test => test}/e2e/test/apmserver/http_client.go (100%) rename {operators/test => test}/e2e/test/apmserver/steps_creation.go (100%) rename {operators/test => test}/e2e/test/apmserver/steps_deletion.go (100%) rename {operators/test => test}/e2e/test/apmserver/steps_init.go (100%) rename {operators/test => test}/e2e/test/apmserver/steps_mutation.go (100%) rename {operators/test => test}/e2e/test/builder.go (100%) rename {operators/test => test}/e2e/test/checks.go (100%) rename {operators/test => test}/e2e/test/command/command.go (100%) rename {operators/test => test}/e2e/test/command/kubectl.go (100%) rename {operators/test => test}/e2e/test/context.go (100%) rename {operators/test => test}/e2e/test/default.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/builder.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/checks_data.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/checks_es.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/checks_k8s.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/checks_keystore.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/checks_reversal.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/checks_volume.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/cluster_uuid.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/default.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/http_client.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/pause.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/steps_creation.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/steps_deletion.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/steps_init.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/steps_license.go (100%) rename {operators/test => test}/e2e/test/elasticsearch/steps_mutation.go (100%) rename {operators/test => test}/e2e/test/http_client.go (100%) rename {operators/test => test}/e2e/test/k8s_client.go (100%) rename {operators/test => test}/e2e/test/kibana/builder.go (100%) rename {operators/test => test}/e2e/test/kibana/checks_k8s.go (100%) rename {operators/test => test}/e2e/test/kibana/checks_kb.go (100%) rename {operators/test => test}/e2e/test/kibana/http_client.go (100%) rename {operators/test => test}/e2e/test/kibana/steps_creation.go (100%) rename {operators/test => test}/e2e/test/kibana/steps_deletion.go (100%) rename {operators/test => test}/e2e/test/kibana/steps_init.go (100%) rename {operators/test => test}/e2e/test/kibana/steps_mutation.go (100%) rename {operators/test => test}/e2e/test/run.go (100%) rename {operators/test => test}/e2e/test/run_failure.go (100%) rename {operators/test => test}/e2e/test/run_mutation.go (100%) rename {operators/test => test}/e2e/test/run_reversal.go (100%) rename {operators/test => test}/e2e/test/step.go (100%) rename {operators/test => test}/e2e/test/utils.go (100%) rename {operators/test => test}/e2e/test/version.go (100%) diff --git a/operators/Dockerfile b/Dockerfile similarity index 100% rename from operators/Dockerfile rename to Dockerfile diff --git a/operators/Gopkg.lock b/Gopkg.lock similarity index 100% rename from operators/Gopkg.lock rename to Gopkg.lock diff --git a/operators/Gopkg.toml b/Gopkg.toml similarity index 100% rename from operators/Gopkg.toml rename to Gopkg.toml diff --git a/operators/Makefile b/Makefile similarity index 100% rename from operators/Makefile rename to Makefile diff --git a/operators/PROJECT b/PROJECT similarity index 100% rename from operators/PROJECT rename to PROJECT diff --git a/README.md b/README.md index ea76cf507b..2c6d462020 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,5 @@ Supported versions: * Elasticsearch: 6.8+, 7.1+ Check the [Quickstart](https://www.elastic.co/guide/en/cloud-on-k8s/current/index.html) if you want to deploy you first cluster with ECK. + +If you want to contribute to the project, check our [contributing guide](CONTRIBUTING.md) and see [how to setup a local development environment](dev-setup.md). diff --git a/operators/VERSION b/VERSION similarity index 100% rename from operators/VERSION rename to VERSION diff --git a/operators/cmd/license-initializer/main.go b/cmd/license-initializer/main.go similarity index 100% rename from operators/cmd/license-initializer/main.go rename to cmd/license-initializer/main.go diff --git a/operators/cmd/license-initializer/main_test.go b/cmd/license-initializer/main_test.go similarity index 100% rename from operators/cmd/license-initializer/main_test.go rename to cmd/license-initializer/main_test.go diff --git a/operators/cmd/license-initializer/testdata/expected.src b/cmd/license-initializer/testdata/expected.src similarity index 100% rename from operators/cmd/license-initializer/testdata/expected.src rename to cmd/license-initializer/testdata/expected.src diff --git a/operators/cmd/license-initializer/testdata/test.key b/cmd/license-initializer/testdata/test.key similarity index 100% rename from operators/cmd/license-initializer/testdata/test.key rename to cmd/license-initializer/testdata/test.key diff --git a/operators/cmd/main.go b/cmd/main.go similarity index 100% rename from operators/cmd/main.go rename to cmd/main.go diff --git a/operators/cmd/manager/main.go b/cmd/manager/main.go similarity index 100% rename from operators/cmd/manager/main.go rename to cmd/manager/main.go diff --git a/config/all-in-one.yaml b/config/all-in-one.yaml new file mode 100644 index 0000000000..8178bea023 --- /dev/null +++ b/config/all-in-one.yaml @@ -0,0 +1,970 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: apmservers.apm.k8s.elastic.co +spec: + additionalPrinterColumns: + - JSONPath: .status.health + name: health + type: string + - JSONPath: .status.availableNodes + description: Available nodes + name: nodes + type: integer + - JSONPath: .spec.version + description: APM version + name: version + type: string + - JSONPath: .metadata.creationTimestamp + name: age + type: date + group: apm.k8s.elastic.co + names: + categories: + - elastic + kind: ApmServer + plural: apmservers + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + properties: + config: + description: Config represents the APM configuration. + type: object + elasticsearch: + description: Elasticsearch configures how the APM server connects to + Elasticsearch + properties: + auth: + description: Auth configures authentication for APM Server to use. + properties: + inline: + description: Inline is auth provided as plaintext inline credentials. + properties: + password: + description: Password is the password to use. + type: string + username: + description: User is the username to use. + type: string + required: + - username + - password + type: object + secret: + description: SecretKeyRef is a secret that contains the credentials + to use. + type: object + type: object + hosts: + description: Hosts are the URLs of the output Elasticsearch nodes. + items: + type: string + type: array + ssl: + description: SSL configures TLS-related configuration for Elasticsearch + properties: + certificateAuthorities: + description: CertificateAuthorities is a secret that contains + a `tls.crt` entry that contain certificates for server verifications. + properties: + secretName: + type: string + type: object + type: object + type: object + elasticsearchRef: + description: ElasticsearchRef references an Elasticsearch resource in + the Kubernetes cluster. If the namespace is not specified, the current + resource namespace will be used. + properties: + name: + type: string + namespace: + type: string + required: + - name + type: object + featureFlags: + description: FeatureFlags are apm-specific flags that enable or disable + specific experimental features + type: object + http: + description: HTTP contains settings for HTTP. + properties: + service: + description: Service is a template for the Kubernetes Service + properties: + metadata: + description: ObjectMeta is metadata for the service. The name + and namespace provided here is managed by ECK and will be + ignored. + type: object + spec: + description: Spec defines the behavior of the service. + type: object + type: object + tls: + description: TLS describe additional options to consider when generating + HTTP TLS certificates. + properties: + certificate: + description: 'Certificate is a reference to a secret that contains + the certificate and private key to be used. The secret should + have the following content: - `tls.crt`: The certificate + (or a chain). - `tls.key`: The private key to the first certificate + in the certificate chain.' + properties: + secretName: + type: string + type: object + selfSignedCertificate: + description: SelfSignedCertificate define options to apply to + self-signed certificate managed by the operator. + properties: + disabled: + description: Disabled turns off the provisioning of self-signed + HTTP TLS certificates. + type: boolean + subjectAltNames: + description: 'SubjectAlternativeNames is a list of SANs + to include in the HTTP TLS certificates. For example: + a wildcard DNS to expose the cluster.' + items: + properties: + dns: + type: string + ip: + type: string + type: object + type: array + type: object + type: object + type: object + image: + description: Image represents the docker image that will be used. + type: string + nodeCount: + description: NodeCount defines how many nodes the Apm Server deployment + must have. + format: int32 + type: integer + podTemplate: + description: PodTemplate can be used to propagate configuration to APM + Server pods. This allows specifying custom annotations, labels, environment + variables, affinity, resources, etc. for the pods created from this + NodeSpec. + type: object + secureSettings: + description: SecureSettings reference a secret containing secure settings, + to be injected into the APM keystore on each node. Each individual + key/value entry in the referenced secret is considered as an individual + secure setting to be injected. The secret must exist in the same namespace + as the APM resource. + properties: + secretName: + type: string + type: object + version: + description: Version represents the version of the APM Server + type: string + type: object + status: + properties: + controllerVersion: + description: ControllerVersion is the version of the controller that + last updated the ApmServer instance + type: string + health: + type: string + secretTokenSecret: + description: SecretTokenSecretName is the name of the Secret that contains + the secret token + type: string + service: + description: ExternalService is the name of the service the agents should + connect to. + type: string + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] + +--- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: elasticsearches.elasticsearch.k8s.elastic.co +spec: + additionalPrinterColumns: + - JSONPath: .status.health + name: health + type: string + - JSONPath: .status.availableNodes + description: Available nodes + name: nodes + type: integer + - JSONPath: .spec.version + description: Elasticsearch version + name: version + type: string + - JSONPath: .status.phase + name: phase + type: string + - JSONPath: .metadata.creationTimestamp + name: age + type: date + group: elasticsearch.k8s.elastic.co + names: + categories: + - elastic + kind: Elasticsearch + plural: elasticsearches + shortNames: + - es + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + properties: + featureFlags: + description: FeatureFlags are instance-specific flags that enable or + disable specific experimental features + type: object + http: + description: HTTP contains settings for HTTP. + properties: + service: + description: Service is a template for the Kubernetes Service + properties: + metadata: + description: ObjectMeta is metadata for the service. The name + and namespace provided here is managed by ECK and will be + ignored. + type: object + spec: + description: Spec defines the behavior of the service. + type: object + type: object + tls: + description: TLS describe additional options to consider when generating + HTTP TLS certificates. + properties: + certificate: + description: 'Certificate is a reference to a secret that contains + the certificate and private key to be used. The secret should + have the following content: - `tls.crt`: The certificate + (or a chain). - `tls.key`: The private key to the first certificate + in the certificate chain.' + properties: + secretName: + type: string + type: object + selfSignedCertificate: + description: SelfSignedCertificate define options to apply to + self-signed certificate managed by the operator. + properties: + disabled: + description: Disabled turns off the provisioning of self-signed + HTTP TLS certificates. + type: boolean + subjectAltNames: + description: 'SubjectAlternativeNames is a list of SANs + to include in the HTTP TLS certificates. For example: + a wildcard DNS to expose the cluster.' + items: + properties: + dns: + type: string + ip: + type: string + type: object + type: array + type: object + type: object + type: object + image: + description: Image represents the docker image that will be used. + type: string + nodes: + description: Nodes represents a list of groups of nodes with the same + configuration to be part of the cluster + items: + properties: + config: + description: Config represents Elasticsearch configuration. + type: object + name: + description: Name is a logical name for this set of nodes. Used + as a part of the managed Elasticsearch node.name setting. + maxLength: 12 + pattern: '[a-zA-Z0-9-]*' + type: string + nodeCount: + description: NodeCount defines how many nodes have this topology + format: int32 + type: integer + podTemplate: + description: PodTemplate can be used to propagate configuration + to Elasticsearch pods. This allows specifying custom annotations, + labels, environment variables, volumes, affinity, resources, + etc. for the pods created from this NodeSpec. + type: object + volumeClaimTemplates: + description: 'VolumeClaimTemplates is a list of claims that pods + are allowed to reference. Every claim in this list must have + at least one matching (by name) volumeMount in one container + in the template. A claim in this list takes precedence over + any volumes in the template, with the same name. TODO: Define + the behavior if a claim already exists with the same name. TODO: + define special behavior based on claim metadata.name. (e.g data + / logs volumes)' + items: + type: object + type: array + type: object + type: array + podDisruptionBudget: + description: PodDisruptionBudget allows full control of the default + pod disruption budget. The default budget selects all cluster pods + and sets maxUnavailable to 1. To disable it entirely, set to the empty + value (`{}` in YAML). + properties: + metadata: + description: ObjectMeta is metadata for the service. The name and + namespace provided here is managed by ECK and will be ignored. + type: object + spec: + description: Spec of the desired behavior of the PodDisruptionBudget + type: object + type: object + secureSettings: + description: SecureSettings reference a secret containing secure settings, + to be injected into Elasticsearch keystore on each node. Each individual + key/value entry in the referenced secret is considered as an individual + secure setting to be injected. The secret must exist in the same namespace + as the Elasticsearch resource. + properties: + secretName: + type: string + type: object + setVmMaxMapCount: + description: SetVMMaxMapCount indicates whether an init container should + be used to ensure that the `vm.max_map_count` is set according to + https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html. + Setting this to true requires the kubelet to allow running privileged + containers. Defaults to true if not specified. To be disabled, it + must be explicitly set to false. + type: boolean + updateStrategy: + description: UpdateStrategy specifies how updates to the cluster should + be performed. + properties: + changeBudget: + description: ChangeBudget is the change budget that should be used + when performing mutations to the cluster. + properties: + maxSurge: + description: 'MaxSurge is the maximum number of pods that can + be scheduled above the original number of pods. By default, + a fixed value of 1 is used. Value can be an absolute number + (ex: 5) or a percentage of total pods at the start of the + update (ex: 10%). This can not be 0 if MaxUnavailable is 0 + if you want automatic rolling updates to be applied. Absolute + number is calculated from percentage by rounding up. Example: + when this is set to 30%, the new group can be scaled up by + 30% immediately when the rolling update starts. Once old pods + have been killed, new group can be scaled up further, ensuring + that total number of pods running at any time during the update + is at most 130% of the target number of pods.' + format: int64 + type: integer + maxUnavailable: + description: 'MaxUnavailable is the maximum number of pods that + can be unavailable during the update. Value can be an absolute + number (ex: 5) or a percentage of total pods at the start + of update (ex: 10%). Absolute number is calculated from percentage + by rounding down. This can not be 0 if MaxSurge is 0 if you + want automatic rolling changes to be applied. By default, + a fixed value of 0 is used. Example: when this is set to 30%, + the group can be scaled down by 30% immediately when the rolling + update starts. Once new pods are ready, the group can be scaled + down further, followed by scaling up the group, ensuring that + at least 70% of the target number of pods are available at + all times during the update.' + format: int64 + type: integer + required: + - maxUnavailable + - maxSurge + type: object + groups: + description: Groups is a list of groups that should have their cluster + mutations considered in a fair manner with a strict change budget + (not allowing any surge or unavailability) before the entire cluster + is reconciled with the full change budget. + items: + properties: + selector: + description: Selector is the selector used to match pods. + type: object + type: object + type: array + type: object + version: + description: Version represents the version of the stack + type: string + type: object + status: + properties: + clusterUUID: + type: string + controllerVersion: + description: ControllerVersion is the version of the controller that + last updated the Elasticsearch cluster + type: string + health: + type: string + masterNode: + type: string + phase: + type: string + service: + type: string + zenDiscovery: + properties: + minimumMasterNodes: + format: int64 + type: integer + type: object + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] + +--- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: trustrelationships.elasticsearch.k8s.elastic.co +spec: + group: elasticsearch.k8s.elastic.co + names: + kind: TrustRelationship + plural: trustrelationships + scope: Namespaced + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + properties: + caCert: + description: CaCert contains the PEM-encoded CA certificate for the + remote cluster. + type: string + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] + +--- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + labels: + controller-tools.k8s.io: "1.0" + name: kibanas.kibana.k8s.elastic.co +spec: + additionalPrinterColumns: + - JSONPath: .status.health + name: health + type: string + - JSONPath: .status.availableNodes + description: Available nodes + name: nodes + type: integer + - JSONPath: .spec.version + description: Kibana version + name: version + type: string + - JSONPath: .metadata.creationTimestamp + name: age + type: date + group: kibana.k8s.elastic.co + names: + categories: + - elastic + kind: Kibana + plural: kibanas + shortNames: + - kb + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + properties: + config: + description: Config represents Kibana configuration. + type: object + elasticsearch: + description: Elasticsearch configures how Kibana connects to Elasticsearch + properties: + auth: + description: Auth configures authentication for Kibana to use. + properties: + inline: + description: Inline is auth provided as plaintext inline credentials. + properties: + password: + description: Password is the password to use. + type: string + username: + description: User is the username to use. + type: string + required: + - username + - password + type: object + secret: + description: SecretKeyRef is a secret that contains the credentials + to use. + type: object + type: object + certificateAuthorities: + description: CertificateAuthorities names a secret that contains + a CA file entry to use. + properties: + secretName: + type: string + type: object + url: + description: ElasticsearchURL is the URL to the target Elasticsearch + type: string + required: + - url + type: object + elasticsearchRef: + description: ElasticsearchRef references an Elasticsearch resource in + the Kubernetes cluster. If the namespace is not specified, the current + resource namespace will be used. + properties: + name: + type: string + namespace: + type: string + required: + - name + type: object + featureFlags: + description: FeatureFlags are instance-specific flags that enable or + disable specific experimental features + type: object + http: + description: HTTP contains settings for HTTP. + properties: + service: + description: Service is a template for the Kubernetes Service + properties: + metadata: + description: ObjectMeta is metadata for the service. The name + and namespace provided here is managed by ECK and will be + ignored. + type: object + spec: + description: Spec defines the behavior of the service. + type: object + type: object + tls: + description: TLS describe additional options to consider when generating + HTTP TLS certificates. + properties: + certificate: + description: 'Certificate is a reference to a secret that contains + the certificate and private key to be used. The secret should + have the following content: - `tls.crt`: The certificate + (or a chain). - `tls.key`: The private key to the first certificate + in the certificate chain.' + properties: + secretName: + type: string + type: object + selfSignedCertificate: + description: SelfSignedCertificate define options to apply to + self-signed certificate managed by the operator. + properties: + disabled: + description: Disabled turns off the provisioning of self-signed + HTTP TLS certificates. + type: boolean + subjectAltNames: + description: 'SubjectAlternativeNames is a list of SANs + to include in the HTTP TLS certificates. For example: + a wildcard DNS to expose the cluster.' + items: + properties: + dns: + type: string + ip: + type: string + type: object + type: array + type: object + type: object + type: object + image: + description: Image represents the docker image that will be used. + type: string + nodeCount: + description: NodeCount defines how many nodes the Kibana deployment + must have. + format: int32 + type: integer + podTemplate: + description: PodTemplate can be used to propagate configuration to Kibana + pods. This allows specifying custom annotations, labels, environment + variables, affinity, resources, etc. for the pods created from this + NodeSpec. + type: object + secureSettings: + description: SecureSettings reference a secret containing secure settings, + to be injected into Kibana keystore on each node. Each individual + key/value entry in the referenced secret is considered as an individual + secure setting to be injected. The secret must exist in the same namespace + as the Kibana resource. + properties: + secretName: + type: string + type: object + version: + description: Version represents the version of Kibana + type: string + type: object + status: + properties: + associationStatus: + type: string + controllerVersion: + description: ControllerVersion is the version of the controller that + last updated the Kibana instance + type: string + health: + type: string + type: object + version: v1alpha1 +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: elastic-operator +rules: +- apiGroups: + - "" + resources: + - pods + - endpoints + - events + - persistentvolumeclaims + - secrets + - services + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - apps + resources: + - deployments + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - batch + resources: + - cronjobs + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - elasticsearch.k8s.elastic.co + resources: + - elasticsearches + - elasticsearches/status + - elasticsearches/finalizers + - enterpriselicenses + - enterpriselicenses/status + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - kibana.k8s.elastic.co + resources: + - kibanas + - kibanas/status + - kibanas/finalizers + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - apm.k8s.elastic.co + resources: + - apmservers + - apmservers/status + - apmservers/finalizers + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - associations.k8s.elastic.co + resources: + - apmserverelasticsearchassociations + - apmserverelasticsearchassociations/status + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - admissionregistration.k8s.io + resources: + - mutatingwebhookconfigurations + - validatingwebhookconfigurations + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: elastic-operator +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: elastic-operator +subjects: +- kind: ServiceAccount + name: elastic-operator + namespace: elastic-system + +--- + +apiVersion: v1 +kind: Namespace +metadata: + name: elastic-system + +--- + +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: elastic-operator + namespace: elastic-system + labels: + control-plane: elastic-operator +spec: + selector: + matchLabels: + control-plane: elastic-operator + serviceName: elastic-operator + template: + metadata: + labels: + control-plane: elastic-operator + spec: + serviceAccountName: elastic-operator + containers: + - image: docker.elastic.co/eck/eck-operator:0.8.0 + name: manager + args: ["manager", "--operator-roles", "all", "--enable-debug-logs=false"] + env: + - name: OPERATOR_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: WEBHOOK_SECRET + value: webhook-server-secret + - name: WEBHOOK_PODS_LABEL + value: elastic-operator + - name: OPERATOR_IMAGE + value: docker.elastic.co/eck/eck-operator:0.8.0 + resources: + limits: + cpu: 1 + memory: 100Mi + requests: + cpu: 100m + memory: 20Mi + ports: + - containerPort: 9876 + name: webhook-server + protocol: TCP + volumeMounts: + - mountPath: /tmp/cert + name: cert + readOnly: true + terminationGracePeriodSeconds: 10 + volumes: + - name: cert + secret: + defaultMode: 420 + secretName: webhook-server-secret +--- +apiVersion: v1 +kind: Secret +metadata: + name: webhook-server-secret + namespace: elastic-system + +--- + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: elastic-operator + namespace: elastic-system + +--- + diff --git a/operators/config/crds/apm_v1alpha1_apmserver.yaml b/config/crds/apm_v1alpha1_apmserver.yaml similarity index 100% rename from operators/config/crds/apm_v1alpha1_apmserver.yaml rename to config/crds/apm_v1alpha1_apmserver.yaml diff --git a/operators/config/crds/elasticsearch_v1alpha1_elasticsearch.yaml b/config/crds/elasticsearch_v1alpha1_elasticsearch.yaml similarity index 100% rename from operators/config/crds/elasticsearch_v1alpha1_elasticsearch.yaml rename to config/crds/elasticsearch_v1alpha1_elasticsearch.yaml diff --git a/operators/config/crds/kibana_v1alpha1_kibana.yaml b/config/crds/kibana_v1alpha1_kibana.yaml similarity index 100% rename from operators/config/crds/kibana_v1alpha1_kibana.yaml rename to config/crds/kibana_v1alpha1_kibana.yaml diff --git a/operators/config/dev/elastic-psp.yaml b/config/dev/elastic-psp.yaml similarity index 100% rename from operators/config/dev/elastic-psp.yaml rename to config/dev/elastic-psp.yaml diff --git a/operators/config/dev/gke-default-storage.yaml b/config/dev/gke-default-storage.yaml similarity index 100% rename from operators/config/dev/gke-default-storage.yaml rename to config/dev/gke-default-storage.yaml diff --git a/operators/config/dev/registry.yaml b/config/dev/registry.yaml similarity index 100% rename from operators/config/dev/registry.yaml rename to config/dev/registry.yaml diff --git a/operators/config/e2e/batch_job.yaml b/config/e2e/batch_job.yaml similarity index 100% rename from operators/config/e2e/batch_job.yaml rename to config/e2e/batch_job.yaml diff --git a/operators/config/e2e/global_operator.yaml b/config/e2e/global_operator.yaml similarity index 100% rename from operators/config/e2e/global_operator.yaml rename to config/e2e/global_operator.yaml diff --git a/operators/config/e2e/managed_namespaces.yaml b/config/e2e/managed_namespaces.yaml similarity index 100% rename from operators/config/e2e/managed_namespaces.yaml rename to config/e2e/managed_namespaces.yaml diff --git a/operators/config/e2e/namespace_operator.yaml b/config/e2e/namespace_operator.yaml similarity index 100% rename from operators/config/e2e/namespace_operator.yaml rename to config/e2e/namespace_operator.yaml diff --git a/operators/config/e2e/operator_namespaces.yaml b/config/e2e/operator_namespaces.yaml similarity index 100% rename from operators/config/e2e/operator_namespaces.yaml rename to config/e2e/operator_namespaces.yaml diff --git a/operators/config/e2e/rbac.yaml b/config/e2e/rbac.yaml similarity index 100% rename from operators/config/e2e/rbac.yaml rename to config/e2e/rbac.yaml diff --git a/operators/config/operator/Makefile b/config/operator/Makefile similarity index 100% rename from operators/config/operator/Makefile rename to config/operator/Makefile diff --git a/operators/config/operator/README.md b/config/operator/README.md similarity index 100% rename from operators/config/operator/README.md rename to config/operator/README.md diff --git a/operators/config/operator/all-in-one/cluster_role.template.yaml b/config/operator/all-in-one/cluster_role.template.yaml similarity index 100% rename from operators/config/operator/all-in-one/cluster_role.template.yaml rename to config/operator/all-in-one/cluster_role.template.yaml diff --git a/operators/config/operator/all-in-one/cluster_role_bindings.template.yaml b/config/operator/all-in-one/cluster_role_bindings.template.yaml similarity index 100% rename from operators/config/operator/all-in-one/cluster_role_bindings.template.yaml rename to config/operator/all-in-one/cluster_role_bindings.template.yaml diff --git a/operators/config/operator/all-in-one/namespace.template.yaml b/config/operator/all-in-one/namespace.template.yaml similarity index 100% rename from operators/config/operator/all-in-one/namespace.template.yaml rename to config/operator/all-in-one/namespace.template.yaml diff --git a/operators/config/operator/all-in-one/operator.template.yaml b/config/operator/all-in-one/operator.template.yaml similarity index 100% rename from operators/config/operator/all-in-one/operator.template.yaml rename to config/operator/all-in-one/operator.template.yaml diff --git a/operators/config/operator/all-in-one/service_account.template.yaml b/config/operator/all-in-one/service_account.template.yaml similarity index 100% rename from operators/config/operator/all-in-one/service_account.template.yaml rename to config/operator/all-in-one/service_account.template.yaml diff --git a/operators/config/operator/global/cluster_role.template.yaml b/config/operator/global/cluster_role.template.yaml similarity index 100% rename from operators/config/operator/global/cluster_role.template.yaml rename to config/operator/global/cluster_role.template.yaml diff --git a/operators/config/operator/global/cluster_role_bindings.template.yaml b/config/operator/global/cluster_role_bindings.template.yaml similarity index 100% rename from operators/config/operator/global/cluster_role_bindings.template.yaml rename to config/operator/global/cluster_role_bindings.template.yaml diff --git a/operators/config/operator/global/namespace.template.yaml b/config/operator/global/namespace.template.yaml similarity index 100% rename from operators/config/operator/global/namespace.template.yaml rename to config/operator/global/namespace.template.yaml diff --git a/operators/config/operator/global/operator.template.yaml b/config/operator/global/operator.template.yaml similarity index 100% rename from operators/config/operator/global/operator.template.yaml rename to config/operator/global/operator.template.yaml diff --git a/operators/config/operator/global/service_account.template.yaml b/config/operator/global/service_account.template.yaml similarity index 100% rename from operators/config/operator/global/service_account.template.yaml rename to config/operator/global/service_account.template.yaml diff --git a/operators/config/operator/namespace/cluster_role.template.yaml b/config/operator/namespace/cluster_role.template.yaml similarity index 100% rename from operators/config/operator/namespace/cluster_role.template.yaml rename to config/operator/namespace/cluster_role.template.yaml diff --git a/operators/config/operator/namespace/namespace.template.yaml b/config/operator/namespace/namespace.template.yaml similarity index 100% rename from operators/config/operator/namespace/namespace.template.yaml rename to config/operator/namespace/namespace.template.yaml diff --git a/operators/config/operator/namespace/operator.template.yaml b/config/operator/namespace/operator.template.yaml similarity index 100% rename from operators/config/operator/namespace/operator.template.yaml rename to config/operator/namespace/operator.template.yaml diff --git a/operators/config/operator/namespace/role_bindings.template.yaml b/config/operator/namespace/role_bindings.template.yaml similarity index 100% rename from operators/config/operator/namespace/role_bindings.template.yaml rename to config/operator/namespace/role_bindings.template.yaml diff --git a/operators/config/operator/namespace/service_account.template.yaml b/config/operator/namespace/service_account.template.yaml similarity index 100% rename from operators/config/operator/namespace/service_account.template.yaml rename to config/operator/namespace/service_account.template.yaml diff --git a/operators/config/samples/apm/apm_es_kibana.yaml b/config/samples/apm/apm_es_kibana.yaml similarity index 100% rename from operators/config/samples/apm/apm_es_kibana.yaml rename to config/samples/apm/apm_es_kibana.yaml diff --git a/operators/config/samples/apm/apmserver.yaml b/config/samples/apm/apmserver.yaml similarity index 100% rename from operators/config/samples/apm/apmserver.yaml rename to config/samples/apm/apmserver.yaml diff --git a/operators/config/samples/elasticsearch/elasticsearch.yaml b/config/samples/elasticsearch/elasticsearch.yaml similarity index 100% rename from operators/config/samples/elasticsearch/elasticsearch.yaml rename to config/samples/elasticsearch/elasticsearch.yaml diff --git a/operators/config/samples/kibana/kibana.yaml b/config/samples/kibana/kibana.yaml similarity index 100% rename from operators/config/samples/kibana/kibana.yaml rename to config/samples/kibana/kibana.yaml diff --git a/operators/config/samples/kibana/kibana_es.yaml b/config/samples/kibana/kibana_es.yaml similarity index 100% rename from operators/config/samples/kibana/kibana_es.yaml rename to config/samples/kibana/kibana_es.yaml diff --git a/operators/dev-setup.md b/dev-setup.md similarity index 100% rename from operators/dev-setup.md rename to dev-setup.md diff --git a/operators/hack/boilerplate.go.txt b/hack/boilerplate.go.txt similarity index 100% rename from operators/hack/boilerplate.go.txt rename to hack/boilerplate.go.txt diff --git a/operators/hack/check-requisites.sh b/hack/check-requisites.sh similarity index 100% rename from operators/hack/check-requisites.sh rename to hack/check-requisites.sh diff --git a/operators/hack/deployer/README.md b/hack/deployer/README.md similarity index 100% rename from operators/hack/deployer/README.md rename to hack/deployer/README.md diff --git a/operators/hack/deployer/cmd/create.go b/hack/deployer/cmd/create.go similarity index 100% rename from operators/hack/deployer/cmd/create.go rename to hack/deployer/cmd/create.go diff --git a/operators/hack/deployer/cmd/execute.go b/hack/deployer/cmd/execute.go similarity index 100% rename from operators/hack/deployer/cmd/execute.go rename to hack/deployer/cmd/execute.go diff --git a/operators/hack/deployer/cmd/get.go b/hack/deployer/cmd/get.go similarity index 100% rename from operators/hack/deployer/cmd/get.go rename to hack/deployer/cmd/get.go diff --git a/operators/hack/deployer/cmd/root.go b/hack/deployer/cmd/root.go similarity index 100% rename from operators/hack/deployer/cmd/root.go rename to hack/deployer/cmd/root.go diff --git a/operators/hack/deployer/config/plans.yml b/hack/deployer/config/plans.yml similarity index 100% rename from operators/hack/deployer/config/plans.yml rename to hack/deployer/config/plans.yml diff --git a/operators/hack/deployer/main.go b/hack/deployer/main.go similarity index 100% rename from operators/hack/deployer/main.go rename to hack/deployer/main.go diff --git a/operators/hack/deployer/runner/aks.go b/hack/deployer/runner/aks.go similarity index 100% rename from operators/hack/deployer/runner/aks.go rename to hack/deployer/runner/aks.go diff --git a/operators/hack/deployer/runner/command.go b/hack/deployer/runner/command.go similarity index 100% rename from operators/hack/deployer/runner/command.go rename to hack/deployer/runner/command.go diff --git a/operators/hack/deployer/runner/driver.go b/hack/deployer/runner/driver.go similarity index 100% rename from operators/hack/deployer/runner/driver.go rename to hack/deployer/runner/driver.go diff --git a/operators/hack/deployer/runner/gke.go b/hack/deployer/runner/gke.go similarity index 100% rename from operators/hack/deployer/runner/gke.go rename to hack/deployer/runner/gke.go diff --git a/operators/hack/deployer/runner/settings.go b/hack/deployer/runner/settings.go similarity index 100% rename from operators/hack/deployer/runner/settings.go rename to hack/deployer/runner/settings.go diff --git a/operators/hack/deployer/runner/vault.go b/hack/deployer/runner/vault.go similarity index 100% rename from operators/hack/deployer/runner/vault.go rename to hack/deployer/runner/vault.go diff --git a/operators/hack/eck-dump.sh b/hack/eck-dump.sh similarity index 100% rename from operators/hack/eck-dump.sh rename to hack/eck-dump.sh diff --git a/operators/hack/minikube-cluster.sh b/hack/minikube-cluster.sh similarity index 100% rename from operators/hack/minikube-cluster.sh rename to hack/minikube-cluster.sh diff --git a/operators/hack/registry.sh b/hack/registry.sh similarity index 100% rename from operators/hack/registry.sh rename to hack/registry.sh diff --git a/operators/hack/release_notes.go b/hack/release_notes.go similarity index 100% rename from operators/hack/release_notes.go rename to hack/release_notes.go diff --git a/operators/hack/release_notes_test.go b/hack/release_notes_test.go similarity index 100% rename from operators/hack/release_notes_test.go rename to hack/release_notes_test.go diff --git a/operators/hack/update-doc-stack-version.sh b/hack/update-doc-stack-version.sh similarity index 100% rename from operators/hack/update-doc-stack-version.sh rename to hack/update-doc-stack-version.sh diff --git a/operators/README.md b/operators/README.md deleted file mode 100644 index 9f409d4a6e..0000000000 --- a/operators/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Elastic operators for Kubernetes - -This directory contains the source code of the Elastic operators used by Elastic Cloud on Kubernetes. - -For a broader introduction about the features of Elastic Cloud on Kubernetes, see the [README.md](../README.md) at the root of this repository. - -If you want to contribute to the project, check our [contributing guide](../CONTRIBUTING.md) and see [how to setup a local development environment](dev-setup.md). diff --git a/operators/pkg/about/base.go b/pkg/about/base.go similarity index 100% rename from operators/pkg/about/base.go rename to pkg/about/base.go diff --git a/operators/pkg/about/info.go b/pkg/about/info.go similarity index 100% rename from operators/pkg/about/info.go rename to pkg/about/info.go diff --git a/operators/pkg/about/info_test.go b/pkg/about/info_test.go similarity index 100% rename from operators/pkg/about/info_test.go rename to pkg/about/info_test.go diff --git a/operators/pkg/apis/addtoscheme_apm_v1alpha1.go b/pkg/apis/addtoscheme_apm_v1alpha1.go similarity index 100% rename from operators/pkg/apis/addtoscheme_apm_v1alpha1.go rename to pkg/apis/addtoscheme_apm_v1alpha1.go diff --git a/operators/pkg/apis/addtoscheme_associations_v1alpha1.go b/pkg/apis/addtoscheme_associations_v1alpha1.go similarity index 100% rename from operators/pkg/apis/addtoscheme_associations_v1alpha1.go rename to pkg/apis/addtoscheme_associations_v1alpha1.go diff --git a/operators/pkg/apis/addtoscheme_common_v1alpha1.go b/pkg/apis/addtoscheme_common_v1alpha1.go similarity index 100% rename from operators/pkg/apis/addtoscheme_common_v1alpha1.go rename to pkg/apis/addtoscheme_common_v1alpha1.go diff --git a/operators/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go b/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go similarity index 100% rename from operators/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go rename to pkg/apis/addtoscheme_elasticsearch_v1alpha1.go diff --git a/operators/pkg/apis/addtoscheme_kibana_v1alpha1.go b/pkg/apis/addtoscheme_kibana_v1alpha1.go similarity index 100% rename from operators/pkg/apis/addtoscheme_kibana_v1alpha1.go rename to pkg/apis/addtoscheme_kibana_v1alpha1.go diff --git a/operators/pkg/apis/apis.go b/pkg/apis/apis.go similarity index 100% rename from operators/pkg/apis/apis.go rename to pkg/apis/apis.go diff --git a/operators/pkg/apis/apm/group.go b/pkg/apis/apm/group.go similarity index 100% rename from operators/pkg/apis/apm/group.go rename to pkg/apis/apm/group.go diff --git a/operators/pkg/apis/apm/v1alpha1/apmserver_types.go b/pkg/apis/apm/v1alpha1/apmserver_types.go similarity index 100% rename from operators/pkg/apis/apm/v1alpha1/apmserver_types.go rename to pkg/apis/apm/v1alpha1/apmserver_types.go diff --git a/operators/pkg/apis/apm/v1alpha1/doc.go b/pkg/apis/apm/v1alpha1/doc.go similarity index 100% rename from operators/pkg/apis/apm/v1alpha1/doc.go rename to pkg/apis/apm/v1alpha1/doc.go diff --git a/operators/pkg/apis/apm/v1alpha1/register.go b/pkg/apis/apm/v1alpha1/register.go similarity index 100% rename from operators/pkg/apis/apm/v1alpha1/register.go rename to pkg/apis/apm/v1alpha1/register.go diff --git a/operators/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from operators/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go diff --git a/operators/pkg/apis/associations/group.go b/pkg/apis/associations/group.go similarity index 100% rename from operators/pkg/apis/associations/group.go rename to pkg/apis/associations/group.go diff --git a/operators/pkg/apis/associations/v1alpha1/doc.go b/pkg/apis/associations/v1alpha1/doc.go similarity index 100% rename from operators/pkg/apis/associations/v1alpha1/doc.go rename to pkg/apis/associations/v1alpha1/doc.go diff --git a/operators/pkg/apis/associations/v1alpha1/register.go b/pkg/apis/associations/v1alpha1/register.go similarity index 100% rename from operators/pkg/apis/associations/v1alpha1/register.go rename to pkg/apis/associations/v1alpha1/register.go diff --git a/operators/pkg/apis/associations/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/associations/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from operators/pkg/apis/associations/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/associations/v1alpha1/zz_generated.deepcopy.go diff --git a/operators/pkg/apis/common/group.go b/pkg/apis/common/group.go similarity index 100% rename from operators/pkg/apis/common/group.go rename to pkg/apis/common/group.go diff --git a/operators/pkg/apis/common/v1alpha1/association.go b/pkg/apis/common/v1alpha1/association.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/association.go rename to pkg/apis/common/v1alpha1/association.go diff --git a/operators/pkg/apis/common/v1alpha1/authentication.go b/pkg/apis/common/v1alpha1/authentication.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/authentication.go rename to pkg/apis/common/v1alpha1/authentication.go diff --git a/operators/pkg/apis/common/v1alpha1/common.go b/pkg/apis/common/v1alpha1/common.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/common.go rename to pkg/apis/common/v1alpha1/common.go diff --git a/operators/pkg/apis/common/v1alpha1/common_test.go b/pkg/apis/common/v1alpha1/common_test.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/common_test.go rename to pkg/apis/common/v1alpha1/common_test.go diff --git a/operators/pkg/apis/common/v1alpha1/config.go b/pkg/apis/common/v1alpha1/config.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/config.go rename to pkg/apis/common/v1alpha1/config.go diff --git a/operators/pkg/apis/common/v1alpha1/config_test.go b/pkg/apis/common/v1alpha1/config_test.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/config_test.go rename to pkg/apis/common/v1alpha1/config_test.go diff --git a/operators/pkg/apis/common/v1alpha1/doc.go b/pkg/apis/common/v1alpha1/doc.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/doc.go rename to pkg/apis/common/v1alpha1/doc.go diff --git a/operators/pkg/apis/common/v1alpha1/feature_flags.go b/pkg/apis/common/v1alpha1/feature_flags.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/feature_flags.go rename to pkg/apis/common/v1alpha1/feature_flags.go diff --git a/operators/pkg/apis/common/v1alpha1/feature_flags_test.go b/pkg/apis/common/v1alpha1/feature_flags_test.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/feature_flags_test.go rename to pkg/apis/common/v1alpha1/feature_flags_test.go diff --git a/operators/pkg/apis/common/v1alpha1/register.go b/pkg/apis/common/v1alpha1/register.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/register.go rename to pkg/apis/common/v1alpha1/register.go diff --git a/operators/pkg/apis/common/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/common/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from operators/pkg/apis/common/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/common/v1alpha1/zz_generated.deepcopy.go diff --git a/operators/pkg/apis/elasticsearch/group.go b/pkg/apis/elasticsearch/group.go similarity index 100% rename from operators/pkg/apis/elasticsearch/group.go rename to pkg/apis/elasticsearch/group.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/doc.go b/pkg/apis/elasticsearch/v1alpha1/doc.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/doc.go rename to pkg/apis/elasticsearch/v1alpha1/doc.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go rename to pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go rename to pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go rename to pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types_test.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types_test.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types_test.go rename to pkg/apis/elasticsearch/v1alpha1/elasticsearch_types_test.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/register.go b/pkg/apis/elasticsearch/v1alpha1/register.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/register.go rename to pkg/apis/elasticsearch/v1alpha1/register.go diff --git a/operators/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from operators/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go diff --git a/operators/pkg/apis/kibana/group.go b/pkg/apis/kibana/group.go similarity index 100% rename from operators/pkg/apis/kibana/group.go rename to pkg/apis/kibana/group.go diff --git a/operators/pkg/apis/kibana/v1alpha1/doc.go b/pkg/apis/kibana/v1alpha1/doc.go similarity index 100% rename from operators/pkg/apis/kibana/v1alpha1/doc.go rename to pkg/apis/kibana/v1alpha1/doc.go diff --git a/operators/pkg/apis/kibana/v1alpha1/kibana_types.go b/pkg/apis/kibana/v1alpha1/kibana_types.go similarity index 100% rename from operators/pkg/apis/kibana/v1alpha1/kibana_types.go rename to pkg/apis/kibana/v1alpha1/kibana_types.go diff --git a/operators/pkg/apis/kibana/v1alpha1/kibana_types_test.go b/pkg/apis/kibana/v1alpha1/kibana_types_test.go similarity index 100% rename from operators/pkg/apis/kibana/v1alpha1/kibana_types_test.go rename to pkg/apis/kibana/v1alpha1/kibana_types_test.go diff --git a/operators/pkg/apis/kibana/v1alpha1/register.go b/pkg/apis/kibana/v1alpha1/register.go similarity index 100% rename from operators/pkg/apis/kibana/v1alpha1/register.go rename to pkg/apis/kibana/v1alpha1/register.go diff --git a/operators/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from operators/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go diff --git a/operators/pkg/controller/add_apmserver.go b/pkg/controller/add_apmserver.go similarity index 100% rename from operators/pkg/controller/add_apmserver.go rename to pkg/controller/add_apmserver.go diff --git a/operators/pkg/controller/add_apmserverelasticsearchassociation.go b/pkg/controller/add_apmserverelasticsearchassociation.go similarity index 100% rename from operators/pkg/controller/add_apmserverelasticsearchassociation.go rename to pkg/controller/add_apmserverelasticsearchassociation.go diff --git a/operators/pkg/controller/add_association.go b/pkg/controller/add_association.go similarity index 100% rename from operators/pkg/controller/add_association.go rename to pkg/controller/add_association.go diff --git a/operators/pkg/controller/add_elasticsearch.go b/pkg/controller/add_elasticsearch.go similarity index 100% rename from operators/pkg/controller/add_elasticsearch.go rename to pkg/controller/add_elasticsearch.go diff --git a/operators/pkg/controller/add_kibana.go b/pkg/controller/add_kibana.go similarity index 100% rename from operators/pkg/controller/add_kibana.go rename to pkg/controller/add_kibana.go diff --git a/operators/pkg/controller/add_license.go b/pkg/controller/add_license.go similarity index 100% rename from operators/pkg/controller/add_license.go rename to pkg/controller/add_license.go diff --git a/operators/pkg/controller/apmserver/apmserver_controller.go b/pkg/controller/apmserver/apmserver_controller.go similarity index 100% rename from operators/pkg/controller/apmserver/apmserver_controller.go rename to pkg/controller/apmserver/apmserver_controller.go diff --git a/operators/pkg/controller/apmserver/apmserver_controller_test.go b/pkg/controller/apmserver/apmserver_controller_test.go similarity index 100% rename from operators/pkg/controller/apmserver/apmserver_controller_test.go rename to pkg/controller/apmserver/apmserver_controller_test.go diff --git a/operators/pkg/controller/apmserver/certificates/reconcile.go b/pkg/controller/apmserver/certificates/reconcile.go similarity index 100% rename from operators/pkg/controller/apmserver/certificates/reconcile.go rename to pkg/controller/apmserver/certificates/reconcile.go diff --git a/operators/pkg/controller/apmserver/config/config.go b/pkg/controller/apmserver/config/config.go similarity index 100% rename from operators/pkg/controller/apmserver/config/config.go rename to pkg/controller/apmserver/config/config.go diff --git a/operators/pkg/controller/apmserver/config/reconcile.go b/pkg/controller/apmserver/config/reconcile.go similarity index 100% rename from operators/pkg/controller/apmserver/config/reconcile.go rename to pkg/controller/apmserver/config/reconcile.go diff --git a/operators/pkg/controller/apmserver/deployment_control.go b/pkg/controller/apmserver/deployment_control.go similarity index 100% rename from operators/pkg/controller/apmserver/deployment_control.go rename to pkg/controller/apmserver/deployment_control.go diff --git a/operators/pkg/controller/apmserver/labels/labels.go b/pkg/controller/apmserver/labels/labels.go similarity index 100% rename from operators/pkg/controller/apmserver/labels/labels.go rename to pkg/controller/apmserver/labels/labels.go diff --git a/operators/pkg/controller/apmserver/name/name.go b/pkg/controller/apmserver/name/name.go similarity index 100% rename from operators/pkg/controller/apmserver/name/name.go rename to pkg/controller/apmserver/name/name.go diff --git a/operators/pkg/controller/apmserver/pod.go b/pkg/controller/apmserver/pod.go similarity index 100% rename from operators/pkg/controller/apmserver/pod.go rename to pkg/controller/apmserver/pod.go diff --git a/operators/pkg/controller/apmserver/pod_test.go b/pkg/controller/apmserver/pod_test.go similarity index 100% rename from operators/pkg/controller/apmserver/pod_test.go rename to pkg/controller/apmserver/pod_test.go diff --git a/operators/pkg/controller/apmserver/services.go b/pkg/controller/apmserver/services.go similarity index 100% rename from operators/pkg/controller/apmserver/services.go rename to pkg/controller/apmserver/services.go diff --git a/operators/pkg/controller/apmserver/state.go b/pkg/controller/apmserver/state.go similarity index 100% rename from operators/pkg/controller/apmserver/state.go rename to pkg/controller/apmserver/state.go diff --git a/operators/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go b/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go similarity index 100% rename from operators/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go rename to pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go diff --git a/operators/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go b/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go similarity index 100% rename from operators/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go rename to pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go diff --git a/operators/pkg/controller/apmserverelasticsearchassociation/labels.go b/pkg/controller/apmserverelasticsearchassociation/labels.go similarity index 100% rename from operators/pkg/controller/apmserverelasticsearchassociation/labels.go rename to pkg/controller/apmserverelasticsearchassociation/labels.go diff --git a/operators/pkg/controller/common/annotation/association_status.go b/pkg/controller/common/annotation/association_status.go similarity index 100% rename from operators/pkg/controller/common/annotation/association_status.go rename to pkg/controller/common/annotation/association_status.go diff --git a/operators/pkg/controller/common/annotation/controller_version.go b/pkg/controller/common/annotation/controller_version.go similarity index 100% rename from operators/pkg/controller/common/annotation/controller_version.go rename to pkg/controller/common/annotation/controller_version.go diff --git a/operators/pkg/controller/common/annotation/controller_version_test.go b/pkg/controller/common/annotation/controller_version_test.go similarity index 100% rename from operators/pkg/controller/common/annotation/controller_version_test.go rename to pkg/controller/common/annotation/controller_version_test.go diff --git a/operators/pkg/controller/common/annotation/pod.go b/pkg/controller/common/annotation/pod.go similarity index 100% rename from operators/pkg/controller/common/annotation/pod.go rename to pkg/controller/common/annotation/pod.go diff --git a/operators/pkg/controller/common/annotation/pod_test.go b/pkg/controller/common/annotation/pod_test.go similarity index 100% rename from operators/pkg/controller/common/annotation/pod_test.go rename to pkg/controller/common/annotation/pod_test.go diff --git a/operators/pkg/controller/common/association/association.go b/pkg/controller/common/association/association.go similarity index 100% rename from operators/pkg/controller/common/association/association.go rename to pkg/controller/common/association/association.go diff --git a/operators/pkg/controller/common/association/association_test.go b/pkg/controller/common/association/association_test.go similarity index 100% rename from operators/pkg/controller/common/association/association_test.go rename to pkg/controller/common/association/association_test.go diff --git a/operators/pkg/controller/common/association/user.go b/pkg/controller/common/association/user.go similarity index 100% rename from operators/pkg/controller/common/association/user.go rename to pkg/controller/common/association/user.go diff --git a/operators/pkg/controller/common/association/user_test.go b/pkg/controller/common/association/user_test.go similarity index 100% rename from operators/pkg/controller/common/association/user_test.go rename to pkg/controller/common/association/user_test.go diff --git a/operators/pkg/controller/common/certificates/ca.go b/pkg/controller/common/certificates/ca.go similarity index 100% rename from operators/pkg/controller/common/certificates/ca.go rename to pkg/controller/common/certificates/ca.go diff --git a/operators/pkg/controller/common/certificates/ca_reconcile.go b/pkg/controller/common/certificates/ca_reconcile.go similarity index 100% rename from operators/pkg/controller/common/certificates/ca_reconcile.go rename to pkg/controller/common/certificates/ca_reconcile.go diff --git a/operators/pkg/controller/common/certificates/ca_reconcile_test.go b/pkg/controller/common/certificates/ca_reconcile_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/ca_reconcile_test.go rename to pkg/controller/common/certificates/ca_reconcile_test.go diff --git a/operators/pkg/controller/common/certificates/ca_test.go b/pkg/controller/common/certificates/ca_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/ca_test.go rename to pkg/controller/common/certificates/ca_test.go diff --git a/operators/pkg/controller/common/certificates/expiration.go b/pkg/controller/common/certificates/expiration.go similarity index 100% rename from operators/pkg/controller/common/certificates/expiration.go rename to pkg/controller/common/certificates/expiration.go diff --git a/operators/pkg/controller/common/certificates/expiration_test.go b/pkg/controller/common/certificates/expiration_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/expiration_test.go rename to pkg/controller/common/certificates/expiration_test.go diff --git a/operators/pkg/controller/common/certificates/fields.go b/pkg/controller/common/certificates/fields.go similarity index 100% rename from operators/pkg/controller/common/certificates/fields.go rename to pkg/controller/common/certificates/fields.go diff --git a/operators/pkg/controller/common/certificates/http/certificates_secret.go b/pkg/controller/common/certificates/http/certificates_secret.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/certificates_secret.go rename to pkg/controller/common/certificates/http/certificates_secret.go diff --git a/operators/pkg/controller/common/certificates/http/certificates_secret_test.go b/pkg/controller/common/certificates/http/certificates_secret_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/certificates_secret_test.go rename to pkg/controller/common/certificates/http/certificates_secret_test.go diff --git a/operators/pkg/controller/common/certificates/http/dynamic_watches.go b/pkg/controller/common/certificates/http/dynamic_watches.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/dynamic_watches.go rename to pkg/controller/common/certificates/http/dynamic_watches.go diff --git a/operators/pkg/controller/common/certificates/http/public_secret.go b/pkg/controller/common/certificates/http/public_secret.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/public_secret.go rename to pkg/controller/common/certificates/http/public_secret.go diff --git a/operators/pkg/controller/common/certificates/http/public_secret_test.go b/pkg/controller/common/certificates/http/public_secret_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/public_secret_test.go rename to pkg/controller/common/certificates/http/public_secret_test.go diff --git a/operators/pkg/controller/common/certificates/http/reconcile.go b/pkg/controller/common/certificates/http/reconcile.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/reconcile.go rename to pkg/controller/common/certificates/http/reconcile.go diff --git a/operators/pkg/controller/common/certificates/http/reconcile_test.go b/pkg/controller/common/certificates/http/reconcile_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/reconcile_test.go rename to pkg/controller/common/certificates/http/reconcile_test.go diff --git a/operators/pkg/controller/common/certificates/http/testdata/ca.crt b/pkg/controller/common/certificates/http/testdata/ca.crt similarity index 100% rename from operators/pkg/controller/common/certificates/http/testdata/ca.crt rename to pkg/controller/common/certificates/http/testdata/ca.crt diff --git a/operators/pkg/controller/common/certificates/http/testdata/chain.crt b/pkg/controller/common/certificates/http/testdata/chain.crt similarity index 100% rename from operators/pkg/controller/common/certificates/http/testdata/chain.crt rename to pkg/controller/common/certificates/http/testdata/chain.crt diff --git a/operators/pkg/controller/common/certificates/http/testdata/corrupted.key b/pkg/controller/common/certificates/http/testdata/corrupted.key similarity index 100% rename from operators/pkg/controller/common/certificates/http/testdata/corrupted.key rename to pkg/controller/common/certificates/http/testdata/corrupted.key diff --git a/operators/pkg/controller/common/certificates/http/testdata/tls.crt b/pkg/controller/common/certificates/http/testdata/tls.crt similarity index 100% rename from operators/pkg/controller/common/certificates/http/testdata/tls.crt rename to pkg/controller/common/certificates/http/testdata/tls.crt diff --git a/operators/pkg/controller/common/certificates/http/testdata/tls.key b/pkg/controller/common/certificates/http/testdata/tls.key similarity index 100% rename from operators/pkg/controller/common/certificates/http/testdata/tls.key rename to pkg/controller/common/certificates/http/testdata/tls.key diff --git a/operators/pkg/controller/common/certificates/http/volume.go b/pkg/controller/common/certificates/http/volume.go similarity index 100% rename from operators/pkg/controller/common/certificates/http/volume.go rename to pkg/controller/common/certificates/http/volume.go diff --git a/operators/pkg/controller/common/certificates/keys.go b/pkg/controller/common/certificates/keys.go similarity index 100% rename from operators/pkg/controller/common/certificates/keys.go rename to pkg/controller/common/certificates/keys.go diff --git a/operators/pkg/controller/common/certificates/keys_test.go b/pkg/controller/common/certificates/keys_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/keys_test.go rename to pkg/controller/common/certificates/keys_test.go diff --git a/operators/pkg/controller/common/certificates/name.go b/pkg/controller/common/certificates/name.go similarity index 100% rename from operators/pkg/controller/common/certificates/name.go rename to pkg/controller/common/certificates/name.go diff --git a/operators/pkg/controller/common/certificates/pem.go b/pkg/controller/common/certificates/pem.go similarity index 100% rename from operators/pkg/controller/common/certificates/pem.go rename to pkg/controller/common/certificates/pem.go diff --git a/operators/pkg/controller/common/certificates/x509_othername.go b/pkg/controller/common/certificates/x509_othername.go similarity index 100% rename from operators/pkg/controller/common/certificates/x509_othername.go rename to pkg/controller/common/certificates/x509_othername.go diff --git a/operators/pkg/controller/common/certificates/x509_othername_test.go b/pkg/controller/common/certificates/x509_othername_test.go similarity index 100% rename from operators/pkg/controller/common/certificates/x509_othername_test.go rename to pkg/controller/common/certificates/x509_othername_test.go diff --git a/operators/pkg/controller/common/defaults/labels.go b/pkg/controller/common/defaults/labels.go similarity index 100% rename from operators/pkg/controller/common/defaults/labels.go rename to pkg/controller/common/defaults/labels.go diff --git a/operators/pkg/controller/common/defaults/labels_test.go b/pkg/controller/common/defaults/labels_test.go similarity index 100% rename from operators/pkg/controller/common/defaults/labels_test.go rename to pkg/controller/common/defaults/labels_test.go diff --git a/operators/pkg/controller/common/defaults/pod_template.go b/pkg/controller/common/defaults/pod_template.go similarity index 100% rename from operators/pkg/controller/common/defaults/pod_template.go rename to pkg/controller/common/defaults/pod_template.go diff --git a/operators/pkg/controller/common/defaults/pod_template_test.go b/pkg/controller/common/defaults/pod_template_test.go similarity index 100% rename from operators/pkg/controller/common/defaults/pod_template_test.go rename to pkg/controller/common/defaults/pod_template_test.go diff --git a/operators/pkg/controller/common/defaults/pvc.go b/pkg/controller/common/defaults/pvc.go similarity index 100% rename from operators/pkg/controller/common/defaults/pvc.go rename to pkg/controller/common/defaults/pvc.go diff --git a/operators/pkg/controller/common/defaults/pvc_test.go b/pkg/controller/common/defaults/pvc_test.go similarity index 100% rename from operators/pkg/controller/common/defaults/pvc_test.go rename to pkg/controller/common/defaults/pvc_test.go diff --git a/operators/pkg/controller/common/defaults/service.go b/pkg/controller/common/defaults/service.go similarity index 100% rename from operators/pkg/controller/common/defaults/service.go rename to pkg/controller/common/defaults/service.go diff --git a/operators/pkg/controller/common/defaults/service_test.go b/pkg/controller/common/defaults/service_test.go similarity index 100% rename from operators/pkg/controller/common/defaults/service_test.go rename to pkg/controller/common/defaults/service_test.go diff --git a/operators/pkg/controller/common/events/events.go b/pkg/controller/common/events/events.go similarity index 100% rename from operators/pkg/controller/common/events/events.go rename to pkg/controller/common/events/events.go diff --git a/operators/pkg/controller/common/finalizer/handler.go b/pkg/controller/common/finalizer/handler.go similarity index 100% rename from operators/pkg/controller/common/finalizer/handler.go rename to pkg/controller/common/finalizer/handler.go diff --git a/operators/pkg/controller/common/finalizer/handler_test.go b/pkg/controller/common/finalizer/handler_test.go similarity index 100% rename from operators/pkg/controller/common/finalizer/handler_test.go rename to pkg/controller/common/finalizer/handler_test.go diff --git a/operators/pkg/controller/common/hash/hash.go b/pkg/controller/common/hash/hash.go similarity index 100% rename from operators/pkg/controller/common/hash/hash.go rename to pkg/controller/common/hash/hash.go diff --git a/operators/pkg/controller/common/hash/hash_test.go b/pkg/controller/common/hash/hash_test.go similarity index 100% rename from operators/pkg/controller/common/hash/hash_test.go rename to pkg/controller/common/hash/hash_test.go diff --git a/operators/pkg/controller/common/int.go b/pkg/controller/common/int.go similarity index 100% rename from operators/pkg/controller/common/int.go rename to pkg/controller/common/int.go diff --git a/operators/pkg/controller/common/keystore/initcontainer.go b/pkg/controller/common/keystore/initcontainer.go similarity index 100% rename from operators/pkg/controller/common/keystore/initcontainer.go rename to pkg/controller/common/keystore/initcontainer.go diff --git a/operators/pkg/controller/common/keystore/resources.go b/pkg/controller/common/keystore/resources.go similarity index 100% rename from operators/pkg/controller/common/keystore/resources.go rename to pkg/controller/common/keystore/resources.go diff --git a/operators/pkg/controller/common/keystore/resources_test.go b/pkg/controller/common/keystore/resources_test.go similarity index 100% rename from operators/pkg/controller/common/keystore/resources_test.go rename to pkg/controller/common/keystore/resources_test.go diff --git a/operators/pkg/controller/common/keystore/user_secret.go b/pkg/controller/common/keystore/user_secret.go similarity index 100% rename from operators/pkg/controller/common/keystore/user_secret.go rename to pkg/controller/common/keystore/user_secret.go diff --git a/operators/pkg/controller/common/keystore/user_secret_test.go b/pkg/controller/common/keystore/user_secret_test.go similarity index 100% rename from operators/pkg/controller/common/keystore/user_secret_test.go rename to pkg/controller/common/keystore/user_secret_test.go diff --git a/operators/pkg/controller/common/keystore/volumes.go b/pkg/controller/common/keystore/volumes.go similarity index 100% rename from operators/pkg/controller/common/keystore/volumes.go rename to pkg/controller/common/keystore/volumes.go diff --git a/operators/pkg/controller/common/labels.go b/pkg/controller/common/labels.go similarity index 100% rename from operators/pkg/controller/common/labels.go rename to pkg/controller/common/labels.go diff --git a/operators/pkg/controller/common/labels_test.go b/pkg/controller/common/labels_test.go similarity index 100% rename from operators/pkg/controller/common/labels_test.go rename to pkg/controller/common/labels_test.go diff --git a/operators/pkg/controller/common/license/check.go b/pkg/controller/common/license/check.go similarity index 100% rename from operators/pkg/controller/common/license/check.go rename to pkg/controller/common/license/check.go diff --git a/operators/pkg/controller/common/license/check_test.go b/pkg/controller/common/license/check_test.go similarity index 100% rename from operators/pkg/controller/common/license/check_test.go rename to pkg/controller/common/license/check_test.go diff --git a/operators/pkg/controller/common/license/crud.go b/pkg/controller/common/license/crud.go similarity index 100% rename from operators/pkg/controller/common/license/crud.go rename to pkg/controller/common/license/crud.go diff --git a/operators/pkg/controller/common/license/detection.go b/pkg/controller/common/license/detection.go similarity index 100% rename from operators/pkg/controller/common/license/detection.go rename to pkg/controller/common/license/detection.go diff --git a/operators/pkg/controller/common/license/detection_test.go b/pkg/controller/common/license/detection_test.go similarity index 100% rename from operators/pkg/controller/common/license/detection_test.go rename to pkg/controller/common/license/detection_test.go diff --git a/operators/pkg/controller/common/license/fixtures_test.go b/pkg/controller/common/license/fixtures_test.go similarity index 100% rename from operators/pkg/controller/common/license/fixtures_test.go rename to pkg/controller/common/license/fixtures_test.go diff --git a/operators/pkg/controller/common/license/labels.go b/pkg/controller/common/license/labels.go similarity index 100% rename from operators/pkg/controller/common/license/labels.go rename to pkg/controller/common/license/labels.go diff --git a/operators/pkg/controller/common/license/license.go b/pkg/controller/common/license/license.go similarity index 100% rename from operators/pkg/controller/common/license/license.go rename to pkg/controller/common/license/license.go diff --git a/operators/pkg/controller/common/license/match.go b/pkg/controller/common/license/match.go similarity index 100% rename from operators/pkg/controller/common/license/match.go rename to pkg/controller/common/license/match.go diff --git a/operators/pkg/controller/common/license/match_test.go b/pkg/controller/common/license/match_test.go similarity index 100% rename from operators/pkg/controller/common/license/match_test.go rename to pkg/controller/common/license/match_test.go diff --git a/operators/pkg/controller/common/license/model.go b/pkg/controller/common/license/model.go similarity index 100% rename from operators/pkg/controller/common/license/model.go rename to pkg/controller/common/license/model.go diff --git a/operators/pkg/controller/common/license/model_test.go b/pkg/controller/common/license/model_test.go similarity index 100% rename from operators/pkg/controller/common/license/model_test.go rename to pkg/controller/common/license/model_test.go diff --git a/operators/pkg/controller/common/license/parser.go b/pkg/controller/common/license/parser.go similarity index 100% rename from operators/pkg/controller/common/license/parser.go rename to pkg/controller/common/license/parser.go diff --git a/operators/pkg/controller/common/license/parser_test.go b/pkg/controller/common/license/parser_test.go similarity index 100% rename from operators/pkg/controller/common/license/parser_test.go rename to pkg/controller/common/license/parser_test.go diff --git a/operators/pkg/controller/common/license/pubkey.go b/pkg/controller/common/license/pubkey.go similarity index 100% rename from operators/pkg/controller/common/license/pubkey.go rename to pkg/controller/common/license/pubkey.go diff --git a/operators/pkg/controller/common/license/pubkey_dev.go b/pkg/controller/common/license/pubkey_dev.go similarity index 100% rename from operators/pkg/controller/common/license/pubkey_dev.go rename to pkg/controller/common/license/pubkey_dev.go diff --git a/operators/pkg/controller/common/license/testdata/test-error.json b/pkg/controller/common/license/testdata/test-error.json similarity index 100% rename from operators/pkg/controller/common/license/testdata/test-error.json rename to pkg/controller/common/license/testdata/test-error.json diff --git a/operators/pkg/controller/common/license/testdata/test-license.json b/pkg/controller/common/license/testdata/test-license.json similarity index 100% rename from operators/pkg/controller/common/license/testdata/test-license.json rename to pkg/controller/common/license/testdata/test-license.json diff --git a/operators/pkg/controller/common/license/trial.go b/pkg/controller/common/license/trial.go similarity index 100% rename from operators/pkg/controller/common/license/trial.go rename to pkg/controller/common/license/trial.go diff --git a/operators/pkg/controller/common/license/trial_test.go b/pkg/controller/common/license/trial_test.go similarity index 100% rename from operators/pkg/controller/common/license/trial_test.go rename to pkg/controller/common/license/trial_test.go diff --git a/operators/pkg/controller/common/license/verifier.go b/pkg/controller/common/license/verifier.go similarity index 100% rename from operators/pkg/controller/common/license/verifier.go rename to pkg/controller/common/license/verifier.go diff --git a/operators/pkg/controller/common/license/verifier_test.go b/pkg/controller/common/license/verifier_test.go similarity index 100% rename from operators/pkg/controller/common/license/verifier_test.go rename to pkg/controller/common/license/verifier_test.go diff --git a/operators/pkg/controller/common/license/watches.go b/pkg/controller/common/license/watches.go similarity index 100% rename from operators/pkg/controller/common/license/watches.go rename to pkg/controller/common/license/watches.go diff --git a/operators/pkg/controller/common/name/name.go b/pkg/controller/common/name/name.go similarity index 100% rename from operators/pkg/controller/common/name/name.go rename to pkg/controller/common/name/name.go diff --git a/operators/pkg/controller/common/name/name_test.go b/pkg/controller/common/name/name_test.go similarity index 100% rename from operators/pkg/controller/common/name/name_test.go rename to pkg/controller/common/name/name_test.go diff --git a/operators/pkg/controller/common/operator/const.go b/pkg/controller/common/operator/const.go similarity index 100% rename from operators/pkg/controller/common/operator/const.go rename to pkg/controller/common/operator/const.go diff --git a/operators/pkg/controller/common/operator/parameters.go b/pkg/controller/common/operator/parameters.go similarity index 100% rename from operators/pkg/controller/common/operator/parameters.go rename to pkg/controller/common/operator/parameters.go diff --git a/operators/pkg/controller/common/operator/roles.go b/pkg/controller/common/operator/roles.go similarity index 100% rename from operators/pkg/controller/common/operator/roles.go rename to pkg/controller/common/operator/roles.go diff --git a/operators/pkg/controller/common/operator/roles_test.go b/pkg/controller/common/operator/roles_test.go similarity index 100% rename from operators/pkg/controller/common/operator/roles_test.go rename to pkg/controller/common/operator/roles_test.go diff --git a/operators/pkg/controller/common/pause.go b/pkg/controller/common/pause.go similarity index 100% rename from operators/pkg/controller/common/pause.go rename to pkg/controller/common/pause.go diff --git a/operators/pkg/controller/common/pause_test.go b/pkg/controller/common/pause_test.go similarity index 100% rename from operators/pkg/controller/common/pause_test.go rename to pkg/controller/common/pause_test.go diff --git a/operators/pkg/controller/common/pod/spec.go b/pkg/controller/common/pod/spec.go similarity index 100% rename from operators/pkg/controller/common/pod/spec.go rename to pkg/controller/common/pod/spec.go diff --git a/operators/pkg/controller/common/reconciler/expectations.go b/pkg/controller/common/reconciler/expectations.go similarity index 100% rename from operators/pkg/controller/common/reconciler/expectations.go rename to pkg/controller/common/reconciler/expectations.go diff --git a/operators/pkg/controller/common/reconciler/expectations_test.go b/pkg/controller/common/reconciler/expectations_test.go similarity index 100% rename from operators/pkg/controller/common/reconciler/expectations_test.go rename to pkg/controller/common/reconciler/expectations_test.go diff --git a/operators/pkg/controller/common/reconciler/handler.go b/pkg/controller/common/reconciler/handler.go similarity index 100% rename from operators/pkg/controller/common/reconciler/handler.go rename to pkg/controller/common/reconciler/handler.go diff --git a/operators/pkg/controller/common/reconciler/reconciler.go b/pkg/controller/common/reconciler/reconciler.go similarity index 100% rename from operators/pkg/controller/common/reconciler/reconciler.go rename to pkg/controller/common/reconciler/reconciler.go diff --git a/operators/pkg/controller/common/reconciler/reconciler_test.go b/pkg/controller/common/reconciler/reconciler_test.go similarity index 100% rename from operators/pkg/controller/common/reconciler/reconciler_test.go rename to pkg/controller/common/reconciler/reconciler_test.go diff --git a/operators/pkg/controller/common/reconciler/results.go b/pkg/controller/common/reconciler/results.go similarity index 100% rename from operators/pkg/controller/common/reconciler/results.go rename to pkg/controller/common/reconciler/results.go diff --git a/operators/pkg/controller/common/reconciler/results_test.go b/pkg/controller/common/reconciler/results_test.go similarity index 100% rename from operators/pkg/controller/common/reconciler/results_test.go rename to pkg/controller/common/reconciler/results_test.go diff --git a/operators/pkg/controller/common/service_control.go b/pkg/controller/common/service_control.go similarity index 100% rename from operators/pkg/controller/common/service_control.go rename to pkg/controller/common/service_control.go diff --git a/operators/pkg/controller/common/service_control_test.go b/pkg/controller/common/service_control_test.go similarity index 100% rename from operators/pkg/controller/common/service_control_test.go rename to pkg/controller/common/service_control_test.go diff --git a/operators/pkg/controller/common/settings/canonical_config.go b/pkg/controller/common/settings/canonical_config.go similarity index 100% rename from operators/pkg/controller/common/settings/canonical_config.go rename to pkg/controller/common/settings/canonical_config.go diff --git a/operators/pkg/controller/common/settings/canonical_config_test.go b/pkg/controller/common/settings/canonical_config_test.go similarity index 100% rename from operators/pkg/controller/common/settings/canonical_config_test.go rename to pkg/controller/common/settings/canonical_config_test.go diff --git a/operators/pkg/controller/common/user/external.go b/pkg/controller/common/user/external.go similarity index 100% rename from operators/pkg/controller/common/user/external.go rename to pkg/controller/common/user/external.go diff --git a/operators/pkg/controller/common/user/external_test.go b/pkg/controller/common/user/external_test.go similarity index 100% rename from operators/pkg/controller/common/user/external_test.go rename to pkg/controller/common/user/external_test.go diff --git a/operators/pkg/controller/common/user/finalizer.go b/pkg/controller/common/user/finalizer.go similarity index 100% rename from operators/pkg/controller/common/user/finalizer.go rename to pkg/controller/common/user/finalizer.go diff --git a/operators/pkg/controller/common/user/label.go b/pkg/controller/common/user/label.go similarity index 100% rename from operators/pkg/controller/common/user/label.go rename to pkg/controller/common/user/label.go diff --git a/operators/pkg/controller/common/user/user.go b/pkg/controller/common/user/user.go similarity index 100% rename from operators/pkg/controller/common/user/user.go rename to pkg/controller/common/user/user.go diff --git a/operators/pkg/controller/common/user/utils.go b/pkg/controller/common/user/utils.go similarity index 100% rename from operators/pkg/controller/common/user/utils.go rename to pkg/controller/common/user/utils.go diff --git a/operators/pkg/controller/common/validation/validation.go b/pkg/controller/common/validation/validation.go similarity index 100% rename from operators/pkg/controller/common/validation/validation.go rename to pkg/controller/common/validation/validation.go diff --git a/operators/pkg/controller/common/version/version.go b/pkg/controller/common/version/version.go similarity index 100% rename from operators/pkg/controller/common/version/version.go rename to pkg/controller/common/version/version.go diff --git a/operators/pkg/controller/common/version/version_test.go b/pkg/controller/common/version/version_test.go similarity index 100% rename from operators/pkg/controller/common/version/version_test.go rename to pkg/controller/common/version/version_test.go diff --git a/operators/pkg/controller/common/volume/configmap.go b/pkg/controller/common/volume/configmap.go similarity index 100% rename from operators/pkg/controller/common/volume/configmap.go rename to pkg/controller/common/volume/configmap.go diff --git a/operators/pkg/controller/common/volume/emptydir.go b/pkg/controller/common/volume/emptydir.go similarity index 100% rename from operators/pkg/controller/common/volume/emptydir.go rename to pkg/controller/common/volume/emptydir.go diff --git a/operators/pkg/controller/common/volume/emptydir_test.go b/pkg/controller/common/volume/emptydir_test.go similarity index 100% rename from operators/pkg/controller/common/volume/emptydir_test.go rename to pkg/controller/common/volume/emptydir_test.go diff --git a/operators/pkg/controller/common/volume/secret.go b/pkg/controller/common/volume/secret.go similarity index 100% rename from operators/pkg/controller/common/volume/secret.go rename to pkg/controller/common/volume/secret.go diff --git a/operators/pkg/controller/common/volume/secret_test.go b/pkg/controller/common/volume/secret_test.go similarity index 100% rename from operators/pkg/controller/common/volume/secret_test.go rename to pkg/controller/common/volume/secret_test.go diff --git a/operators/pkg/controller/common/volume/volume.go b/pkg/controller/common/volume/volume.go similarity index 100% rename from operators/pkg/controller/common/volume/volume.go rename to pkg/controller/common/volume/volume.go diff --git a/operators/pkg/controller/common/watches/handler.go b/pkg/controller/common/watches/handler.go similarity index 100% rename from operators/pkg/controller/common/watches/handler.go rename to pkg/controller/common/watches/handler.go diff --git a/operators/pkg/controller/common/watches/handler_integration_test.go b/pkg/controller/common/watches/handler_integration_test.go similarity index 100% rename from operators/pkg/controller/common/watches/handler_integration_test.go rename to pkg/controller/common/watches/handler_integration_test.go diff --git a/operators/pkg/controller/common/watches/handler_test.go b/pkg/controller/common/watches/handler_test.go similarity index 100% rename from operators/pkg/controller/common/watches/handler_test.go rename to pkg/controller/common/watches/handler_test.go diff --git a/operators/pkg/controller/common/watches/named_watch.go b/pkg/controller/common/watches/named_watch.go similarity index 100% rename from operators/pkg/controller/common/watches/named_watch.go rename to pkg/controller/common/watches/named_watch.go diff --git a/operators/pkg/controller/common/watches/owner_watch.go b/pkg/controller/common/watches/owner_watch.go similarity index 100% rename from operators/pkg/controller/common/watches/owner_watch.go rename to pkg/controller/common/watches/owner_watch.go diff --git a/operators/pkg/controller/common/watches/state.go b/pkg/controller/common/watches/state.go similarity index 100% rename from operators/pkg/controller/common/watches/state.go rename to pkg/controller/common/watches/state.go diff --git a/operators/pkg/controller/controller.go b/pkg/controller/controller.go similarity index 100% rename from operators/pkg/controller/controller.go rename to pkg/controller/controller.go diff --git a/operators/pkg/controller/elasticsearch/certificates/ca_reconcile.go b/pkg/controller/elasticsearch/certificates/ca_reconcile.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/ca_reconcile.go rename to pkg/controller/elasticsearch/certificates/ca_reconcile.go diff --git a/operators/pkg/controller/elasticsearch/certificates/doc.go b/pkg/controller/elasticsearch/certificates/doc.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/doc.go rename to pkg/controller/elasticsearch/certificates/doc.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/csr.go b/pkg/controller/elasticsearch/certificates/transport/csr.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/csr.go rename to pkg/controller/elasticsearch/certificates/transport/csr.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/csr_test.go b/pkg/controller/elasticsearch/certificates/transport/csr_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/csr_test.go rename to pkg/controller/elasticsearch/certificates/transport/csr_test.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/doc.go b/pkg/controller/elasticsearch/certificates/transport/doc.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/doc.go rename to pkg/controller/elasticsearch/certificates/transport/doc.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/pod_secret.go b/pkg/controller/elasticsearch/certificates/transport/pod_secret.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/pod_secret.go rename to pkg/controller/elasticsearch/certificates/transport/pod_secret.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go b/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go rename to pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/public_secret.go b/pkg/controller/elasticsearch/certificates/transport/public_secret.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/public_secret.go rename to pkg/controller/elasticsearch/certificates/transport/public_secret.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go b/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go rename to pkg/controller/elasticsearch/certificates/transport/public_secret_test.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/reconcile.go b/pkg/controller/elasticsearch/certificates/transport/reconcile.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/reconcile.go rename to pkg/controller/elasticsearch/certificates/transport/reconcile.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go b/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go rename to pkg/controller/elasticsearch/certificates/transport/reconcile_test.go diff --git a/operators/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go b/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go rename to pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go diff --git a/operators/pkg/controller/elasticsearch/cleanup/resources.go b/pkg/controller/elasticsearch/cleanup/resources.go similarity index 100% rename from operators/pkg/controller/elasticsearch/cleanup/resources.go rename to pkg/controller/elasticsearch/cleanup/resources.go diff --git a/operators/pkg/controller/elasticsearch/cleanup/resources_test.go b/pkg/controller/elasticsearch/cleanup/resources_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/cleanup/resources_test.go rename to pkg/controller/elasticsearch/cleanup/resources_test.go diff --git a/operators/pkg/controller/elasticsearch/client/base.go b/pkg/controller/elasticsearch/client/base.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/base.go rename to pkg/controller/elasticsearch/client/base.go diff --git a/operators/pkg/controller/elasticsearch/client/client.go b/pkg/controller/elasticsearch/client/client.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/client.go rename to pkg/controller/elasticsearch/client/client.go diff --git a/operators/pkg/controller/elasticsearch/client/client_test.go b/pkg/controller/elasticsearch/client/client_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/client_test.go rename to pkg/controller/elasticsearch/client/client_test.go diff --git a/operators/pkg/controller/elasticsearch/client/mock.go b/pkg/controller/elasticsearch/client/mock.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/mock.go rename to pkg/controller/elasticsearch/client/mock.go diff --git a/operators/pkg/controller/elasticsearch/client/model.go b/pkg/controller/elasticsearch/client/model.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/model.go rename to pkg/controller/elasticsearch/client/model.go diff --git a/operators/pkg/controller/elasticsearch/client/model_test.go b/pkg/controller/elasticsearch/client/model_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/model_test.go rename to pkg/controller/elasticsearch/client/model_test.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/cluster_state.go b/pkg/controller/elasticsearch/client/test_fixtures/cluster_state.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/cluster_state.go rename to pkg/controller/elasticsearch/client/test_fixtures/cluster_state.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/errors.go b/pkg/controller/elasticsearch/client/test_fixtures/errors.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/errors.go rename to pkg/controller/elasticsearch/client/test_fixtures/errors.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/health.go b/pkg/controller/elasticsearch/client/test_fixtures/health.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/health.go rename to pkg/controller/elasticsearch/client/test_fixtures/health.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/info.go b/pkg/controller/elasticsearch/client/test_fixtures/info.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/info.go rename to pkg/controller/elasticsearch/client/test_fixtures/info.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/license.go b/pkg/controller/elasticsearch/client/test_fixtures/license.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/license.go rename to pkg/controller/elasticsearch/client/test_fixtures/license.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/nodes.go b/pkg/controller/elasticsearch/client/test_fixtures/nodes.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/nodes.go rename to pkg/controller/elasticsearch/client/test_fixtures/nodes.go diff --git a/operators/pkg/controller/elasticsearch/client/test_fixtures/nodes_stats.go b/pkg/controller/elasticsearch/client/test_fixtures/nodes_stats.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/test_fixtures/nodes_stats.go rename to pkg/controller/elasticsearch/client/test_fixtures/nodes_stats.go diff --git a/operators/pkg/controller/elasticsearch/client/v6.go b/pkg/controller/elasticsearch/client/v6.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/v6.go rename to pkg/controller/elasticsearch/client/v6.go diff --git a/operators/pkg/controller/elasticsearch/client/v7.go b/pkg/controller/elasticsearch/client/v7.go similarity index 100% rename from operators/pkg/controller/elasticsearch/client/v7.go rename to pkg/controller/elasticsearch/client/v7.go diff --git a/operators/pkg/controller/elasticsearch/configmap/configmap.go b/pkg/controller/elasticsearch/configmap/configmap.go similarity index 100% rename from operators/pkg/controller/elasticsearch/configmap/configmap.go rename to pkg/controller/elasticsearch/configmap/configmap.go diff --git a/operators/pkg/controller/elasticsearch/configmap/configmap_control.go b/pkg/controller/elasticsearch/configmap/configmap_control.go similarity index 100% rename from operators/pkg/controller/elasticsearch/configmap/configmap_control.go rename to pkg/controller/elasticsearch/configmap/configmap_control.go diff --git a/operators/pkg/controller/elasticsearch/driver/downscale.go b/pkg/controller/elasticsearch/driver/downscale.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/downscale.go rename to pkg/controller/elasticsearch/driver/downscale.go diff --git a/operators/pkg/controller/elasticsearch/driver/downscale_invariants.go b/pkg/controller/elasticsearch/driver/downscale_invariants.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/downscale_invariants.go rename to pkg/controller/elasticsearch/driver/downscale_invariants.go diff --git a/operators/pkg/controller/elasticsearch/driver/downscale_invariants_test.go b/pkg/controller/elasticsearch/driver/downscale_invariants_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/downscale_invariants_test.go rename to pkg/controller/elasticsearch/driver/downscale_invariants_test.go diff --git a/operators/pkg/controller/elasticsearch/driver/downscale_test.go b/pkg/controller/elasticsearch/driver/downscale_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/downscale_test.go rename to pkg/controller/elasticsearch/driver/downscale_test.go diff --git a/operators/pkg/controller/elasticsearch/driver/downscale_utils.go b/pkg/controller/elasticsearch/driver/downscale_utils.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/downscale_utils.go rename to pkg/controller/elasticsearch/driver/downscale_utils.go diff --git a/operators/pkg/controller/elasticsearch/driver/downscale_utils_test.go b/pkg/controller/elasticsearch/driver/downscale_utils_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/downscale_utils_test.go rename to pkg/controller/elasticsearch/driver/downscale_utils_test.go diff --git a/operators/pkg/controller/elasticsearch/driver/driver.go b/pkg/controller/elasticsearch/driver/driver.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/driver.go rename to pkg/controller/elasticsearch/driver/driver.go diff --git a/operators/pkg/controller/elasticsearch/driver/esstate.go b/pkg/controller/elasticsearch/driver/esstate.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/esstate.go rename to pkg/controller/elasticsearch/driver/esstate.go diff --git a/operators/pkg/controller/elasticsearch/driver/log.go b/pkg/controller/elasticsearch/driver/log.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/log.go rename to pkg/controller/elasticsearch/driver/log.go diff --git a/operators/pkg/controller/elasticsearch/driver/nodes.go b/pkg/controller/elasticsearch/driver/nodes.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/nodes.go rename to pkg/controller/elasticsearch/driver/nodes.go diff --git a/operators/pkg/controller/elasticsearch/driver/nodes_test.go b/pkg/controller/elasticsearch/driver/nodes_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/nodes_test.go rename to pkg/controller/elasticsearch/driver/nodes_test.go diff --git a/operators/pkg/controller/elasticsearch/driver/upgrade.go b/pkg/controller/elasticsearch/driver/upgrade.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/upgrade.go rename to pkg/controller/elasticsearch/driver/upgrade.go diff --git a/operators/pkg/controller/elasticsearch/driver/upgrade_test.go b/pkg/controller/elasticsearch/driver/upgrade_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/upgrade_test.go rename to pkg/controller/elasticsearch/driver/upgrade_test.go diff --git a/operators/pkg/controller/elasticsearch/driver/upscale.go b/pkg/controller/elasticsearch/driver/upscale.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/upscale.go rename to pkg/controller/elasticsearch/driver/upscale.go diff --git a/operators/pkg/controller/elasticsearch/driver/upscale_test.go b/pkg/controller/elasticsearch/driver/upscale_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/driver/upscale_test.go rename to pkg/controller/elasticsearch/driver/upscale_test.go diff --git a/operators/pkg/controller/elasticsearch/elasticsearch_controller.go b/pkg/controller/elasticsearch/elasticsearch_controller.go similarity index 100% rename from operators/pkg/controller/elasticsearch/elasticsearch_controller.go rename to pkg/controller/elasticsearch/elasticsearch_controller.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/initcontainer.go b/pkg/controller/elasticsearch/initcontainer/initcontainer.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/initcontainer.go rename to pkg/controller/elasticsearch/initcontainer/initcontainer.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go b/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go rename to pkg/controller/elasticsearch/initcontainer/initcontainer_test.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/keystore.go b/pkg/controller/elasticsearch/initcontainer/keystore.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/keystore.go rename to pkg/controller/elasticsearch/initcontainer/keystore.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/linked_files.go b/pkg/controller/elasticsearch/initcontainer/linked_files.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/linked_files.go rename to pkg/controller/elasticsearch/initcontainer/linked_files.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/os_settings.go b/pkg/controller/elasticsearch/initcontainer/os_settings.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/os_settings.go rename to pkg/controller/elasticsearch/initcontainer/os_settings.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/prepare_fs.go b/pkg/controller/elasticsearch/initcontainer/prepare_fs.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/prepare_fs.go rename to pkg/controller/elasticsearch/initcontainer/prepare_fs.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/prepare_fs_script.go b/pkg/controller/elasticsearch/initcontainer/prepare_fs_script.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/prepare_fs_script.go rename to pkg/controller/elasticsearch/initcontainer/prepare_fs_script.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/prepare_fs_script_test.go b/pkg/controller/elasticsearch/initcontainer/prepare_fs_script_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/prepare_fs_script_test.go rename to pkg/controller/elasticsearch/initcontainer/prepare_fs_script_test.go diff --git a/operators/pkg/controller/elasticsearch/initcontainer/shared_volumes.go b/pkg/controller/elasticsearch/initcontainer/shared_volumes.go similarity index 100% rename from operators/pkg/controller/elasticsearch/initcontainer/shared_volumes.go rename to pkg/controller/elasticsearch/initcontainer/shared_volumes.go diff --git a/operators/pkg/controller/elasticsearch/label/label.go b/pkg/controller/elasticsearch/label/label.go similarity index 100% rename from operators/pkg/controller/elasticsearch/label/label.go rename to pkg/controller/elasticsearch/label/label.go diff --git a/operators/pkg/controller/elasticsearch/label/label_test.go b/pkg/controller/elasticsearch/label/label_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/label/label_test.go rename to pkg/controller/elasticsearch/label/label_test.go diff --git a/operators/pkg/controller/elasticsearch/license/apply.go b/pkg/controller/elasticsearch/license/apply.go similarity index 100% rename from operators/pkg/controller/elasticsearch/license/apply.go rename to pkg/controller/elasticsearch/license/apply.go diff --git a/operators/pkg/controller/elasticsearch/license/apply_test.go b/pkg/controller/elasticsearch/license/apply_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/license/apply_test.go rename to pkg/controller/elasticsearch/license/apply_test.go diff --git a/operators/pkg/controller/elasticsearch/license/reconcile.go b/pkg/controller/elasticsearch/license/reconcile.go similarity index 100% rename from operators/pkg/controller/elasticsearch/license/reconcile.go rename to pkg/controller/elasticsearch/license/reconcile.go diff --git a/operators/pkg/controller/elasticsearch/migration/migrate_data.go b/pkg/controller/elasticsearch/migration/migrate_data.go similarity index 100% rename from operators/pkg/controller/elasticsearch/migration/migrate_data.go rename to pkg/controller/elasticsearch/migration/migrate_data.go diff --git a/operators/pkg/controller/elasticsearch/migration/migrate_data_test.go b/pkg/controller/elasticsearch/migration/migrate_data_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/migration/migrate_data_test.go rename to pkg/controller/elasticsearch/migration/migrate_data_test.go diff --git a/operators/pkg/controller/elasticsearch/name/name.go b/pkg/controller/elasticsearch/name/name.go similarity index 100% rename from operators/pkg/controller/elasticsearch/name/name.go rename to pkg/controller/elasticsearch/name/name.go diff --git a/operators/pkg/controller/elasticsearch/network/ports.go b/pkg/controller/elasticsearch/network/ports.go similarity index 100% rename from operators/pkg/controller/elasticsearch/network/ports.go rename to pkg/controller/elasticsearch/network/ports.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/defaults.go b/pkg/controller/elasticsearch/nodespec/defaults.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/defaults.go rename to pkg/controller/elasticsearch/nodespec/defaults.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/fixtures.go b/pkg/controller/elasticsearch/nodespec/fixtures.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/fixtures.go rename to pkg/controller/elasticsearch/nodespec/fixtures.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/podspec.go b/pkg/controller/elasticsearch/nodespec/podspec.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/podspec.go rename to pkg/controller/elasticsearch/nodespec/podspec.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/podspec_test.go b/pkg/controller/elasticsearch/nodespec/podspec_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/podspec_test.go rename to pkg/controller/elasticsearch/nodespec/podspec_test.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/readiness_probe.go b/pkg/controller/elasticsearch/nodespec/readiness_probe.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/readiness_probe.go rename to pkg/controller/elasticsearch/nodespec/readiness_probe.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/resources.go b/pkg/controller/elasticsearch/nodespec/resources.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/resources.go rename to pkg/controller/elasticsearch/nodespec/resources.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/resources_test.go b/pkg/controller/elasticsearch/nodespec/resources_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/resources_test.go rename to pkg/controller/elasticsearch/nodespec/resources_test.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/statefulset.go b/pkg/controller/elasticsearch/nodespec/statefulset.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/statefulset.go rename to pkg/controller/elasticsearch/nodespec/statefulset.go diff --git a/operators/pkg/controller/elasticsearch/nodespec/volumes.go b/pkg/controller/elasticsearch/nodespec/volumes.go similarity index 100% rename from operators/pkg/controller/elasticsearch/nodespec/volumes.go rename to pkg/controller/elasticsearch/nodespec/volumes.go diff --git a/operators/pkg/controller/elasticsearch/observer/finalizer.go b/pkg/controller/elasticsearch/observer/finalizer.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/finalizer.go rename to pkg/controller/elasticsearch/observer/finalizer.go diff --git a/operators/pkg/controller/elasticsearch/observer/manager.go b/pkg/controller/elasticsearch/observer/manager.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/manager.go rename to pkg/controller/elasticsearch/observer/manager.go diff --git a/operators/pkg/controller/elasticsearch/observer/manager_test.go b/pkg/controller/elasticsearch/observer/manager_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/manager_test.go rename to pkg/controller/elasticsearch/observer/manager_test.go diff --git a/operators/pkg/controller/elasticsearch/observer/observer.go b/pkg/controller/elasticsearch/observer/observer.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/observer.go rename to pkg/controller/elasticsearch/observer/observer.go diff --git a/operators/pkg/controller/elasticsearch/observer/observer_test.go b/pkg/controller/elasticsearch/observer/observer_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/observer_test.go rename to pkg/controller/elasticsearch/observer/observer_test.go diff --git a/operators/pkg/controller/elasticsearch/observer/state.go b/pkg/controller/elasticsearch/observer/state.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/state.go rename to pkg/controller/elasticsearch/observer/state.go diff --git a/operators/pkg/controller/elasticsearch/observer/state_test.go b/pkg/controller/elasticsearch/observer/state_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/state_test.go rename to pkg/controller/elasticsearch/observer/state_test.go diff --git a/operators/pkg/controller/elasticsearch/observer/watch.go b/pkg/controller/elasticsearch/observer/watch.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/watch.go rename to pkg/controller/elasticsearch/observer/watch.go diff --git a/operators/pkg/controller/elasticsearch/observer/watch_test.go b/pkg/controller/elasticsearch/observer/watch_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/observer/watch_test.go rename to pkg/controller/elasticsearch/observer/watch_test.go diff --git a/operators/pkg/controller/elasticsearch/pdb/reconcile.go b/pkg/controller/elasticsearch/pdb/reconcile.go similarity index 100% rename from operators/pkg/controller/elasticsearch/pdb/reconcile.go rename to pkg/controller/elasticsearch/pdb/reconcile.go diff --git a/operators/pkg/controller/elasticsearch/pdb/reconcile_test.go b/pkg/controller/elasticsearch/pdb/reconcile_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/pdb/reconcile_test.go rename to pkg/controller/elasticsearch/pdb/reconcile_test.go diff --git a/operators/pkg/controller/elasticsearch/reconcile/resources_state.go b/pkg/controller/elasticsearch/reconcile/resources_state.go similarity index 100% rename from operators/pkg/controller/elasticsearch/reconcile/resources_state.go rename to pkg/controller/elasticsearch/reconcile/resources_state.go diff --git a/operators/pkg/controller/elasticsearch/reconcile/state.go b/pkg/controller/elasticsearch/reconcile/state.go similarity index 100% rename from operators/pkg/controller/elasticsearch/reconcile/state.go rename to pkg/controller/elasticsearch/reconcile/state.go diff --git a/operators/pkg/controller/elasticsearch/reconcile/state_test.go b/pkg/controller/elasticsearch/reconcile/state_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/reconcile/state_test.go rename to pkg/controller/elasticsearch/reconcile/state_test.go diff --git a/operators/pkg/controller/elasticsearch/services/services.go b/pkg/controller/elasticsearch/services/services.go similarity index 100% rename from operators/pkg/controller/elasticsearch/services/services.go rename to pkg/controller/elasticsearch/services/services.go diff --git a/operators/pkg/controller/elasticsearch/services/services_test.go b/pkg/controller/elasticsearch/services/services_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/services/services_test.go rename to pkg/controller/elasticsearch/services/services_test.go diff --git a/operators/pkg/controller/elasticsearch/settings/canonical_config.go b/pkg/controller/elasticsearch/settings/canonical_config.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/canonical_config.go rename to pkg/controller/elasticsearch/settings/canonical_config.go diff --git a/operators/pkg/controller/elasticsearch/settings/config_volume.go b/pkg/controller/elasticsearch/settings/config_volume.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/config_volume.go rename to pkg/controller/elasticsearch/settings/config_volume.go diff --git a/operators/pkg/controller/elasticsearch/settings/config_volume_test.go b/pkg/controller/elasticsearch/settings/config_volume_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/config_volume_test.go rename to pkg/controller/elasticsearch/settings/config_volume_test.go diff --git a/operators/pkg/controller/elasticsearch/settings/environment.go b/pkg/controller/elasticsearch/settings/environment.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/environment.go rename to pkg/controller/elasticsearch/settings/environment.go diff --git a/operators/pkg/controller/elasticsearch/settings/fields.go b/pkg/controller/elasticsearch/settings/fields.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/fields.go rename to pkg/controller/elasticsearch/settings/fields.go diff --git a/operators/pkg/controller/elasticsearch/settings/masters.go b/pkg/controller/elasticsearch/settings/masters.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/masters.go rename to pkg/controller/elasticsearch/settings/masters.go diff --git a/operators/pkg/controller/elasticsearch/settings/masters_test.go b/pkg/controller/elasticsearch/settings/masters_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/masters_test.go rename to pkg/controller/elasticsearch/settings/masters_test.go diff --git a/operators/pkg/controller/elasticsearch/settings/merged_config.go b/pkg/controller/elasticsearch/settings/merged_config.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/merged_config.go rename to pkg/controller/elasticsearch/settings/merged_config.go diff --git a/operators/pkg/controller/elasticsearch/settings/secure_settings.go b/pkg/controller/elasticsearch/settings/secure_settings.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/secure_settings.go rename to pkg/controller/elasticsearch/settings/secure_settings.go diff --git a/operators/pkg/controller/elasticsearch/settings/secure_settings_test.go b/pkg/controller/elasticsearch/settings/secure_settings_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/secure_settings_test.go rename to pkg/controller/elasticsearch/settings/secure_settings_test.go diff --git a/operators/pkg/controller/elasticsearch/settings/settings.go b/pkg/controller/elasticsearch/settings/settings.go similarity index 100% rename from operators/pkg/controller/elasticsearch/settings/settings.go rename to pkg/controller/elasticsearch/settings/settings.go diff --git a/operators/pkg/controller/elasticsearch/sset/getter.go b/pkg/controller/elasticsearch/sset/getter.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/getter.go rename to pkg/controller/elasticsearch/sset/getter.go diff --git a/operators/pkg/controller/elasticsearch/sset/getter_test.go b/pkg/controller/elasticsearch/sset/getter_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/getter_test.go rename to pkg/controller/elasticsearch/sset/getter_test.go diff --git a/operators/pkg/controller/elasticsearch/sset/list.go b/pkg/controller/elasticsearch/sset/list.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/list.go rename to pkg/controller/elasticsearch/sset/list.go diff --git a/operators/pkg/controller/elasticsearch/sset/list_test.go b/pkg/controller/elasticsearch/sset/list_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/list_test.go rename to pkg/controller/elasticsearch/sset/list_test.go diff --git a/operators/pkg/controller/elasticsearch/sset/pod.go b/pkg/controller/elasticsearch/sset/pod.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/pod.go rename to pkg/controller/elasticsearch/sset/pod.go diff --git a/operators/pkg/controller/elasticsearch/sset/pod_test.go b/pkg/controller/elasticsearch/sset/pod_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/pod_test.go rename to pkg/controller/elasticsearch/sset/pod_test.go diff --git a/operators/pkg/controller/elasticsearch/sset/reconcile.go b/pkg/controller/elasticsearch/sset/reconcile.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/reconcile.go rename to pkg/controller/elasticsearch/sset/reconcile.go diff --git a/operators/pkg/controller/elasticsearch/sset/reconcile_test.go b/pkg/controller/elasticsearch/sset/reconcile_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/sset/reconcile_test.go rename to pkg/controller/elasticsearch/sset/reconcile_test.go diff --git a/operators/pkg/controller/elasticsearch/user/credentials.go b/pkg/controller/elasticsearch/user/credentials.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/credentials.go rename to pkg/controller/elasticsearch/user/credentials.go diff --git a/operators/pkg/controller/elasticsearch/user/credentials_test.go b/pkg/controller/elasticsearch/user/credentials_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/credentials_test.go rename to pkg/controller/elasticsearch/user/credentials_test.go diff --git a/operators/pkg/controller/elasticsearch/user/predefined_users.go b/pkg/controller/elasticsearch/user/predefined_users.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/predefined_users.go rename to pkg/controller/elasticsearch/user/predefined_users.go diff --git a/operators/pkg/controller/elasticsearch/user/predefined_users_test.go b/pkg/controller/elasticsearch/user/predefined_users_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/predefined_users_test.go rename to pkg/controller/elasticsearch/user/predefined_users_test.go diff --git a/operators/pkg/controller/elasticsearch/user/reconciler.go b/pkg/controller/elasticsearch/user/reconciler.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/reconciler.go rename to pkg/controller/elasticsearch/user/reconciler.go diff --git a/operators/pkg/controller/elasticsearch/user/reconciler_test.go b/pkg/controller/elasticsearch/user/reconciler_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/reconciler_test.go rename to pkg/controller/elasticsearch/user/reconciler_test.go diff --git a/operators/pkg/controller/elasticsearch/user/user.go b/pkg/controller/elasticsearch/user/user.go similarity index 100% rename from operators/pkg/controller/elasticsearch/user/user.go rename to pkg/controller/elasticsearch/user/user.go diff --git a/operators/pkg/controller/elasticsearch/validation/upgrade_checks.go b/pkg/controller/elasticsearch/validation/upgrade_checks.go similarity index 100% rename from operators/pkg/controller/elasticsearch/validation/upgrade_checks.go rename to pkg/controller/elasticsearch/validation/upgrade_checks.go diff --git a/operators/pkg/controller/elasticsearch/validation/upgrade_checks_test.go b/pkg/controller/elasticsearch/validation/upgrade_checks_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/validation/upgrade_checks_test.go rename to pkg/controller/elasticsearch/validation/upgrade_checks_test.go diff --git a/operators/pkg/controller/elasticsearch/validation/validation.go b/pkg/controller/elasticsearch/validation/validation.go similarity index 100% rename from operators/pkg/controller/elasticsearch/validation/validation.go rename to pkg/controller/elasticsearch/validation/validation.go diff --git a/operators/pkg/controller/elasticsearch/validation/validation_test.go b/pkg/controller/elasticsearch/validation/validation_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/validation/validation_test.go rename to pkg/controller/elasticsearch/validation/validation_test.go diff --git a/operators/pkg/controller/elasticsearch/validation/validations.go b/pkg/controller/elasticsearch/validation/validations.go similarity index 100% rename from operators/pkg/controller/elasticsearch/validation/validations.go rename to pkg/controller/elasticsearch/validation/validations.go diff --git a/operators/pkg/controller/elasticsearch/validation/validations_test.go b/pkg/controller/elasticsearch/validation/validations_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/validation/validations_test.go rename to pkg/controller/elasticsearch/validation/validations_test.go diff --git a/operators/pkg/controller/elasticsearch/version/running_versions.go b/pkg/controller/elasticsearch/version/running_versions.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/running_versions.go rename to pkg/controller/elasticsearch/version/running_versions.go diff --git a/operators/pkg/controller/elasticsearch/version/running_versions_test.go b/pkg/controller/elasticsearch/version/running_versions_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/running_versions_test.go rename to pkg/controller/elasticsearch/version/running_versions_test.go diff --git a/operators/pkg/controller/elasticsearch/version/supported_versions.go b/pkg/controller/elasticsearch/version/supported_versions.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/supported_versions.go rename to pkg/controller/elasticsearch/version/supported_versions.go diff --git a/operators/pkg/controller/elasticsearch/version/supported_versions_test.go b/pkg/controller/elasticsearch/version/supported_versions_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/supported_versions_test.go rename to pkg/controller/elasticsearch/version/supported_versions_test.go diff --git a/operators/pkg/controller/elasticsearch/version/zen1/compatibility.go b/pkg/controller/elasticsearch/version/zen1/compatibility.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen1/compatibility.go rename to pkg/controller/elasticsearch/version/zen1/compatibility.go diff --git a/operators/pkg/controller/elasticsearch/version/zen1/compatibility_test.go b/pkg/controller/elasticsearch/version/zen1/compatibility_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen1/compatibility_test.go rename to pkg/controller/elasticsearch/version/zen1/compatibility_test.go diff --git a/operators/pkg/controller/elasticsearch/version/zen1/minimum_masters.go b/pkg/controller/elasticsearch/version/zen1/minimum_masters.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen1/minimum_masters.go rename to pkg/controller/elasticsearch/version/zen1/minimum_masters.go diff --git a/operators/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go b/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go rename to pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go diff --git a/operators/pkg/controller/elasticsearch/version/zen2/compatibility.go b/pkg/controller/elasticsearch/version/zen2/compatibility.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen2/compatibility.go rename to pkg/controller/elasticsearch/version/zen2/compatibility.go diff --git a/operators/pkg/controller/elasticsearch/version/zen2/compatibility_test.go b/pkg/controller/elasticsearch/version/zen2/compatibility_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen2/compatibility_test.go rename to pkg/controller/elasticsearch/version/zen2/compatibility_test.go diff --git a/operators/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go rename to pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go diff --git a/operators/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go rename to pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go diff --git a/operators/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go b/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go rename to pkg/controller/elasticsearch/version/zen2/voting_exclusions.go diff --git a/operators/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go b/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go similarity index 100% rename from operators/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go rename to pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go diff --git a/operators/pkg/controller/elasticsearch/volume/defaults.go b/pkg/controller/elasticsearch/volume/defaults.go similarity index 100% rename from operators/pkg/controller/elasticsearch/volume/defaults.go rename to pkg/controller/elasticsearch/volume/defaults.go diff --git a/operators/pkg/controller/elasticsearch/volume/names.go b/pkg/controller/elasticsearch/volume/names.go similarity index 100% rename from operators/pkg/controller/elasticsearch/volume/names.go rename to pkg/controller/elasticsearch/volume/names.go diff --git a/operators/pkg/controller/kibana/certificates/reconcile.go b/pkg/controller/kibana/certificates/reconcile.go similarity index 100% rename from operators/pkg/controller/kibana/certificates/reconcile.go rename to pkg/controller/kibana/certificates/reconcile.go diff --git a/operators/pkg/controller/kibana/config/fields.go b/pkg/controller/kibana/config/fields.go similarity index 100% rename from operators/pkg/controller/kibana/config/fields.go rename to pkg/controller/kibana/config/fields.go diff --git a/operators/pkg/controller/kibana/config/reconciler.go b/pkg/controller/kibana/config/reconciler.go similarity index 100% rename from operators/pkg/controller/kibana/config/reconciler.go rename to pkg/controller/kibana/config/reconciler.go diff --git a/operators/pkg/controller/kibana/config/reconciler_test.go b/pkg/controller/kibana/config/reconciler_test.go similarity index 100% rename from operators/pkg/controller/kibana/config/reconciler_test.go rename to pkg/controller/kibana/config/reconciler_test.go diff --git a/operators/pkg/controller/kibana/config/secret_volume.go b/pkg/controller/kibana/config/secret_volume.go similarity index 100% rename from operators/pkg/controller/kibana/config/secret_volume.go rename to pkg/controller/kibana/config/secret_volume.go diff --git a/operators/pkg/controller/kibana/config/settings.go b/pkg/controller/kibana/config/settings.go similarity index 100% rename from operators/pkg/controller/kibana/config/settings.go rename to pkg/controller/kibana/config/settings.go diff --git a/operators/pkg/controller/kibana/config/settings_test.go b/pkg/controller/kibana/config/settings_test.go similarity index 100% rename from operators/pkg/controller/kibana/config/settings_test.go rename to pkg/controller/kibana/config/settings_test.go diff --git a/operators/pkg/controller/kibana/config/telemetry.go b/pkg/controller/kibana/config/telemetry.go similarity index 100% rename from operators/pkg/controller/kibana/config/telemetry.go rename to pkg/controller/kibana/config/telemetry.go diff --git a/operators/pkg/controller/kibana/deployment_control.go b/pkg/controller/kibana/deployment_control.go similarity index 100% rename from operators/pkg/controller/kibana/deployment_control.go rename to pkg/controller/kibana/deployment_control.go diff --git a/operators/pkg/controller/kibana/deployment_control_test.go b/pkg/controller/kibana/deployment_control_test.go similarity index 100% rename from operators/pkg/controller/kibana/deployment_control_test.go rename to pkg/controller/kibana/deployment_control_test.go diff --git a/operators/pkg/controller/kibana/driver.go b/pkg/controller/kibana/driver.go similarity index 100% rename from operators/pkg/controller/kibana/driver.go rename to pkg/controller/kibana/driver.go diff --git a/operators/pkg/controller/kibana/driver_test.go b/pkg/controller/kibana/driver_test.go similarity index 100% rename from operators/pkg/controller/kibana/driver_test.go rename to pkg/controller/kibana/driver_test.go diff --git a/operators/pkg/controller/kibana/es/secret.go b/pkg/controller/kibana/es/secret.go similarity index 100% rename from operators/pkg/controller/kibana/es/secret.go rename to pkg/controller/kibana/es/secret.go diff --git a/operators/pkg/controller/kibana/kibana_controller.go b/pkg/controller/kibana/kibana_controller.go similarity index 100% rename from operators/pkg/controller/kibana/kibana_controller.go rename to pkg/controller/kibana/kibana_controller.go diff --git a/operators/pkg/controller/kibana/label/labels.go b/pkg/controller/kibana/label/labels.go similarity index 100% rename from operators/pkg/controller/kibana/label/labels.go rename to pkg/controller/kibana/label/labels.go diff --git a/operators/pkg/controller/kibana/name/name.go b/pkg/controller/kibana/name/name.go similarity index 100% rename from operators/pkg/controller/kibana/name/name.go rename to pkg/controller/kibana/name/name.go diff --git a/operators/pkg/controller/kibana/name/name_test.go b/pkg/controller/kibana/name/name_test.go similarity index 100% rename from operators/pkg/controller/kibana/name/name_test.go rename to pkg/controller/kibana/name/name_test.go diff --git a/operators/pkg/controller/kibana/pod/pod.go b/pkg/controller/kibana/pod/pod.go similarity index 100% rename from operators/pkg/controller/kibana/pod/pod.go rename to pkg/controller/kibana/pod/pod.go diff --git a/operators/pkg/controller/kibana/pod/pod_test.go b/pkg/controller/kibana/pod/pod_test.go similarity index 100% rename from operators/pkg/controller/kibana/pod/pod_test.go rename to pkg/controller/kibana/pod/pod_test.go diff --git a/operators/pkg/controller/kibana/services.go b/pkg/controller/kibana/services.go similarity index 100% rename from operators/pkg/controller/kibana/services.go rename to pkg/controller/kibana/services.go diff --git a/operators/pkg/controller/kibana/state.go b/pkg/controller/kibana/state.go similarity index 100% rename from operators/pkg/controller/kibana/state.go rename to pkg/controller/kibana/state.go diff --git a/operators/pkg/controller/kibana/version/version6/settings.go b/pkg/controller/kibana/version/version6/settings.go similarity index 100% rename from operators/pkg/controller/kibana/version/version6/settings.go rename to pkg/controller/kibana/version/version6/settings.go diff --git a/operators/pkg/controller/kibana/version/version7/settings.go b/pkg/controller/kibana/version/version7/settings.go similarity index 100% rename from operators/pkg/controller/kibana/version/version7/settings.go rename to pkg/controller/kibana/version/version7/settings.go diff --git a/operators/pkg/controller/kibana/volume/volumes.go b/pkg/controller/kibana/volume/volumes.go similarity index 100% rename from operators/pkg/controller/kibana/volume/volumes.go rename to pkg/controller/kibana/volume/volumes.go diff --git a/operators/pkg/controller/kibanaassociation/association_controller.go b/pkg/controller/kibanaassociation/association_controller.go similarity index 100% rename from operators/pkg/controller/kibanaassociation/association_controller.go rename to pkg/controller/kibanaassociation/association_controller.go diff --git a/operators/pkg/controller/kibanaassociation/association_controller_test.go b/pkg/controller/kibanaassociation/association_controller_test.go similarity index 100% rename from operators/pkg/controller/kibanaassociation/association_controller_test.go rename to pkg/controller/kibanaassociation/association_controller_test.go diff --git a/operators/pkg/controller/kibanaassociation/ca.go b/pkg/controller/kibanaassociation/ca.go similarity index 100% rename from operators/pkg/controller/kibanaassociation/ca.go rename to pkg/controller/kibanaassociation/ca.go diff --git a/operators/pkg/controller/kibanaassociation/ca_test.go b/pkg/controller/kibanaassociation/ca_test.go similarity index 100% rename from operators/pkg/controller/kibanaassociation/ca_test.go rename to pkg/controller/kibanaassociation/ca_test.go diff --git a/operators/pkg/controller/kibanaassociation/labels.go b/pkg/controller/kibanaassociation/labels.go similarity index 100% rename from operators/pkg/controller/kibanaassociation/labels.go rename to pkg/controller/kibanaassociation/labels.go diff --git a/operators/pkg/controller/kibanaassociation/watch.go b/pkg/controller/kibanaassociation/watch.go similarity index 100% rename from operators/pkg/controller/kibanaassociation/watch.go rename to pkg/controller/kibanaassociation/watch.go diff --git a/operators/pkg/controller/license/license_controller.go b/pkg/controller/license/license_controller.go similarity index 100% rename from operators/pkg/controller/license/license_controller.go rename to pkg/controller/license/license_controller.go diff --git a/operators/pkg/controller/license/license_controller_integration_test.go b/pkg/controller/license/license_controller_integration_test.go similarity index 100% rename from operators/pkg/controller/license/license_controller_integration_test.go rename to pkg/controller/license/license_controller_integration_test.go diff --git a/operators/pkg/controller/license/license_controller_test.go b/pkg/controller/license/license_controller_test.go similarity index 100% rename from operators/pkg/controller/license/license_controller_test.go rename to pkg/controller/license/license_controller_test.go diff --git a/operators/pkg/controller/license/list.go b/pkg/controller/license/list.go similarity index 100% rename from operators/pkg/controller/license/list.go rename to pkg/controller/license/list.go diff --git a/operators/pkg/controller/license/list_test.go b/pkg/controller/license/list_test.go similarity index 100% rename from operators/pkg/controller/license/list_test.go rename to pkg/controller/license/list_test.go diff --git a/operators/pkg/controller/license/trial/trial_controller.go b/pkg/controller/license/trial/trial_controller.go similarity index 100% rename from operators/pkg/controller/license/trial/trial_controller.go rename to pkg/controller/license/trial/trial_controller.go diff --git a/operators/pkg/controller/license/trial/trial_controller_integration_test.go b/pkg/controller/license/trial/trial_controller_integration_test.go similarity index 100% rename from operators/pkg/controller/license/trial/trial_controller_integration_test.go rename to pkg/controller/license/trial/trial_controller_integration_test.go diff --git a/operators/pkg/controller/license/validation/validations.go b/pkg/controller/license/validation/validations.go similarity index 100% rename from operators/pkg/controller/license/validation/validations.go rename to pkg/controller/license/validation/validations.go diff --git a/operators/pkg/controller/license/validation/validations_test.go b/pkg/controller/license/validation/validations_test.go similarity index 100% rename from operators/pkg/controller/license/validation/validations_test.go rename to pkg/controller/license/validation/validations_test.go diff --git a/operators/pkg/dev/mode.go b/pkg/dev/mode.go similarity index 100% rename from operators/pkg/dev/mode.go rename to pkg/dev/mode.go diff --git a/operators/pkg/dev/portforward/client_portforward.go b/pkg/dev/portforward/client_portforward.go similarity index 100% rename from operators/pkg/dev/portforward/client_portforward.go rename to pkg/dev/portforward/client_portforward.go diff --git a/operators/pkg/dev/portforward/dialer.go b/pkg/dev/portforward/dialer.go similarity index 100% rename from operators/pkg/dev/portforward/dialer.go rename to pkg/dev/portforward/dialer.go diff --git a/operators/pkg/dev/portforward/dialer_test.go b/pkg/dev/portforward/dialer_test.go similarity index 100% rename from operators/pkg/dev/portforward/dialer_test.go rename to pkg/dev/portforward/dialer_test.go diff --git a/operators/pkg/dev/portforward/doc.go b/pkg/dev/portforward/doc.go similarity index 100% rename from operators/pkg/dev/portforward/doc.go rename to pkg/dev/portforward/doc.go diff --git a/operators/pkg/dev/portforward/forwarder_store.go b/pkg/dev/portforward/forwarder_store.go similarity index 100% rename from operators/pkg/dev/portforward/forwarder_store.go rename to pkg/dev/portforward/forwarder_store.go diff --git a/operators/pkg/dev/portforward/pod_forwarder.go b/pkg/dev/portforward/pod_forwarder.go similarity index 100% rename from operators/pkg/dev/portforward/pod_forwarder.go rename to pkg/dev/portforward/pod_forwarder.go diff --git a/operators/pkg/dev/portforward/pod_forwarder_test.go b/pkg/dev/portforward/pod_forwarder_test.go similarity index 100% rename from operators/pkg/dev/portforward/pod_forwarder_test.go rename to pkg/dev/portforward/pod_forwarder_test.go diff --git a/operators/pkg/dev/portforward/service_forwarder.go b/pkg/dev/portforward/service_forwarder.go similarity index 100% rename from operators/pkg/dev/portforward/service_forwarder.go rename to pkg/dev/portforward/service_forwarder.go diff --git a/operators/pkg/dev/portforward/service_forwarder_test.go b/pkg/dev/portforward/service_forwarder_test.go similarity index 100% rename from operators/pkg/dev/portforward/service_forwarder_test.go rename to pkg/dev/portforward/service_forwarder_test.go diff --git a/operators/pkg/utils/chrono/millis.go b/pkg/utils/chrono/millis.go similarity index 100% rename from operators/pkg/utils/chrono/millis.go rename to pkg/utils/chrono/millis.go diff --git a/operators/pkg/utils/chrono/millis.test.go b/pkg/utils/chrono/millis.test.go similarity index 100% rename from operators/pkg/utils/chrono/millis.test.go rename to pkg/utils/chrono/millis.test.go diff --git a/operators/pkg/utils/cryptutil/tls_verify.go b/pkg/utils/cryptutil/tls_verify.go similarity index 100% rename from operators/pkg/utils/cryptutil/tls_verify.go rename to pkg/utils/cryptutil/tls_verify.go diff --git a/operators/pkg/utils/diff/diff.go b/pkg/utils/diff/diff.go similarity index 100% rename from operators/pkg/utils/diff/diff.go rename to pkg/utils/diff/diff.go diff --git a/operators/pkg/utils/k8s/client.go b/pkg/utils/k8s/client.go similarity index 100% rename from operators/pkg/utils/k8s/client.go rename to pkg/utils/k8s/client.go diff --git a/operators/pkg/utils/k8s/client_test.go b/pkg/utils/k8s/client_test.go similarity index 100% rename from operators/pkg/utils/k8s/client_test.go rename to pkg/utils/k8s/client_test.go diff --git a/operators/pkg/utils/k8s/k8sutils.go b/pkg/utils/k8s/k8sutils.go similarity index 100% rename from operators/pkg/utils/k8s/k8sutils.go rename to pkg/utils/k8s/k8sutils.go diff --git a/operators/pkg/utils/k8s/k8sutils_test.go b/pkg/utils/k8s/k8sutils_test.go similarity index 100% rename from operators/pkg/utils/k8s/k8sutils_test.go rename to pkg/utils/k8s/k8sutils_test.go diff --git a/operators/pkg/utils/maps/maps.go b/pkg/utils/maps/maps.go similarity index 100% rename from operators/pkg/utils/maps/maps.go rename to pkg/utils/maps/maps.go diff --git a/operators/pkg/utils/maps/maps_test.go b/pkg/utils/maps/maps_test.go similarity index 100% rename from operators/pkg/utils/maps/maps_test.go rename to pkg/utils/maps/maps_test.go diff --git a/operators/pkg/utils/net/dialer.go b/pkg/utils/net/dialer.go similarity index 100% rename from operators/pkg/utils/net/dialer.go rename to pkg/utils/net/dialer.go diff --git a/operators/pkg/utils/net/ip.go b/pkg/utils/net/ip.go similarity index 100% rename from operators/pkg/utils/net/ip.go rename to pkg/utils/net/ip.go diff --git a/operators/pkg/utils/net/port.go b/pkg/utils/net/port.go similarity index 100% rename from operators/pkg/utils/net/port.go rename to pkg/utils/net/port.go diff --git a/operators/pkg/utils/retry/retry.go b/pkg/utils/retry/retry.go similarity index 100% rename from operators/pkg/utils/retry/retry.go rename to pkg/utils/retry/retry.go diff --git a/operators/pkg/utils/retry/retry_test.go b/pkg/utils/retry/retry_test.go similarity index 100% rename from operators/pkg/utils/retry/retry_test.go rename to pkg/utils/retry/retry_test.go diff --git a/operators/pkg/utils/set/set.go b/pkg/utils/set/set.go similarity index 100% rename from operators/pkg/utils/set/set.go rename to pkg/utils/set/set.go diff --git a/operators/pkg/utils/set/set_test.go b/pkg/utils/set/set_test.go similarity index 100% rename from operators/pkg/utils/set/set_test.go rename to pkg/utils/set/set_test.go diff --git a/operators/pkg/utils/stringsutil/strings.go b/pkg/utils/stringsutil/strings.go similarity index 100% rename from operators/pkg/utils/stringsutil/strings.go rename to pkg/utils/stringsutil/strings.go diff --git a/operators/pkg/utils/stringsutil/strings_test.go b/pkg/utils/stringsutil/strings_test.go similarity index 100% rename from operators/pkg/utils/stringsutil/strings_test.go rename to pkg/utils/stringsutil/strings_test.go diff --git a/operators/pkg/utils/test/integration.go b/pkg/utils/test/integration.go similarity index 100% rename from operators/pkg/utils/test/integration.go rename to pkg/utils/test/integration.go diff --git a/operators/pkg/utils/test/retry.go b/pkg/utils/test/retry.go similarity index 100% rename from operators/pkg/utils/test/retry.go rename to pkg/utils/test/retry.go diff --git a/operators/pkg/webhook/add_validations.go b/pkg/webhook/add_validations.go similarity index 100% rename from operators/pkg/webhook/add_validations.go rename to pkg/webhook/add_validations.go diff --git a/operators/pkg/webhook/elasticsearch/handler.go b/pkg/webhook/elasticsearch/handler.go similarity index 100% rename from operators/pkg/webhook/elasticsearch/handler.go rename to pkg/webhook/elasticsearch/handler.go diff --git a/operators/pkg/webhook/elasticsearch/handler_test.go b/pkg/webhook/elasticsearch/handler_test.go similarity index 100% rename from operators/pkg/webhook/elasticsearch/handler_test.go rename to pkg/webhook/elasticsearch/handler_test.go diff --git a/operators/pkg/webhook/license/handler.go b/pkg/webhook/license/handler.go similarity index 100% rename from operators/pkg/webhook/license/handler.go rename to pkg/webhook/license/handler.go diff --git a/operators/pkg/webhook/license/handler_test.go b/pkg/webhook/license/handler_test.go similarity index 100% rename from operators/pkg/webhook/license/handler_test.go rename to pkg/webhook/license/handler_test.go diff --git a/operators/pkg/webhook/params.go b/pkg/webhook/params.go similarity index 100% rename from operators/pkg/webhook/params.go rename to pkg/webhook/params.go diff --git a/operators/pkg/webhook/server.go b/pkg/webhook/server.go similarity index 100% rename from operators/pkg/webhook/server.go rename to pkg/webhook/server.go diff --git a/operators/pkg/webhook/webhook.go b/pkg/webhook/webhook.go similarity index 100% rename from operators/pkg/webhook/webhook.go rename to pkg/webhook/webhook.go diff --git a/operators/test/e2e/Dockerfile b/test/e2e/Dockerfile similarity index 100% rename from operators/test/e2e/Dockerfile rename to test/e2e/Dockerfile diff --git a/operators/test/e2e/apm/association_test.go b/test/e2e/apm/association_test.go similarity index 100% rename from operators/test/e2e/apm/association_test.go rename to test/e2e/apm/association_test.go diff --git a/operators/test/e2e/apm/configuration_test.go b/test/e2e/apm/configuration_test.go similarity index 100% rename from operators/test/e2e/apm/configuration_test.go rename to test/e2e/apm/configuration_test.go diff --git a/operators/test/e2e/apm/sample_test.go b/test/e2e/apm/sample_test.go similarity index 100% rename from operators/test/e2e/apm/sample_test.go rename to test/e2e/apm/sample_test.go diff --git a/operators/test/e2e/apm/standalone_test.go b/test/e2e/apm/standalone_test.go similarity index 100% rename from operators/test/e2e/apm/standalone_test.go rename to test/e2e/apm/standalone_test.go diff --git a/operators/test/e2e/cmd/main.go b/test/e2e/cmd/main.go similarity index 100% rename from operators/test/e2e/cmd/main.go rename to test/e2e/cmd/main.go diff --git a/operators/test/e2e/cmd/run/command.go b/test/e2e/cmd/run/command.go similarity index 100% rename from operators/test/e2e/cmd/run/command.go rename to test/e2e/cmd/run/command.go diff --git a/operators/test/e2e/cmd/run/eventlog.go b/test/e2e/cmd/run/eventlog.go similarity index 100% rename from operators/test/e2e/cmd/run/eventlog.go rename to test/e2e/cmd/run/eventlog.go diff --git a/operators/test/e2e/cmd/run/run.go b/test/e2e/cmd/run/run.go similarity index 100% rename from operators/test/e2e/cmd/run/run.go rename to test/e2e/cmd/run/run.go diff --git a/operators/test/e2e/es/certs_test.go b/test/e2e/es/certs_test.go similarity index 100% rename from operators/test/e2e/es/certs_test.go rename to test/e2e/es/certs_test.go diff --git a/operators/test/e2e/es/failure_test.go b/test/e2e/es/failure_test.go similarity index 100% rename from operators/test/e2e/es/failure_test.go rename to test/e2e/es/failure_test.go diff --git a/operators/test/e2e/es/keystore_test.go b/test/e2e/es/keystore_test.go similarity index 100% rename from operators/test/e2e/es/keystore_test.go rename to test/e2e/es/keystore_test.go diff --git a/operators/test/e2e/es/license_test.go b/test/e2e/es/license_test.go similarity index 100% rename from operators/test/e2e/es/license_test.go rename to test/e2e/es/license_test.go diff --git a/operators/test/e2e/es/mutation_test.go b/test/e2e/es/mutation_test.go similarity index 100% rename from operators/test/e2e/es/mutation_test.go rename to test/e2e/es/mutation_test.go diff --git a/operators/test/e2e/es/podtemplate_test.go b/test/e2e/es/podtemplate_test.go similarity index 100% rename from operators/test/e2e/es/podtemplate_test.go rename to test/e2e/es/podtemplate_test.go diff --git a/operators/test/e2e/es/reversal_test.go b/test/e2e/es/reversal_test.go similarity index 100% rename from operators/test/e2e/es/reversal_test.go rename to test/e2e/es/reversal_test.go diff --git a/operators/test/e2e/es/volume_test.go b/test/e2e/es/volume_test.go similarity index 100% rename from operators/test/e2e/es/volume_test.go rename to test/e2e/es/volume_test.go diff --git a/operators/test/e2e/kb/association_test.go b/test/e2e/kb/association_test.go similarity index 100% rename from operators/test/e2e/kb/association_test.go rename to test/e2e/kb/association_test.go diff --git a/operators/test/e2e/kb/failure_test.go b/test/e2e/kb/failure_test.go similarity index 100% rename from operators/test/e2e/kb/failure_test.go rename to test/e2e/kb/failure_test.go diff --git a/operators/test/e2e/kb/keystore_test.go b/test/e2e/kb/keystore_test.go similarity index 100% rename from operators/test/e2e/kb/keystore_test.go rename to test/e2e/kb/keystore_test.go diff --git a/operators/test/e2e/kb/resource_test.go b/test/e2e/kb/resource_test.go similarity index 100% rename from operators/test/e2e/kb/resource_test.go rename to test/e2e/kb/resource_test.go diff --git a/operators/test/e2e/kb/sample_test.go b/test/e2e/kb/sample_test.go similarity index 100% rename from operators/test/e2e/kb/sample_test.go rename to test/e2e/kb/sample_test.go diff --git a/operators/test/e2e/kb/telemetry_test.go b/test/e2e/kb/telemetry_test.go similarity index 100% rename from operators/test/e2e/kb/telemetry_test.go rename to test/e2e/kb/telemetry_test.go diff --git a/operators/test/e2e/run.sh b/test/e2e/run.sh similarity index 100% rename from operators/test/e2e/run.sh rename to test/e2e/run.sh diff --git a/operators/test/e2e/samples.go b/test/e2e/samples.go similarity index 100% rename from operators/test/e2e/samples.go rename to test/e2e/samples.go diff --git a/operators/test/e2e/smoke_test.go b/test/e2e/smoke_test.go similarity index 100% rename from operators/test/e2e/smoke_test.go rename to test/e2e/smoke_test.go diff --git a/operators/test/e2e/test/apmserver/builder.go b/test/e2e/test/apmserver/builder.go similarity index 100% rename from operators/test/e2e/test/apmserver/builder.go rename to test/e2e/test/apmserver/builder.go diff --git a/operators/test/e2e/test/apmserver/checks_apm.go b/test/e2e/test/apmserver/checks_apm.go similarity index 100% rename from operators/test/e2e/test/apmserver/checks_apm.go rename to test/e2e/test/apmserver/checks_apm.go diff --git a/operators/test/e2e/test/apmserver/checks_k8s.go b/test/e2e/test/apmserver/checks_k8s.go similarity index 100% rename from operators/test/e2e/test/apmserver/checks_k8s.go rename to test/e2e/test/apmserver/checks_k8s.go diff --git a/operators/test/e2e/test/apmserver/http_client.go b/test/e2e/test/apmserver/http_client.go similarity index 100% rename from operators/test/e2e/test/apmserver/http_client.go rename to test/e2e/test/apmserver/http_client.go diff --git a/operators/test/e2e/test/apmserver/steps_creation.go b/test/e2e/test/apmserver/steps_creation.go similarity index 100% rename from operators/test/e2e/test/apmserver/steps_creation.go rename to test/e2e/test/apmserver/steps_creation.go diff --git a/operators/test/e2e/test/apmserver/steps_deletion.go b/test/e2e/test/apmserver/steps_deletion.go similarity index 100% rename from operators/test/e2e/test/apmserver/steps_deletion.go rename to test/e2e/test/apmserver/steps_deletion.go diff --git a/operators/test/e2e/test/apmserver/steps_init.go b/test/e2e/test/apmserver/steps_init.go similarity index 100% rename from operators/test/e2e/test/apmserver/steps_init.go rename to test/e2e/test/apmserver/steps_init.go diff --git a/operators/test/e2e/test/apmserver/steps_mutation.go b/test/e2e/test/apmserver/steps_mutation.go similarity index 100% rename from operators/test/e2e/test/apmserver/steps_mutation.go rename to test/e2e/test/apmserver/steps_mutation.go diff --git a/operators/test/e2e/test/builder.go b/test/e2e/test/builder.go similarity index 100% rename from operators/test/e2e/test/builder.go rename to test/e2e/test/builder.go diff --git a/operators/test/e2e/test/checks.go b/test/e2e/test/checks.go similarity index 100% rename from operators/test/e2e/test/checks.go rename to test/e2e/test/checks.go diff --git a/operators/test/e2e/test/command/command.go b/test/e2e/test/command/command.go similarity index 100% rename from operators/test/e2e/test/command/command.go rename to test/e2e/test/command/command.go diff --git a/operators/test/e2e/test/command/kubectl.go b/test/e2e/test/command/kubectl.go similarity index 100% rename from operators/test/e2e/test/command/kubectl.go rename to test/e2e/test/command/kubectl.go diff --git a/operators/test/e2e/test/context.go b/test/e2e/test/context.go similarity index 100% rename from operators/test/e2e/test/context.go rename to test/e2e/test/context.go diff --git a/operators/test/e2e/test/default.go b/test/e2e/test/default.go similarity index 100% rename from operators/test/e2e/test/default.go rename to test/e2e/test/default.go diff --git a/operators/test/e2e/test/elasticsearch/builder.go b/test/e2e/test/elasticsearch/builder.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/builder.go rename to test/e2e/test/elasticsearch/builder.go diff --git a/operators/test/e2e/test/elasticsearch/checks_data.go b/test/e2e/test/elasticsearch/checks_data.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/checks_data.go rename to test/e2e/test/elasticsearch/checks_data.go diff --git a/operators/test/e2e/test/elasticsearch/checks_es.go b/test/e2e/test/elasticsearch/checks_es.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/checks_es.go rename to test/e2e/test/elasticsearch/checks_es.go diff --git a/operators/test/e2e/test/elasticsearch/checks_k8s.go b/test/e2e/test/elasticsearch/checks_k8s.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/checks_k8s.go rename to test/e2e/test/elasticsearch/checks_k8s.go diff --git a/operators/test/e2e/test/elasticsearch/checks_keystore.go b/test/e2e/test/elasticsearch/checks_keystore.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/checks_keystore.go rename to test/e2e/test/elasticsearch/checks_keystore.go diff --git a/operators/test/e2e/test/elasticsearch/checks_reversal.go b/test/e2e/test/elasticsearch/checks_reversal.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/checks_reversal.go rename to test/e2e/test/elasticsearch/checks_reversal.go diff --git a/operators/test/e2e/test/elasticsearch/checks_volume.go b/test/e2e/test/elasticsearch/checks_volume.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/checks_volume.go rename to test/e2e/test/elasticsearch/checks_volume.go diff --git a/operators/test/e2e/test/elasticsearch/cluster_uuid.go b/test/e2e/test/elasticsearch/cluster_uuid.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/cluster_uuid.go rename to test/e2e/test/elasticsearch/cluster_uuid.go diff --git a/operators/test/e2e/test/elasticsearch/default.go b/test/e2e/test/elasticsearch/default.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/default.go rename to test/e2e/test/elasticsearch/default.go diff --git a/operators/test/e2e/test/elasticsearch/http_client.go b/test/e2e/test/elasticsearch/http_client.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/http_client.go rename to test/e2e/test/elasticsearch/http_client.go diff --git a/operators/test/e2e/test/elasticsearch/pause.go b/test/e2e/test/elasticsearch/pause.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/pause.go rename to test/e2e/test/elasticsearch/pause.go diff --git a/operators/test/e2e/test/elasticsearch/steps_creation.go b/test/e2e/test/elasticsearch/steps_creation.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/steps_creation.go rename to test/e2e/test/elasticsearch/steps_creation.go diff --git a/operators/test/e2e/test/elasticsearch/steps_deletion.go b/test/e2e/test/elasticsearch/steps_deletion.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/steps_deletion.go rename to test/e2e/test/elasticsearch/steps_deletion.go diff --git a/operators/test/e2e/test/elasticsearch/steps_init.go b/test/e2e/test/elasticsearch/steps_init.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/steps_init.go rename to test/e2e/test/elasticsearch/steps_init.go diff --git a/operators/test/e2e/test/elasticsearch/steps_license.go b/test/e2e/test/elasticsearch/steps_license.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/steps_license.go rename to test/e2e/test/elasticsearch/steps_license.go diff --git a/operators/test/e2e/test/elasticsearch/steps_mutation.go b/test/e2e/test/elasticsearch/steps_mutation.go similarity index 100% rename from operators/test/e2e/test/elasticsearch/steps_mutation.go rename to test/e2e/test/elasticsearch/steps_mutation.go diff --git a/operators/test/e2e/test/http_client.go b/test/e2e/test/http_client.go similarity index 100% rename from operators/test/e2e/test/http_client.go rename to test/e2e/test/http_client.go diff --git a/operators/test/e2e/test/k8s_client.go b/test/e2e/test/k8s_client.go similarity index 100% rename from operators/test/e2e/test/k8s_client.go rename to test/e2e/test/k8s_client.go diff --git a/operators/test/e2e/test/kibana/builder.go b/test/e2e/test/kibana/builder.go similarity index 100% rename from operators/test/e2e/test/kibana/builder.go rename to test/e2e/test/kibana/builder.go diff --git a/operators/test/e2e/test/kibana/checks_k8s.go b/test/e2e/test/kibana/checks_k8s.go similarity index 100% rename from operators/test/e2e/test/kibana/checks_k8s.go rename to test/e2e/test/kibana/checks_k8s.go diff --git a/operators/test/e2e/test/kibana/checks_kb.go b/test/e2e/test/kibana/checks_kb.go similarity index 100% rename from operators/test/e2e/test/kibana/checks_kb.go rename to test/e2e/test/kibana/checks_kb.go diff --git a/operators/test/e2e/test/kibana/http_client.go b/test/e2e/test/kibana/http_client.go similarity index 100% rename from operators/test/e2e/test/kibana/http_client.go rename to test/e2e/test/kibana/http_client.go diff --git a/operators/test/e2e/test/kibana/steps_creation.go b/test/e2e/test/kibana/steps_creation.go similarity index 100% rename from operators/test/e2e/test/kibana/steps_creation.go rename to test/e2e/test/kibana/steps_creation.go diff --git a/operators/test/e2e/test/kibana/steps_deletion.go b/test/e2e/test/kibana/steps_deletion.go similarity index 100% rename from operators/test/e2e/test/kibana/steps_deletion.go rename to test/e2e/test/kibana/steps_deletion.go diff --git a/operators/test/e2e/test/kibana/steps_init.go b/test/e2e/test/kibana/steps_init.go similarity index 100% rename from operators/test/e2e/test/kibana/steps_init.go rename to test/e2e/test/kibana/steps_init.go diff --git a/operators/test/e2e/test/kibana/steps_mutation.go b/test/e2e/test/kibana/steps_mutation.go similarity index 100% rename from operators/test/e2e/test/kibana/steps_mutation.go rename to test/e2e/test/kibana/steps_mutation.go diff --git a/operators/test/e2e/test/run.go b/test/e2e/test/run.go similarity index 100% rename from operators/test/e2e/test/run.go rename to test/e2e/test/run.go diff --git a/operators/test/e2e/test/run_failure.go b/test/e2e/test/run_failure.go similarity index 100% rename from operators/test/e2e/test/run_failure.go rename to test/e2e/test/run_failure.go diff --git a/operators/test/e2e/test/run_mutation.go b/test/e2e/test/run_mutation.go similarity index 100% rename from operators/test/e2e/test/run_mutation.go rename to test/e2e/test/run_mutation.go diff --git a/operators/test/e2e/test/run_reversal.go b/test/e2e/test/run_reversal.go similarity index 100% rename from operators/test/e2e/test/run_reversal.go rename to test/e2e/test/run_reversal.go diff --git a/operators/test/e2e/test/step.go b/test/e2e/test/step.go similarity index 100% rename from operators/test/e2e/test/step.go rename to test/e2e/test/step.go diff --git a/operators/test/e2e/test/utils.go b/test/e2e/test/utils.go similarity index 100% rename from operators/test/e2e/test/utils.go rename to test/e2e/test/utils.go diff --git a/operators/test/e2e/test/version.go b/test/e2e/test/version.go similarity index 100% rename from operators/test/e2e/test/version.go rename to test/e2e/test/version.go From 6a322122c9c4904c15f02f6b3d01271373b97bbf Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 10:26:36 -0500 Subject: [PATCH 2/8] Update gitignore --- .gitignore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0e18e28ba5..6a66cb782f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,12 +29,11 @@ vendor/ license.key # generated from merging multiple files in the Makefile -operators/config/all-in-one.yaml +config/all-in-one.yaml # ignore all generated docs HTML docs/html/* # ignore deployer files -operators/hack/deployer/deployer -operators/hack/deployer/config/run-config.yml - +hack/deployer/deployer +hack/deployer/config/run-config.yml From 84aaedd77cec01727ba9105d6448035983261db5 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 10:27:29 -0500 Subject: [PATCH 3/8] Rm autogen file --- config/all-in-one.yaml | 970 ----------------------------------------- 1 file changed, 970 deletions(-) delete mode 100644 config/all-in-one.yaml diff --git a/config/all-in-one.yaml b/config/all-in-one.yaml deleted file mode 100644 index 8178bea023..0000000000 --- a/config/all-in-one.yaml +++ /dev/null @@ -1,970 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - controller-tools.k8s.io: "1.0" - name: apmservers.apm.k8s.elastic.co -spec: - additionalPrinterColumns: - - JSONPath: .status.health - name: health - type: string - - JSONPath: .status.availableNodes - description: Available nodes - name: nodes - type: integer - - JSONPath: .spec.version - description: APM version - name: version - type: string - - JSONPath: .metadata.creationTimestamp - name: age - type: date - group: apm.k8s.elastic.co - names: - categories: - - elastic - kind: ApmServer - plural: apmservers - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - config: - description: Config represents the APM configuration. - type: object - elasticsearch: - description: Elasticsearch configures how the APM server connects to - Elasticsearch - properties: - auth: - description: Auth configures authentication for APM Server to use. - properties: - inline: - description: Inline is auth provided as plaintext inline credentials. - properties: - password: - description: Password is the password to use. - type: string - username: - description: User is the username to use. - type: string - required: - - username - - password - type: object - secret: - description: SecretKeyRef is a secret that contains the credentials - to use. - type: object - type: object - hosts: - description: Hosts are the URLs of the output Elasticsearch nodes. - items: - type: string - type: array - ssl: - description: SSL configures TLS-related configuration for Elasticsearch - properties: - certificateAuthorities: - description: CertificateAuthorities is a secret that contains - a `tls.crt` entry that contain certificates for server verifications. - properties: - secretName: - type: string - type: object - type: object - type: object - elasticsearchRef: - description: ElasticsearchRef references an Elasticsearch resource in - the Kubernetes cluster. If the namespace is not specified, the current - resource namespace will be used. - properties: - name: - type: string - namespace: - type: string - required: - - name - type: object - featureFlags: - description: FeatureFlags are apm-specific flags that enable or disable - specific experimental features - type: object - http: - description: HTTP contains settings for HTTP. - properties: - service: - description: Service is a template for the Kubernetes Service - properties: - metadata: - description: ObjectMeta is metadata for the service. The name - and namespace provided here is managed by ECK and will be - ignored. - type: object - spec: - description: Spec defines the behavior of the service. - type: object - type: object - tls: - description: TLS describe additional options to consider when generating - HTTP TLS certificates. - properties: - certificate: - description: 'Certificate is a reference to a secret that contains - the certificate and private key to be used. The secret should - have the following content: - `tls.crt`: The certificate - (or a chain). - `tls.key`: The private key to the first certificate - in the certificate chain.' - properties: - secretName: - type: string - type: object - selfSignedCertificate: - description: SelfSignedCertificate define options to apply to - self-signed certificate managed by the operator. - properties: - disabled: - description: Disabled turns off the provisioning of self-signed - HTTP TLS certificates. - type: boolean - subjectAltNames: - description: 'SubjectAlternativeNames is a list of SANs - to include in the HTTP TLS certificates. For example: - a wildcard DNS to expose the cluster.' - items: - properties: - dns: - type: string - ip: - type: string - type: object - type: array - type: object - type: object - type: object - image: - description: Image represents the docker image that will be used. - type: string - nodeCount: - description: NodeCount defines how many nodes the Apm Server deployment - must have. - format: int32 - type: integer - podTemplate: - description: PodTemplate can be used to propagate configuration to APM - Server pods. This allows specifying custom annotations, labels, environment - variables, affinity, resources, etc. for the pods created from this - NodeSpec. - type: object - secureSettings: - description: SecureSettings reference a secret containing secure settings, - to be injected into the APM keystore on each node. Each individual - key/value entry in the referenced secret is considered as an individual - secure setting to be injected. The secret must exist in the same namespace - as the APM resource. - properties: - secretName: - type: string - type: object - version: - description: Version represents the version of the APM Server - type: string - type: object - status: - properties: - controllerVersion: - description: ControllerVersion is the version of the controller that - last updated the ApmServer instance - type: string - health: - type: string - secretTokenSecret: - description: SecretTokenSecretName is the name of the Secret that contains - the secret token - type: string - service: - description: ExternalService is the name of the service the agents should - connect to. - type: string - type: object - version: v1alpha1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - ---- - -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - controller-tools.k8s.io: "1.0" - name: elasticsearches.elasticsearch.k8s.elastic.co -spec: - additionalPrinterColumns: - - JSONPath: .status.health - name: health - type: string - - JSONPath: .status.availableNodes - description: Available nodes - name: nodes - type: integer - - JSONPath: .spec.version - description: Elasticsearch version - name: version - type: string - - JSONPath: .status.phase - name: phase - type: string - - JSONPath: .metadata.creationTimestamp - name: age - type: date - group: elasticsearch.k8s.elastic.co - names: - categories: - - elastic - kind: Elasticsearch - plural: elasticsearches - shortNames: - - es - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - featureFlags: - description: FeatureFlags are instance-specific flags that enable or - disable specific experimental features - type: object - http: - description: HTTP contains settings for HTTP. - properties: - service: - description: Service is a template for the Kubernetes Service - properties: - metadata: - description: ObjectMeta is metadata for the service. The name - and namespace provided here is managed by ECK and will be - ignored. - type: object - spec: - description: Spec defines the behavior of the service. - type: object - type: object - tls: - description: TLS describe additional options to consider when generating - HTTP TLS certificates. - properties: - certificate: - description: 'Certificate is a reference to a secret that contains - the certificate and private key to be used. The secret should - have the following content: - `tls.crt`: The certificate - (or a chain). - `tls.key`: The private key to the first certificate - in the certificate chain.' - properties: - secretName: - type: string - type: object - selfSignedCertificate: - description: SelfSignedCertificate define options to apply to - self-signed certificate managed by the operator. - properties: - disabled: - description: Disabled turns off the provisioning of self-signed - HTTP TLS certificates. - type: boolean - subjectAltNames: - description: 'SubjectAlternativeNames is a list of SANs - to include in the HTTP TLS certificates. For example: - a wildcard DNS to expose the cluster.' - items: - properties: - dns: - type: string - ip: - type: string - type: object - type: array - type: object - type: object - type: object - image: - description: Image represents the docker image that will be used. - type: string - nodes: - description: Nodes represents a list of groups of nodes with the same - configuration to be part of the cluster - items: - properties: - config: - description: Config represents Elasticsearch configuration. - type: object - name: - description: Name is a logical name for this set of nodes. Used - as a part of the managed Elasticsearch node.name setting. - maxLength: 12 - pattern: '[a-zA-Z0-9-]*' - type: string - nodeCount: - description: NodeCount defines how many nodes have this topology - format: int32 - type: integer - podTemplate: - description: PodTemplate can be used to propagate configuration - to Elasticsearch pods. This allows specifying custom annotations, - labels, environment variables, volumes, affinity, resources, - etc. for the pods created from this NodeSpec. - type: object - volumeClaimTemplates: - description: 'VolumeClaimTemplates is a list of claims that pods - are allowed to reference. Every claim in this list must have - at least one matching (by name) volumeMount in one container - in the template. A claim in this list takes precedence over - any volumes in the template, with the same name. TODO: Define - the behavior if a claim already exists with the same name. TODO: - define special behavior based on claim metadata.name. (e.g data - / logs volumes)' - items: - type: object - type: array - type: object - type: array - podDisruptionBudget: - description: PodDisruptionBudget allows full control of the default - pod disruption budget. The default budget selects all cluster pods - and sets maxUnavailable to 1. To disable it entirely, set to the empty - value (`{}` in YAML). - properties: - metadata: - description: ObjectMeta is metadata for the service. The name and - namespace provided here is managed by ECK and will be ignored. - type: object - spec: - description: Spec of the desired behavior of the PodDisruptionBudget - type: object - type: object - secureSettings: - description: SecureSettings reference a secret containing secure settings, - to be injected into Elasticsearch keystore on each node. Each individual - key/value entry in the referenced secret is considered as an individual - secure setting to be injected. The secret must exist in the same namespace - as the Elasticsearch resource. - properties: - secretName: - type: string - type: object - setVmMaxMapCount: - description: SetVMMaxMapCount indicates whether an init container should - be used to ensure that the `vm.max_map_count` is set according to - https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html. - Setting this to true requires the kubelet to allow running privileged - containers. Defaults to true if not specified. To be disabled, it - must be explicitly set to false. - type: boolean - updateStrategy: - description: UpdateStrategy specifies how updates to the cluster should - be performed. - properties: - changeBudget: - description: ChangeBudget is the change budget that should be used - when performing mutations to the cluster. - properties: - maxSurge: - description: 'MaxSurge is the maximum number of pods that can - be scheduled above the original number of pods. By default, - a fixed value of 1 is used. Value can be an absolute number - (ex: 5) or a percentage of total pods at the start of the - update (ex: 10%). This can not be 0 if MaxUnavailable is 0 - if you want automatic rolling updates to be applied. Absolute - number is calculated from percentage by rounding up. Example: - when this is set to 30%, the new group can be scaled up by - 30% immediately when the rolling update starts. Once old pods - have been killed, new group can be scaled up further, ensuring - that total number of pods running at any time during the update - is at most 130% of the target number of pods.' - format: int64 - type: integer - maxUnavailable: - description: 'MaxUnavailable is the maximum number of pods that - can be unavailable during the update. Value can be an absolute - number (ex: 5) or a percentage of total pods at the start - of update (ex: 10%). Absolute number is calculated from percentage - by rounding down. This can not be 0 if MaxSurge is 0 if you - want automatic rolling changes to be applied. By default, - a fixed value of 0 is used. Example: when this is set to 30%, - the group can be scaled down by 30% immediately when the rolling - update starts. Once new pods are ready, the group can be scaled - down further, followed by scaling up the group, ensuring that - at least 70% of the target number of pods are available at - all times during the update.' - format: int64 - type: integer - required: - - maxUnavailable - - maxSurge - type: object - groups: - description: Groups is a list of groups that should have their cluster - mutations considered in a fair manner with a strict change budget - (not allowing any surge or unavailability) before the entire cluster - is reconciled with the full change budget. - items: - properties: - selector: - description: Selector is the selector used to match pods. - type: object - type: object - type: array - type: object - version: - description: Version represents the version of the stack - type: string - type: object - status: - properties: - clusterUUID: - type: string - controllerVersion: - description: ControllerVersion is the version of the controller that - last updated the Elasticsearch cluster - type: string - health: - type: string - masterNode: - type: string - phase: - type: string - service: - type: string - zenDiscovery: - properties: - minimumMasterNodes: - format: int64 - type: integer - type: object - type: object - version: v1alpha1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - ---- - -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - controller-tools.k8s.io: "1.0" - name: trustrelationships.elasticsearch.k8s.elastic.co -spec: - group: elasticsearch.k8s.elastic.co - names: - kind: TrustRelationship - plural: trustrelationships - scope: Namespaced - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - caCert: - description: CaCert contains the PEM-encoded CA certificate for the - remote cluster. - type: string - type: object - version: v1alpha1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - ---- - -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - controller-tools.k8s.io: "1.0" - name: kibanas.kibana.k8s.elastic.co -spec: - additionalPrinterColumns: - - JSONPath: .status.health - name: health - type: string - - JSONPath: .status.availableNodes - description: Available nodes - name: nodes - type: integer - - JSONPath: .spec.version - description: Kibana version - name: version - type: string - - JSONPath: .metadata.creationTimestamp - name: age - type: date - group: kibana.k8s.elastic.co - names: - categories: - - elastic - kind: Kibana - plural: kibanas - shortNames: - - kb - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - config: - description: Config represents Kibana configuration. - type: object - elasticsearch: - description: Elasticsearch configures how Kibana connects to Elasticsearch - properties: - auth: - description: Auth configures authentication for Kibana to use. - properties: - inline: - description: Inline is auth provided as plaintext inline credentials. - properties: - password: - description: Password is the password to use. - type: string - username: - description: User is the username to use. - type: string - required: - - username - - password - type: object - secret: - description: SecretKeyRef is a secret that contains the credentials - to use. - type: object - type: object - certificateAuthorities: - description: CertificateAuthorities names a secret that contains - a CA file entry to use. - properties: - secretName: - type: string - type: object - url: - description: ElasticsearchURL is the URL to the target Elasticsearch - type: string - required: - - url - type: object - elasticsearchRef: - description: ElasticsearchRef references an Elasticsearch resource in - the Kubernetes cluster. If the namespace is not specified, the current - resource namespace will be used. - properties: - name: - type: string - namespace: - type: string - required: - - name - type: object - featureFlags: - description: FeatureFlags are instance-specific flags that enable or - disable specific experimental features - type: object - http: - description: HTTP contains settings for HTTP. - properties: - service: - description: Service is a template for the Kubernetes Service - properties: - metadata: - description: ObjectMeta is metadata for the service. The name - and namespace provided here is managed by ECK and will be - ignored. - type: object - spec: - description: Spec defines the behavior of the service. - type: object - type: object - tls: - description: TLS describe additional options to consider when generating - HTTP TLS certificates. - properties: - certificate: - description: 'Certificate is a reference to a secret that contains - the certificate and private key to be used. The secret should - have the following content: - `tls.crt`: The certificate - (or a chain). - `tls.key`: The private key to the first certificate - in the certificate chain.' - properties: - secretName: - type: string - type: object - selfSignedCertificate: - description: SelfSignedCertificate define options to apply to - self-signed certificate managed by the operator. - properties: - disabled: - description: Disabled turns off the provisioning of self-signed - HTTP TLS certificates. - type: boolean - subjectAltNames: - description: 'SubjectAlternativeNames is a list of SANs - to include in the HTTP TLS certificates. For example: - a wildcard DNS to expose the cluster.' - items: - properties: - dns: - type: string - ip: - type: string - type: object - type: array - type: object - type: object - type: object - image: - description: Image represents the docker image that will be used. - type: string - nodeCount: - description: NodeCount defines how many nodes the Kibana deployment - must have. - format: int32 - type: integer - podTemplate: - description: PodTemplate can be used to propagate configuration to Kibana - pods. This allows specifying custom annotations, labels, environment - variables, affinity, resources, etc. for the pods created from this - NodeSpec. - type: object - secureSettings: - description: SecureSettings reference a secret containing secure settings, - to be injected into Kibana keystore on each node. Each individual - key/value entry in the referenced secret is considered as an individual - secure setting to be injected. The secret must exist in the same namespace - as the Kibana resource. - properties: - secretName: - type: string - type: object - version: - description: Version represents the version of Kibana - type: string - type: object - status: - properties: - associationStatus: - type: string - controllerVersion: - description: ControllerVersion is the version of the controller that - last updated the Kibana instance - type: string - health: - type: string - type: object - version: v1alpha1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] - ---- - -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: elastic-operator -rules: -- apiGroups: - - "" - resources: - - pods - - endpoints - - events - - persistentvolumeclaims - - secrets - - services - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - apps - resources: - - deployments - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - batch - resources: - - cronjobs - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - policy - resources: - - poddisruptionbudgets - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - elasticsearch.k8s.elastic.co - resources: - - elasticsearches - - elasticsearches/status - - elasticsearches/finalizers - - enterpriselicenses - - enterpriselicenses/status - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - kibana.k8s.elastic.co - resources: - - kibanas - - kibanas/status - - kibanas/finalizers - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - apm.k8s.elastic.co - resources: - - apmservers - - apmservers/status - - apmservers/finalizers - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - associations.k8s.elastic.co - resources: - - apmserverelasticsearchassociations - - apmserverelasticsearchassociations/status - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - admissionregistration.k8s.io - resources: - - mutatingwebhookconfigurations - - validatingwebhookconfigurations - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - ---- - -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: elastic-operator -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: elastic-operator -subjects: -- kind: ServiceAccount - name: elastic-operator - namespace: elastic-system - ---- - -apiVersion: v1 -kind: Namespace -metadata: - name: elastic-system - ---- - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: elastic-operator - namespace: elastic-system - labels: - control-plane: elastic-operator -spec: - selector: - matchLabels: - control-plane: elastic-operator - serviceName: elastic-operator - template: - metadata: - labels: - control-plane: elastic-operator - spec: - serviceAccountName: elastic-operator - containers: - - image: docker.elastic.co/eck/eck-operator:0.8.0 - name: manager - args: ["manager", "--operator-roles", "all", "--enable-debug-logs=false"] - env: - - name: OPERATOR_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: WEBHOOK_SECRET - value: webhook-server-secret - - name: WEBHOOK_PODS_LABEL - value: elastic-operator - - name: OPERATOR_IMAGE - value: docker.elastic.co/eck/eck-operator:0.8.0 - resources: - limits: - cpu: 1 - memory: 100Mi - requests: - cpu: 100m - memory: 20Mi - ports: - - containerPort: 9876 - name: webhook-server - protocol: TCP - volumeMounts: - - mountPath: /tmp/cert - name: cert - readOnly: true - terminationGracePeriodSeconds: 10 - volumes: - - name: cert - secret: - defaultMode: 420 - secretName: webhook-server-secret ---- -apiVersion: v1 -kind: Secret -metadata: - name: webhook-server-secret - namespace: elastic-system - ---- - -apiVersion: v1 -kind: ServiceAccount -metadata: - name: elastic-operator - namespace: elastic-system - ---- - From 4f90b9f703e5d00eca7ceb27476d5cba34badf29 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 10:30:03 -0500 Subject: [PATCH 4/8] Mv golangci --- .golangci.yml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 .golangci.yml diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000000..fa950f0123 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,87 @@ +run: + deadline: 90s + skip-dirs: + - config + - hack + skip-files: + - utils/chrono/millis\.test\.go +linters: + enable-all: true + disable: + - dupl + - gochecknoglobals + - gochecknoinits + - interfacer + - lll + - scopelint +linters-settings: + maligned: + suggest-new: true +issues: + exclude-rules: + - linters: + - golint + text: 'name .* stutters' + + - path: (^test/.*\.go|.*_test\.go) + linters: + - goconst + - unparam + - path: pkg/controller/apmserver/config/reconcile\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/common/settings/canonical_config\.go + text: 'Consider preallocating `result`' + - path: pkg/controller/common/user/external\.go + text: 'method Id should be ID' + - path: pkg/controller/elasticsearch/certificates/transport/csr\.go + text: '`buildGeneralNames` \- `svcs` is unused' + - path: pkg/controller/elasticsearch/certificates/transport/reconcile\.go + text: 'Consider preallocating `names`' + - path: pkg/controller/elasticsearch/client/base\.go + text: '`\(\*baseClient\)\.put` \- `out` always receives `nil`' + - path: pkg/controller/elasticsearch/client/client\.go + text: 'G402: TLS InsecureSkipVerify set true' + - path: pkg/controller/elasticsearch/client/model\.go + text: 'struct of size 136 bytes could be of size 128 bytes' + - path: pkg/controller/elasticsearch/driver/default.go + text: 'cyclomatic complexity \d+ of func `\(\*defaultDriver\)\.Reconcile` is high' + - path: pkg/controller/elasticsearch/keystore/environment\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/elasticsearch/mutation/comparison/pvc\.go + text: 'Consider preallocating `volumeAndPVCs`' + - path: pkg/controller/elasticsearch/name/name\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/elasticsearch/processmanager/client\.go + text: '`\(\*DefaultClient\)\.doRequest` \- `method` always receives `\"GET\"`' + - path: pkg/controller/elasticsearch/processmanager/client\.go + text: 'G402: TLS InsecureSkipVerify set true' + - path: pkg/controller/elasticsearch/processmanager/config\.go + text: 'struct of size 96 bytes could be of size 80 bytes' + - path: pkg/controller/elasticsearch/reconcile/resources_state\.go + text: 'ifElseChain: rewrite if\-else to switch statement' + - path: pkg/controller/elasticsearch/settings/fields\.go + text: 'const .* should be' + - path: pkg/controller/elasticsearch/user/reconciler\.go + text: 'Consider preallocating `allUsers`' + - path: pkg/controller/elasticsearch/user/user\.go + text: 'method Id should be ID' + - path: pkg/controller/elasticsearch/validation/validation\.go + text: 'Consider preallocating `errs`' + - path: pkg/controller/elasticsearch/version/running_versions\.go + text: 'Consider preallocating `vs`' + - path: pkg/controller/elasticsearch/version/version6/zen1_test\.go + text: 'struct of size 1048 bytes could be of size 1040 bytes' + - path: pkg/controller/elasticsearch/version/version7/initial_master_nodes_test\.go + text: 'ifElseChain: rewrite if\-else to switch statement' + - path: pkg/controller/elasticsearch/volume/names\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/kibana/volume/volumes\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/kibanaassociation/ca\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/kibanaassociation/user_test\.go + text: 'G101: Potential hardcoded credentials' + - path: pkg/controller/license/validation/validations\.go + text: 'Consider preallocating `errs`' + - path: test/e2e/test/elasticsearch/steps_license\.go + text: 'G101: Potential hardcoded credentials' From 9ce192e1962b3a02498e4637c853867efc608e3c Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 10:36:21 -0500 Subject: [PATCH 5/8] Update imports --- cmd/main.go | 4 +- cmd/manager/main.go | 18 ++-- hack/deployer/cmd/execute.go | 2 +- hack/deployer/cmd/get.go | 2 +- hack/deployer/main.go | 2 +- operators/.golangci.yml | 87 ------------------- pkg/apis/addtoscheme_apm_v1alpha1.go | 2 +- pkg/apis/addtoscheme_associations_v1alpha1.go | 2 +- pkg/apis/addtoscheme_common_v1alpha1.go | 2 +- .../addtoscheme_elasticsearch_v1alpha1.go | 2 +- pkg/apis/addtoscheme_kibana_v1alpha1.go | 2 +- pkg/apis/apm/v1alpha1/apmserver_types.go | 2 +- .../apm/v1alpha1/zz_generated.deepcopy.go | 2 +- .../v1alpha1/elasticsearch_config.go | 2 +- .../v1alpha1/elasticsearch_config_test.go | 2 +- .../v1alpha1/elasticsearch_types.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/kibana/v1alpha1/kibana_types.go | 2 +- pkg/apis/kibana/v1alpha1/kibana_types_test.go | 2 +- .../kibana/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/controller/add_apmserver.go | 4 +- .../add_apmserverelasticsearchassociation.go | 4 +- pkg/controller/add_association.go | 4 +- pkg/controller/add_elasticsearch.go | 4 +- pkg/controller/add_kibana.go | 4 +- pkg/controller/add_license.go | 6 +- .../apmserver/apmserver_controller.go | 38 ++++---- .../apmserver/apmserver_controller_test.go | 14 +-- .../apmserver/certificates/reconcile.go | 16 ++-- pkg/controller/apmserver/config/config.go | 14 +-- pkg/controller/apmserver/config/reconcile.go | 10 +-- .../apmserver/deployment_control.go | 4 +- pkg/controller/apmserver/labels/labels.go | 2 +- pkg/controller/apmserver/name/name.go | 2 +- pkg/controller/apmserver/pod.go | 12 +-- pkg/controller/apmserver/pod_test.go | 6 +- pkg/controller/apmserver/services.go | 8 +- pkg/controller/apmserver/state.go | 2 +- ...rverelasticsearchassociation_controller.go | 32 +++---- ...lasticsearchassociation_controller_test.go | 10 +-- .../labels.go | 4 +- .../common/annotation/association_status.go | 2 +- .../common/annotation/controller_version.go | 4 +- .../annotation/controller_version_test.go | 14 +-- pkg/controller/common/annotation/pod.go | 2 +- pkg/controller/common/annotation/pod_test.go | 2 +- .../common/association/association.go | 4 +- .../common/association/association_test.go | 6 +- pkg/controller/common/association/user.go | 10 +-- .../common/association/user_test.go | 20 ++--- .../common/certificates/ca_reconcile.go | 6 +- .../common/certificates/ca_reconcile_test.go | 6 +- .../certificates/http/certificates_secret.go | 6 +- .../http/certificates_secret_test.go | 2 +- .../certificates/http/dynamic_watches.go | 8 +- .../common/certificates/http/public_secret.go | 10 +-- .../certificates/http/public_secret_test.go | 8 +- .../common/certificates/http/reconcile.go | 12 +-- .../certificates/http/reconcile_test.go | 12 +-- .../common/certificates/http/volume.go | 6 +- pkg/controller/common/certificates/name.go | 2 +- .../common/defaults/pod_template.go | 2 +- pkg/controller/common/finalizer/handler.go | 4 +- .../common/finalizer/handler_test.go | 2 +- .../common/keystore/initcontainer.go | 2 +- pkg/controller/common/keystore/resources.go | 6 +- .../common/keystore/resources_test.go | 8 +- pkg/controller/common/keystore/user_secret.go | 12 +-- .../common/keystore/user_secret_test.go | 8 +- pkg/controller/common/keystore/volumes.go | 2 +- pkg/controller/common/license/check.go | 2 +- pkg/controller/common/license/check_test.go | 6 +- pkg/controller/common/license/crud.go | 4 +- pkg/controller/common/license/detection.go | 2 +- .../common/license/detection_test.go | 2 +- pkg/controller/common/license/labels.go | 2 +- pkg/controller/common/license/match.go | 2 +- pkg/controller/common/license/match_test.go | 4 +- pkg/controller/common/license/model.go | 2 +- pkg/controller/common/license/model_test.go | 6 +- pkg/controller/common/license/trial.go | 4 +- pkg/controller/common/license/trial_test.go | 6 +- .../common/license/verifier_test.go | 2 +- pkg/controller/common/license/watches.go | 4 +- pkg/controller/common/name/name.go | 2 +- pkg/controller/common/operator/parameters.go | 6 +- .../common/reconciler/reconciler.go | 2 +- .../common/reconciler/reconciler_test.go | 2 +- pkg/controller/common/service_control.go | 4 +- pkg/controller/common/user/finalizer.go | 4 +- pkg/controller/common/user/label.go | 6 +- .../watches/handler_integration_test.go | 6 +- pkg/controller/common/watches/handler_test.go | 2 +- pkg/controller/controller.go | 4 +- .../certificates/ca_reconcile.go | 18 ++-- .../certificates/transport/csr.go | 6 +- .../certificates/transport/csr_test.go | 4 +- .../certificates/transport/pod_secret.go | 4 +- .../certificates/transport/pod_secret_test.go | 2 +- .../certificates/transport/public_secret.go | 14 +-- .../transport/public_secret_test.go | 8 +- .../certificates/transport/reconcile.go | 14 +-- .../certificates/transport/reconcile_test.go | 8 +- .../transport/transport_fixtures_test.go | 4 +- .../elasticsearch/cleanup/resources.go | 6 +- .../elasticsearch/cleanup/resources_test.go | 6 +- pkg/controller/elasticsearch/client/base.go | 4 +- pkg/controller/elasticsearch/client/client.go | 6 +- .../elasticsearch/client/client_test.go | 8 +- pkg/controller/elasticsearch/client/mock.go | 2 +- pkg/controller/elasticsearch/client/model.go | 2 +- pkg/controller/elasticsearch/client/v6.go | 2 +- .../elasticsearch/configmap/configmap.go | 12 +-- .../configmap/configmap_control.go | 6 +- .../elasticsearch/driver/downscale.go | 16 ++-- .../driver/downscale_invariants.go | 10 +-- .../driver/downscale_invariants_test.go | 6 +- .../elasticsearch/driver/downscale_test.go | 20 ++--- .../elasticsearch/driver/downscale_utils.go | 14 +-- pkg/controller/elasticsearch/driver/driver.go | 46 +++++----- .../elasticsearch/driver/esstate.go | 6 +- pkg/controller/elasticsearch/driver/nodes.go | 22 ++--- .../elasticsearch/driver/nodes_test.go | 8 +- .../elasticsearch/driver/upgrade.go | 12 +-- .../elasticsearch/driver/upgrade_test.go | 12 +-- .../elasticsearch/driver/upscale.go | 12 +-- .../elasticsearch/driver/upscale_test.go | 14 +-- .../elasticsearch/elasticsearch_controller.go | 38 ++++---- .../initcontainer/initcontainer.go | 4 +- .../initcontainer/initcontainer_test.go | 4 +- .../elasticsearch/initcontainer/keystore.go | 4 +- .../elasticsearch/initcontainer/prepare_fs.go | 14 +-- pkg/controller/elasticsearch/label/label.go | 6 +- .../elasticsearch/label/label_test.go | 6 +- pkg/controller/elasticsearch/license/apply.go | 8 +- .../elasticsearch/license/apply_test.go | 14 +-- .../elasticsearch/license/reconcile.go | 6 +- .../elasticsearch/migration/migrate_data.go | 4 +- .../migration/migrate_data_test.go | 4 +- pkg/controller/elasticsearch/name/name.go | 2 +- .../elasticsearch/nodespec/defaults.go | 12 +-- .../elasticsearch/nodespec/fixtures.go | 2 +- .../elasticsearch/nodespec/podspec.go | 26 +++--- .../elasticsearch/nodespec/podspec_test.go | 10 +-- .../elasticsearch/nodespec/readiness_probe.go | 2 +- .../elasticsearch/nodespec/resources.go | 14 +-- .../elasticsearch/nodespec/statefulset.go | 18 ++-- .../elasticsearch/nodespec/volumes.go | 18 ++-- .../elasticsearch/observer/finalizer.go | 2 +- .../elasticsearch/observer/manager.go | 2 +- .../elasticsearch/observer/manager_test.go | 2 +- .../elasticsearch/observer/observer.go | 2 +- .../elasticsearch/observer/observer_test.go | 8 +- .../elasticsearch/observer/state.go | 4 +- .../elasticsearch/observer/state_test.go | 6 +- .../elasticsearch/observer/watch_test.go | 2 +- pkg/controller/elasticsearch/pdb/reconcile.go | 14 +-- .../elasticsearch/pdb/reconcile_test.go | 12 +-- .../reconcile/resources_state.go | 8 +- .../elasticsearch/reconcile/state.go | 10 +-- .../elasticsearch/reconcile/state_test.go | 10 +-- .../elasticsearch/services/services.go | 14 +-- .../elasticsearch/services/services_test.go | 2 +- .../settings/canonical_config.go | 4 +- .../elasticsearch/settings/config_volume.go | 14 +-- .../settings/config_volume_test.go | 8 +- .../elasticsearch/settings/masters.go | 16 ++-- .../elasticsearch/settings/masters_test.go | 10 +-- .../elasticsearch/settings/merged_config.go | 8 +- .../elasticsearch/settings/secure_settings.go | 16 ++-- .../settings/secure_settings_test.go | 14 +-- pkg/controller/elasticsearch/sset/getter.go | 4 +- .../elasticsearch/sset/getter_test.go | 2 +- pkg/controller/elasticsearch/sset/list.go | 10 +-- .../elasticsearch/sset/list_test.go | 10 +-- pkg/controller/elasticsearch/sset/pod.go | 6 +- pkg/controller/elasticsearch/sset/pod_test.go | 4 +- .../elasticsearch/sset/reconcile.go | 8 +- .../elasticsearch/sset/reconcile_test.go | 6 +- .../elasticsearch/user/credentials.go | 8 +- .../elasticsearch/user/credentials_test.go | 4 +- .../elasticsearch/user/predefined_users.go | 2 +- .../elasticsearch/user/reconciler.go | 8 +- .../elasticsearch/user/reconciler_test.go | 2 +- pkg/controller/elasticsearch/user/user.go | 4 +- .../validation/upgrade_checks.go | 6 +- .../validation/upgrade_checks_test.go | 4 +- .../elasticsearch/validation/validation.go | 6 +- .../validation/validation_test.go | 8 +- .../elasticsearch/validation/validations.go | 16 ++-- .../validation/validations_test.go | 14 +-- .../elasticsearch/version/running_versions.go | 4 +- .../version/running_versions_test.go | 4 +- .../version/supported_versions.go | 4 +- .../version/supported_versions_test.go | 4 +- .../version/zen1/compatibility.go | 4 +- .../version/zen1/compatibility_test.go | 4 +- .../version/zen1/minimum_masters.go | 18 ++-- .../version/zen1/minimum_masters_test.go | 18 ++-- .../version/zen2/compatibility.go | 10 +-- .../version/zen2/compatibility_test.go | 8 +- .../version/zen2/initial_master_nodes.go | 12 +-- .../version/zen2/initial_master_nodes_test.go | 14 +-- .../version/zen2/voting_exclusions.go | 8 +- .../version/zen2/voting_exclusions_test.go | 10 +-- .../kibana/certificates/reconcile.go | 16 ++-- pkg/controller/kibana/config/reconciler.go | 10 +-- .../kibana/config/reconciler_test.go | 10 +-- pkg/controller/kibana/config/secret_volume.go | 4 +- pkg/controller/kibana/config/settings.go | 16 ++-- pkg/controller/kibana/config/settings_test.go | 8 +- pkg/controller/kibana/config/telemetry.go | 2 +- pkg/controller/kibana/deployment_control.go | 8 +- pkg/controller/kibana/driver.go | 44 +++++----- pkg/controller/kibana/driver_test.go | 16 ++-- pkg/controller/kibana/es/secret.go | 6 +- pkg/controller/kibana/kibana_controller.go | 22 ++--- pkg/controller/kibana/label/labels.go | 2 +- pkg/controller/kibana/name/name.go | 2 +- pkg/controller/kibana/pod/pod.go | 14 +-- pkg/controller/kibana/pod/pod_test.go | 6 +- pkg/controller/kibana/services.go | 10 +-- pkg/controller/kibana/state.go | 2 +- .../kibana/version/version6/settings.go | 4 +- .../kibana/version/version7/settings.go | 4 +- pkg/controller/kibana/volume/volumes.go | 2 +- .../association_controller.go | 30 +++---- .../association_controller_test.go | 14 +-- pkg/controller/kibanaassociation/ca.go | 14 +-- pkg/controller/kibanaassociation/ca_test.go | 12 +-- pkg/controller/kibanaassociation/labels.go | 6 +- pkg/controller/kibanaassociation/watch.go | 8 +- pkg/controller/license/license_controller.go | 16 ++-- .../license_controller_integration_test.go | 16 ++-- .../license/license_controller_test.go | 12 +-- pkg/controller/license/list.go | 4 +- pkg/controller/license/list_test.go | 6 +- .../license/trial/trial_controller.go | 10 +-- .../trial_controller_integration_test.go | 8 +- .../license/validation/validations.go | 4 +- .../license/validation/validations_test.go | 6 +- pkg/dev/portforward/pod_forwarder.go | 4 +- pkg/utils/test/integration.go | 6 +- pkg/utils/test/retry.go | 2 +- pkg/webhook/add_validations.go | 2 +- pkg/webhook/elasticsearch/handler.go | 8 +- pkg/webhook/elasticsearch/handler_test.go | 2 +- pkg/webhook/license/handler.go | 6 +- pkg/webhook/license/handler_test.go | 6 +- pkg/webhook/server.go | 6 +- pkg/webhook/webhook.go | 4 +- test/e2e/apm/association_test.go | 16 ++-- test/e2e/apm/configuration_test.go | 16 ++-- test/e2e/apm/sample_test.go | 8 +- test/e2e/apm/standalone_test.go | 6 +- test/e2e/cmd/main.go | 2 +- test/e2e/cmd/run/eventlog.go | 2 +- test/e2e/cmd/run/run.go | 4 +- test/e2e/es/certs_test.go | 12 +-- test/e2e/es/failure_test.go | 8 +- test/e2e/es/keystore_test.go | 8 +- test/e2e/es/license_test.go | 6 +- test/e2e/es/mutation_test.go | 4 +- test/e2e/es/podtemplate_test.go | 8 +- test/e2e/es/reversal_test.go | 8 +- test/e2e/es/volume_test.go | 4 +- test/e2e/kb/association_test.go | 16 ++-- test/e2e/kb/failure_test.go | 8 +- test/e2e/kb/keystore_test.go | 10 +-- test/e2e/kb/resource_test.go | 6 +- test/e2e/kb/sample_test.go | 6 +- test/e2e/kb/telemetry_test.go | 8 +- test/e2e/smoke_test.go | 8 +- test/e2e/test/apmserver/builder.go | 6 +- test/e2e/test/apmserver/checks_apm.go | 12 +-- test/e2e/test/apmserver/checks_k8s.go | 2 +- test/e2e/test/apmserver/http_client.go | 12 +-- test/e2e/test/apmserver/steps_creation.go | 6 +- test/e2e/test/apmserver/steps_deletion.go | 4 +- test/e2e/test/apmserver/steps_init.go | 4 +- test/e2e/test/apmserver/steps_mutation.go | 2 +- test/e2e/test/elasticsearch/builder.go | 10 +-- test/e2e/test/elasticsearch/checks_data.go | 6 +- test/e2e/test/elasticsearch/checks_es.go | 8 +- test/e2e/test/elasticsearch/checks_k8s.go | 12 +-- .../e2e/test/elasticsearch/checks_keystore.go | 8 +- .../e2e/test/elasticsearch/checks_reversal.go | 8 +- test/e2e/test/elasticsearch/checks_volume.go | 6 +- test/e2e/test/elasticsearch/cluster_uuid.go | 6 +- test/e2e/test/elasticsearch/http_client.go | 14 +-- test/e2e/test/elasticsearch/pause.go | 8 +- test/e2e/test/elasticsearch/steps_creation.go | 6 +- test/e2e/test/elasticsearch/steps_deletion.go | 6 +- test/e2e/test/elasticsearch/steps_init.go | 6 +- test/e2e/test/elasticsearch/steps_license.go | 10 +-- test/e2e/test/elasticsearch/steps_mutation.go | 8 +- test/e2e/test/http_client.go | 2 +- test/e2e/test/k8s_client.go | 28 +++--- test/e2e/test/kibana/builder.go | 6 +- test/e2e/test/kibana/checks_k8s.go | 4 +- test/e2e/test/kibana/checks_kb.go | 6 +- test/e2e/test/kibana/http_client.go | 8 +- test/e2e/test/kibana/steps_creation.go | 6 +- test/e2e/test/kibana/steps_deletion.go | 4 +- test/e2e/test/kibana/steps_init.go | 4 +- test/e2e/test/kibana/steps_mutation.go | 6 +- test/e2e/test/utils.go | 4 +- 307 files changed, 1182 insertions(+), 1269 deletions(-) delete mode 100644 operators/.golangci.yml diff --git a/cmd/main.go b/cmd/main.go index d4ba62a0ec..b96857854d 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,8 +5,8 @@ package main import ( - "github.com/elastic/cloud-on-k8s/operators/cmd/manager" - "github.com/elastic/cloud-on-k8s/operators/pkg/dev" + "github.com/elastic/cloud-on-k8s/cmd/manager" + "github.com/elastic/cloud-on-k8s/pkg/dev" "github.com/spf13/cobra" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" diff --git a/cmd/manager/main.go b/cmd/manager/main.go index b52506bc9b..c3d44e2ecc 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -12,15 +12,15 @@ import ( "strings" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/about" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/dev" - "github.com/elastic/cloud-on-k8s/operators/pkg/dev/portforward" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" - "github.com/elastic/cloud-on-k8s/operators/pkg/webhook" + "github.com/elastic/cloud-on-k8s/pkg/about" + "github.com/elastic/cloud-on-k8s/pkg/apis" + "github.com/elastic/cloud-on-k8s/pkg/controller" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/dev" + "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" + "github.com/elastic/cloud-on-k8s/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/pkg/webhook" "github.com/spf13/cobra" "github.com/spf13/viper" "k8s.io/client-go/kubernetes" diff --git a/hack/deployer/cmd/execute.go b/hack/deployer/cmd/execute.go index df389ac058..366ced54e9 100644 --- a/hack/deployer/cmd/execute.go +++ b/hack/deployer/cmd/execute.go @@ -5,7 +5,7 @@ package cmd import ( - "github.com/elastic/cloud-on-k8s/operators/hack/deployer/runner" + "github.com/elastic/cloud-on-k8s/hack/deployer/runner" "github.com/spf13/cobra" ) diff --git a/hack/deployer/cmd/get.go b/hack/deployer/cmd/get.go index b200f04f1d..d8c76232d1 100644 --- a/hack/deployer/cmd/get.go +++ b/hack/deployer/cmd/get.go @@ -7,7 +7,7 @@ package cmd import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/hack/deployer/runner" + "github.com/elastic/cloud-on-k8s/hack/deployer/runner" "github.com/ghodss/yaml" "github.com/spf13/cobra" ) diff --git a/hack/deployer/main.go b/hack/deployer/main.go index 2570867432..d56a1dfec5 100644 --- a/hack/deployer/main.go +++ b/hack/deployer/main.go @@ -5,7 +5,7 @@ package main import ( - "github.com/elastic/cloud-on-k8s/operators/hack/deployer/cmd" + "github.com/elastic/cloud-on-k8s/hack/deployer/cmd" ) func main() { diff --git a/operators/.golangci.yml b/operators/.golangci.yml deleted file mode 100644 index fa950f0123..0000000000 --- a/operators/.golangci.yml +++ /dev/null @@ -1,87 +0,0 @@ -run: - deadline: 90s - skip-dirs: - - config - - hack - skip-files: - - utils/chrono/millis\.test\.go -linters: - enable-all: true - disable: - - dupl - - gochecknoglobals - - gochecknoinits - - interfacer - - lll - - scopelint -linters-settings: - maligned: - suggest-new: true -issues: - exclude-rules: - - linters: - - golint - text: 'name .* stutters' - - - path: (^test/.*\.go|.*_test\.go) - linters: - - goconst - - unparam - - path: pkg/controller/apmserver/config/reconcile\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/common/settings/canonical_config\.go - text: 'Consider preallocating `result`' - - path: pkg/controller/common/user/external\.go - text: 'method Id should be ID' - - path: pkg/controller/elasticsearch/certificates/transport/csr\.go - text: '`buildGeneralNames` \- `svcs` is unused' - - path: pkg/controller/elasticsearch/certificates/transport/reconcile\.go - text: 'Consider preallocating `names`' - - path: pkg/controller/elasticsearch/client/base\.go - text: '`\(\*baseClient\)\.put` \- `out` always receives `nil`' - - path: pkg/controller/elasticsearch/client/client\.go - text: 'G402: TLS InsecureSkipVerify set true' - - path: pkg/controller/elasticsearch/client/model\.go - text: 'struct of size 136 bytes could be of size 128 bytes' - - path: pkg/controller/elasticsearch/driver/default.go - text: 'cyclomatic complexity \d+ of func `\(\*defaultDriver\)\.Reconcile` is high' - - path: pkg/controller/elasticsearch/keystore/environment\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/elasticsearch/mutation/comparison/pvc\.go - text: 'Consider preallocating `volumeAndPVCs`' - - path: pkg/controller/elasticsearch/name/name\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/elasticsearch/processmanager/client\.go - text: '`\(\*DefaultClient\)\.doRequest` \- `method` always receives `\"GET\"`' - - path: pkg/controller/elasticsearch/processmanager/client\.go - text: 'G402: TLS InsecureSkipVerify set true' - - path: pkg/controller/elasticsearch/processmanager/config\.go - text: 'struct of size 96 bytes could be of size 80 bytes' - - path: pkg/controller/elasticsearch/reconcile/resources_state\.go - text: 'ifElseChain: rewrite if\-else to switch statement' - - path: pkg/controller/elasticsearch/settings/fields\.go - text: 'const .* should be' - - path: pkg/controller/elasticsearch/user/reconciler\.go - text: 'Consider preallocating `allUsers`' - - path: pkg/controller/elasticsearch/user/user\.go - text: 'method Id should be ID' - - path: pkg/controller/elasticsearch/validation/validation\.go - text: 'Consider preallocating `errs`' - - path: pkg/controller/elasticsearch/version/running_versions\.go - text: 'Consider preallocating `vs`' - - path: pkg/controller/elasticsearch/version/version6/zen1_test\.go - text: 'struct of size 1048 bytes could be of size 1040 bytes' - - path: pkg/controller/elasticsearch/version/version7/initial_master_nodes_test\.go - text: 'ifElseChain: rewrite if\-else to switch statement' - - path: pkg/controller/elasticsearch/volume/names\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/kibana/volume/volumes\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/kibanaassociation/ca\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/kibanaassociation/user_test\.go - text: 'G101: Potential hardcoded credentials' - - path: pkg/controller/license/validation/validations\.go - text: 'Consider preallocating `errs`' - - path: test/e2e/test/elasticsearch/steps_license\.go - text: 'G101: Potential hardcoded credentials' diff --git a/pkg/apis/addtoscheme_apm_v1alpha1.go b/pkg/apis/addtoscheme_apm_v1alpha1.go index bc7cb965ff..ce997e8bd0 100644 --- a/pkg/apis/addtoscheme_apm_v1alpha1.go +++ b/pkg/apis/addtoscheme_apm_v1alpha1.go @@ -5,7 +5,7 @@ package apis import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_associations_v1alpha1.go b/pkg/apis/addtoscheme_associations_v1alpha1.go index ef27f8337f..19f8efbbb8 100644 --- a/pkg/apis/addtoscheme_associations_v1alpha1.go +++ b/pkg/apis/addtoscheme_associations_v1alpha1.go @@ -5,7 +5,7 @@ package apis import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/associations/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/associations/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_common_v1alpha1.go b/pkg/apis/addtoscheme_common_v1alpha1.go index a471e1bfa8..a59c86ec4d 100644 --- a/pkg/apis/addtoscheme_common_v1alpha1.go +++ b/pkg/apis/addtoscheme_common_v1alpha1.go @@ -5,7 +5,7 @@ package apis import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go b/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go index 221452c077..7f220a029a 100644 --- a/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go +++ b/pkg/apis/addtoscheme_elasticsearch_v1alpha1.go @@ -5,7 +5,7 @@ package apis import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_kibana_v1alpha1.go b/pkg/apis/addtoscheme_kibana_v1alpha1.go index 60ee24a785..f54ad63c78 100644 --- a/pkg/apis/addtoscheme_kibana_v1alpha1.go +++ b/pkg/apis/addtoscheme_kibana_v1alpha1.go @@ -5,7 +5,7 @@ package apis import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" ) func init() { diff --git a/pkg/apis/apm/v1alpha1/apmserver_types.go b/pkg/apis/apm/v1alpha1/apmserver_types.go index 5f2bf4a954..6f21ec2697 100644 --- a/pkg/apis/apm/v1alpha1/apmserver_types.go +++ b/pkg/apis/apm/v1alpha1/apmserver_types.go @@ -5,7 +5,7 @@ package v1alpha1 import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go index 90db926ef0..3ce346710c 100644 --- a/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/apm/v1alpha1/zz_generated.deepcopy.go @@ -9,7 +9,7 @@ package v1alpha1 import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go index c52a63ccbe..d33a91f359 100644 --- a/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go +++ b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config.go @@ -5,7 +5,7 @@ package v1alpha1 import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" ucfg "github.com/elastic/go-ucfg" ) diff --git a/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go index 86b4967c84..89f794a63f 100644 --- a/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go +++ b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_config_test.go @@ -7,7 +7,7 @@ package v1alpha1 import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" "github.com/go-test/deep" "github.com/stretchr/testify/require" ) diff --git a/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go index 2144e2c918..f6e4f69deb 100644 --- a/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go +++ b/pkg/apis/elasticsearch/v1alpha1/elasticsearch_types.go @@ -5,7 +5,7 @@ package v1alpha1 import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go index 517ee08040..627714e9af 100644 --- a/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/elasticsearch/v1alpha1/zz_generated.deepcopy.go @@ -9,7 +9,7 @@ package v1alpha1 import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/kibana/v1alpha1/kibana_types.go b/pkg/apis/kibana/v1alpha1/kibana_types.go index cae3ef2a30..72969da45e 100644 --- a/pkg/apis/kibana/v1alpha1/kibana_types.go +++ b/pkg/apis/kibana/v1alpha1/kibana_types.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" ) const ( diff --git a/pkg/apis/kibana/v1alpha1/kibana_types_test.go b/pkg/apis/kibana/v1alpha1/kibana_types_test.go index 1195b0d28d..db161a2bd9 100644 --- a/pkg/apis/kibana/v1alpha1/kibana_types_test.go +++ b/pkg/apis/kibana/v1alpha1/kibana_types_test.go @@ -7,7 +7,7 @@ package v1alpha1 import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go index 609a388217..45a892062d 100644 --- a/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/kibana/v1alpha1/zz_generated.deepcopy.go @@ -9,7 +9,7 @@ package v1alpha1 import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/controller/add_apmserver.go b/pkg/controller/add_apmserver.go index be54358b7c..773e6024d0 100644 --- a/pkg/controller/add_apmserver.go +++ b/pkg/controller/add_apmserver.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" ) func init() { diff --git a/pkg/controller/add_apmserverelasticsearchassociation.go b/pkg/controller/add_apmserverelasticsearchassociation.go index 89b6726903..0b01e56195 100644 --- a/pkg/controller/add_apmserverelasticsearchassociation.go +++ b/pkg/controller/add_apmserverelasticsearchassociation.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserverelasticsearchassociation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserverelasticsearchassociation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" ) func init() { diff --git a/pkg/controller/add_association.go b/pkg/controller/add_association.go index 968c21f6c1..7a90e3e3f3 100644 --- a/pkg/controller/add_association.go +++ b/pkg/controller/add_association.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibanaassociation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibanaassociation" ) func init() { diff --git a/pkg/controller/add_elasticsearch.go b/pkg/controller/add_elasticsearch.go index 58a6f613c7..14aa336eb6 100644 --- a/pkg/controller/add_elasticsearch.go +++ b/pkg/controller/add_elasticsearch.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch" ) func init() { diff --git a/pkg/controller/add_kibana.go b/pkg/controller/add_kibana.go index 7ba9c7a4b4..50d811e70e 100644 --- a/pkg/controller/add_kibana.go +++ b/pkg/controller/add_kibana.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana" ) func init() { diff --git a/pkg/controller/add_license.go b/pkg/controller/add_license.go index e3701673b9..be221bb9c1 100644 --- a/pkg/controller/add_license.go +++ b/pkg/controller/add_license.go @@ -5,9 +5,9 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/license/trial" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/license/trial" ) func init() { diff --git a/pkg/controller/apmserver/apmserver_controller.go b/pkg/controller/apmserver/apmserver_controller.go index 13daddfddf..4621407445 100644 --- a/pkg/controller/apmserver/apmserver_controller.go +++ b/pkg/controller/apmserver/apmserver_controller.go @@ -12,25 +12,25 @@ import ( "sync/atomic" "time" - apmv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - apmcerts "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/config" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/labels" - apmname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/pod" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + apmv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + apmcerts "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/config" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/labels" + apmname "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/name" + "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/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/pod" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "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" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/apmserver/apmserver_controller_test.go b/pkg/controller/apmserver/apmserver_controller_test.go index 1264ed0e08..a79e2ab2c5 100644 --- a/pkg/controller/apmserver/apmserver_controller_test.go +++ b/pkg/controller/apmserver/apmserver_controller_test.go @@ -7,13 +7,13 @@ package apmserver import ( "testing" - apmv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + apmv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "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/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/go-test/deep" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/apmserver/certificates/reconcile.go b/pkg/controller/apmserver/certificates/reconcile.go index e1589073ce..c8c8ac5757 100644 --- a/pkg/controller/apmserver/certificates/reconcile.go +++ b/pkg/controller/apmserver/certificates/reconcile.go @@ -7,15 +7,15 @@ package certificates import ( "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/labels" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/labels" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "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/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" coverv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controller/apmserver/config/config.go b/pkg/controller/apmserver/config/config.go index 8921aa9466..60e5588e6f 100644 --- a/pkg/controller/apmserver/config/config.go +++ b/pkg/controller/apmserver/config/config.go @@ -9,13 +9,13 @@ import ( "path" "path/filepath" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/association" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/association" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/apmserver/config/reconcile.go b/pkg/controller/apmserver/config/reconcile.go index 5557c0030a..8487661d40 100644 --- a/pkg/controller/apmserver/config/reconcile.go +++ b/pkg/controller/apmserver/config/reconcile.go @@ -7,11 +7,11 @@ package config import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/labels" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/labels" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/apmserver/deployment_control.go b/pkg/controller/apmserver/deployment_control.go index 73d6166587..45cae31f28 100644 --- a/pkg/controller/apmserver/deployment_control.go +++ b/pkg/controller/apmserver/deployment_control.go @@ -7,8 +7,8 @@ package apmserver import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/apmserver/labels/labels.go b/pkg/controller/apmserver/labels/labels.go index 296d68e71e..0c783558e1 100644 --- a/pkg/controller/apmserver/labels/labels.go +++ b/pkg/controller/apmserver/labels/labels.go @@ -4,7 +4,7 @@ package labels -import "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" +import "github.com/elastic/cloud-on-k8s/pkg/controller/common" const ( // ApmServerNameLabelName used to represent an ApmServer in k8s resources diff --git a/pkg/controller/apmserver/name/name.go b/pkg/controller/apmserver/name/name.go index 8d9f0f7e5a..6ac07e5e3f 100644 --- a/pkg/controller/apmserver/name/name.go +++ b/pkg/controller/apmserver/name/name.go @@ -5,7 +5,7 @@ package name import ( - common_name "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" + common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/controller/apmserver/pod.go b/pkg/controller/apmserver/pod.go index d2f08eb0ff..7dd1a44c23 100644 --- a/pkg/controller/apmserver/pod.go +++ b/pkg/controller/apmserver/pod.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/config" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/config" + "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/stringsutil" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/controller/apmserver/pod_test.go b/pkg/controller/apmserver/pod_test.go index 59682dc094..2f1fa456ca 100644 --- a/pkg/controller/apmserver/pod_test.go +++ b/pkg/controller/apmserver/pod_test.go @@ -11,9 +11,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" ) func TestNewPodSpec(t *testing.T) { diff --git a/pkg/controller/apmserver/services.go b/pkg/controller/apmserver/services.go index 3bb720abf6..60843bbde3 100644 --- a/pkg/controller/apmserver/services.go +++ b/pkg/controller/apmserver/services.go @@ -5,10 +5,10 @@ package apmserver import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/labels" - apmname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/labels" + apmname "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/apmserver/state.go b/pkg/controller/apmserver/state.go index f6b82273ea..6744ecd33b 100644 --- a/pkg/controller/apmserver/state.go +++ b/pkg/controller/apmserver/state.go @@ -5,7 +5,7 @@ package apmserver import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go b/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go index 16b5f73077..1489509b08 100644 --- a/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go +++ b/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller.go @@ -9,22 +9,22 @@ import ( "sync/atomic" "time" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/labels" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/association" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/services" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/labels" + "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/association" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" + "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" diff --git a/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go b/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go index 9a0e2d1e0a..7765100d46 100644 --- a/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go +++ b/pkg/controller/apmserverelasticsearchassociation/apmserverelasticsearchassociation_controller_test.go @@ -7,11 +7,11 @@ package apmserverelasticsearchassociation import ( "testing" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - assoctype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/associations/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + assoctype "github.com/elastic/cloud-on-k8s/pkg/apis/associations/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" diff --git a/pkg/controller/apmserverelasticsearchassociation/labels.go b/pkg/controller/apmserverelasticsearchassociation/labels.go index 4bdeadae94..56f5fac11d 100644 --- a/pkg/controller/apmserverelasticsearchassociation/labels.go +++ b/pkg/controller/apmserverelasticsearchassociation/labels.go @@ -5,8 +5,8 @@ package apmserverelasticsearchassociation import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/common/annotation/association_status.go b/pkg/controller/common/annotation/association_status.go index 557912fcd5..85920725a6 100644 --- a/pkg/controller/common/annotation/association_status.go +++ b/pkg/controller/common/annotation/association_status.go @@ -5,7 +5,7 @@ package annotation import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/common/annotation/controller_version.go b/pkg/controller/common/annotation/controller_version.go index e6908df5c4..fc7ca377a4 100644 --- a/pkg/controller/common/annotation/controller_version.go +++ b/pkg/controller/common/annotation/controller_version.go @@ -5,8 +5,8 @@ package annotation import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/controller/common/annotation/controller_version_test.go b/pkg/controller/common/annotation/controller_version_test.go index 23598a175a..d91435a863 100644 --- a/pkg/controller/common/annotation/controller_version_test.go +++ b/pkg/controller/common/annotation/controller_version_test.go @@ -7,9 +7,9 @@ package annotation import ( "testing" - kibanav1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + kibanav1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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" @@ -20,10 +20,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client/fake" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - assoctype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/associations/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + assoctype "github.com/elastic/cloud-on-k8s/pkg/apis/associations/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/controller/common/annotation/pod.go b/pkg/controller/common/annotation/pod.go index 44282b5bc1..78e8af917d 100644 --- a/pkg/controller/common/annotation/pod.go +++ b/pkg/controller/common/annotation/pod.go @@ -7,7 +7,7 @@ package annotation import ( "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/common/annotation/pod_test.go b/pkg/controller/common/annotation/pod_test.go index 599f7ad0c3..eb9b43a310 100644 --- a/pkg/controller/common/annotation/pod_test.go +++ b/pkg/controller/common/annotation/pod_test.go @@ -7,7 +7,7 @@ package annotation import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "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" diff --git a/pkg/controller/common/association/association.go b/pkg/controller/common/association/association.go index 283560e153..f7480d1cf6 100644 --- a/pkg/controller/common/association/association.go +++ b/pkg/controller/common/association/association.go @@ -5,8 +5,8 @@ package association import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/common/association/association_test.go b/pkg/controller/common/association/association_test.go index 34cb16baf0..8333bcd65a 100644 --- a/pkg/controller/common/association/association_test.go +++ b/pkg/controller/common/association/association_test.go @@ -7,9 +7,9 @@ package association import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/controller/common/association/user.go b/pkg/controller/common/association/user.go index c5c85f18d0..b4883aac4b 100644 --- a/pkg/controller/common/association/user.go +++ b/pkg/controller/common/association/user.go @@ -7,11 +7,11 @@ package association import ( "bytes" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - commonuser "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + commonuser "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "golang.org/x/crypto/bcrypt" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/common/association/user_test.go b/pkg/controller/common/association/user_test.go index b93428fd96..20cba63a5c 100644 --- a/pkg/controller/common/association/user_test.go +++ b/pkg/controller/common/association/user_test.go @@ -7,16 +7,16 @@ package association import ( "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - elasticsearchuser "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - esuser "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - kblabel "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + elasticsearchuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + esuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + kblabel "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/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" diff --git a/pkg/controller/common/certificates/ca_reconcile.go b/pkg/controller/common/certificates/ca_reconcile.go index e93517a3c4..344dd0ab6c 100644 --- a/pkg/controller/common/certificates/ca_reconcile.go +++ b/pkg/controller/common/certificates/ca_reconcile.go @@ -9,9 +9,9 @@ import ( "crypto/x509/pkix" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "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" apierrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/common/certificates/ca_reconcile_test.go b/pkg/controller/common/certificates/ca_reconcile_test.go index 5f7487fa7c..1dd8557bd6 100644 --- a/pkg/controller/common/certificates/ca_reconcile_test.go +++ b/pkg/controller/common/certificates/ca_reconcile_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" diff --git a/pkg/controller/common/certificates/http/certificates_secret.go b/pkg/controller/common/certificates/http/certificates_secret.go index e170a8ea16..c901936d6f 100644 --- a/pkg/controller/common/certificates/http/certificates_secret.go +++ b/pkg/controller/common/certificates/http/certificates_secret.go @@ -7,9 +7,9 @@ package http import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/common/certificates/http/certificates_secret_test.go b/pkg/controller/common/certificates/http/certificates_secret_test.go index 2cc57d6edf..6a3cf35bda 100644 --- a/pkg/controller/common/certificates/http/certificates_secret_test.go +++ b/pkg/controller/common/certificates/http/certificates_secret_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" ) func TestCertificatesSecret(t *testing.T) { diff --git a/pkg/controller/common/certificates/http/dynamic_watches.go b/pkg/controller/common/certificates/http/dynamic_watches.go index ef8f2384ad..f532e96b05 100644 --- a/pkg/controller/common/certificates/http/dynamic_watches.go +++ b/pkg/controller/common/certificates/http/dynamic_watches.go @@ -5,10 +5,10 @@ package http import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "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" ) diff --git a/pkg/controller/common/certificates/http/public_secret.go b/pkg/controller/common/certificates/http/public_secret.go index 3b2114d097..656ffcc63e 100644 --- a/pkg/controller/common/certificates/http/public_secret.go +++ b/pkg/controller/common/certificates/http/public_secret.go @@ -7,11 +7,11 @@ package http import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/maps" + "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" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/common/certificates/http/public_secret_test.go b/pkg/controller/common/certificates/http/public_secret_test.go index f7b822587b..b68cb7eb70 100644 --- a/pkg/controller/common/certificates/http/public_secret_test.go +++ b/pkg/controller/common/certificates/http/public_secret_test.go @@ -8,10 +8,10 @@ import ( "encoding/json" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "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" diff --git a/pkg/controller/common/certificates/http/reconcile.go b/pkg/controller/common/certificates/http/reconcile.go index 6b8f99060f..2e569e62c5 100644 --- a/pkg/controller/common/certificates/http/reconcile.go +++ b/pkg/controller/common/certificates/http/reconcile.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - netutil "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "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/watches" + "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" diff --git a/pkg/controller/common/certificates/http/reconcile_test.go b/pkg/controller/common/certificates/http/reconcile_test.go index a60957acdf..e4afc8189e 100644 --- a/pkg/controller/common/certificates/http/reconcile_test.go +++ b/pkg/controller/common/certificates/http/reconcile_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/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" diff --git a/pkg/controller/common/certificates/http/volume.go b/pkg/controller/common/certificates/http/volume.go index 5cf3a3ce98..9a3f9853b2 100644 --- a/pkg/controller/common/certificates/http/volume.go +++ b/pkg/controller/common/certificates/http/volume.go @@ -5,9 +5,9 @@ package http import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "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/volume" ) const ( diff --git a/pkg/controller/common/certificates/name.go b/pkg/controller/common/certificates/name.go index 6076c1163d..dc04b437ef 100644 --- a/pkg/controller/common/certificates/name.go +++ b/pkg/controller/common/certificates/name.go @@ -5,7 +5,7 @@ package certificates import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/controller/common/defaults/pod_template.go b/pkg/controller/common/defaults/pod_template.go index 9d1e673b3d..4195fffe6a 100644 --- a/pkg/controller/common/defaults/pod_template.go +++ b/pkg/controller/common/defaults/pod_template.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" ) var ( diff --git a/pkg/controller/common/finalizer/handler.go b/pkg/controller/common/finalizer/handler.go index d09a27747f..e521430f2b 100644 --- a/pkg/controller/common/finalizer/handler.go +++ b/pkg/controller/common/finalizer/handler.go @@ -5,8 +5,8 @@ package finalizer import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/common/finalizer/handler_test.go b/pkg/controller/common/finalizer/handler_test.go index e53db390a9..af1b41aa7d 100644 --- a/pkg/controller/common/finalizer/handler_test.go +++ b/pkg/controller/common/finalizer/handler_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/common/keystore/initcontainer.go b/pkg/controller/common/keystore/initcontainer.go index 5b91e41272..d92bc03d16 100644 --- a/pkg/controller/common/keystore/initcontainer.go +++ b/pkg/controller/common/keystore/initcontainer.go @@ -8,7 +8,7 @@ import ( "bytes" "text/template" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/common/keystore/resources.go b/pkg/controller/common/keystore/resources.go index 7c1fd81d5d..f95a96386c 100644 --- a/pkg/controller/common/keystore/resources.go +++ b/pkg/controller/common/keystore/resources.go @@ -13,9 +13,9 @@ import ( "k8s.io/client-go/tools/record" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var log = logf.Log.WithName("keystore") diff --git a/pkg/controller/common/keystore/resources_test.go b/pkg/controller/common/keystore/resources_test.go index debde4f513..6ba8be31e0 100644 --- a/pkg/controller/common/keystore/resources_test.go +++ b/pkg/controller/common/keystore/resources_test.go @@ -7,10 +7,10 @@ package keystore import ( "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - watches2 "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + 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" diff --git a/pkg/controller/common/keystore/user_secret.go b/pkg/controller/common/keystore/user_secret.go index ee44f4a434..b0b8f2702a 100644 --- a/pkg/controller/common/keystore/user_secret.go +++ b/pkg/controller/common/keystore/user_secret.go @@ -8,12 +8,12 @@ import ( "fmt" "strings" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "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" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/common/keystore/user_secret_test.go b/pkg/controller/common/keystore/user_secret_test.go index c9513e196f..b665edcfd5 100644 --- a/pkg/controller/common/keystore/user_secret_test.go +++ b/pkg/controller/common/keystore/user_secret_test.go @@ -8,10 +8,10 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/controller/common/keystore/volumes.go b/pkg/controller/common/keystore/volumes.go index 66d46d7464..8e23612c40 100644 --- a/pkg/controller/common/keystore/volumes.go +++ b/pkg/controller/common/keystore/volumes.go @@ -7,7 +7,7 @@ package keystore import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" ) const ( diff --git a/pkg/controller/common/license/check.go b/pkg/controller/common/license/check.go index 296d7ce42f..ae04934bab 100644 --- a/pkg/controller/common/license/check.go +++ b/pkg/controller/common/license/check.go @@ -7,7 +7,7 @@ package license import ( "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/common/license/check_test.go b/pkg/controller/common/license/check_test.go index 80a0c97411..d1ea95ce66 100644 --- a/pkg/controller/common/license/check_test.go +++ b/pkg/controller/common/license/check_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/client-go/kubernetes/scheme" diff --git a/pkg/controller/common/license/crud.go b/pkg/controller/common/license/crud.go index 23c87c581e..0f71e0c2ed 100644 --- a/pkg/controller/common/license/crud.go +++ b/pkg/controller/common/license/crud.go @@ -8,8 +8,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/common/license/detection.go b/pkg/controller/common/license/detection.go index 1be64eb427..61e18c1871 100644 --- a/pkg/controller/common/license/detection.go +++ b/pkg/controller/common/license/detection.go @@ -5,7 +5,7 @@ package license import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/common/license/detection_test.go b/pkg/controller/common/license/detection_test.go index 8cbed3c2e3..a8acfcf6b1 100644 --- a/pkg/controller/common/license/detection_test.go +++ b/pkg/controller/common/license/detection_test.go @@ -7,7 +7,7 @@ package license import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/common/license/labels.go b/pkg/controller/common/license/labels.go index c195fcd94f..750ac527fe 100644 --- a/pkg/controller/common/license/labels.go +++ b/pkg/controller/common/license/labels.go @@ -5,7 +5,7 @@ package license import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/controller/common/license/match.go b/pkg/controller/common/license/match.go index 3680c827e3..bdd0867f60 100644 --- a/pkg/controller/common/license/match.go +++ b/pkg/controller/common/license/match.go @@ -9,7 +9,7 @@ import ( "sort" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) type licenseWithTimeLeft struct { diff --git a/pkg/controller/common/license/match_test.go b/pkg/controller/common/license/match_test.go index f929a56457..d3d63607c8 100644 --- a/pkg/controller/common/license/match_test.go +++ b/pkg/controller/common/license/match_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" ) var ( diff --git a/pkg/controller/common/license/model.go b/pkg/controller/common/license/model.go index 91da1a731e..b3c4001f21 100644 --- a/pkg/controller/common/license/model.go +++ b/pkg/controller/common/license/model.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) // EnterpriseLicenseType is the type of enterprise license a resource is describing. diff --git a/pkg/controller/common/license/model_test.go b/pkg/controller/common/license/model_test.go index 59a8f80021..0bb6c77456 100644 --- a/pkg/controller/common/license/model_test.go +++ b/pkg/controller/common/license/model_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/apis" + "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" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/controller/common/license/trial.go b/pkg/controller/common/license/trial.go index 7d6d770f0d..0eb6b42487 100644 --- a/pkg/controller/common/license/trial.go +++ b/pkg/controller/common/license/trial.go @@ -12,8 +12,8 @@ import ( "fmt" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" + "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" diff --git a/pkg/controller/common/license/trial_test.go b/pkg/controller/common/license/trial_test.go index 9c021621e8..5676aebfae 100644 --- a/pkg/controller/common/license/trial_test.go +++ b/pkg/controller/common/license/trial_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/controller/common/license/verifier_test.go b/pkg/controller/common/license/verifier_test.go index 0d805732c0..416d6ecef4 100644 --- a/pkg/controller/common/license/verifier_test.go +++ b/pkg/controller/common/license/verifier_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/controller/common/license/watches.go b/pkg/controller/common/license/watches.go index 4bb2273186..ba7f6a296c 100644 --- a/pkg/controller/common/license/watches.go +++ b/pkg/controller/common/license/watches.go @@ -5,8 +5,8 @@ package license import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) diff --git a/pkg/controller/common/name/name.go b/pkg/controller/common/name/name.go index 410d4b85c6..11b3bf69b8 100644 --- a/pkg/controller/common/name/name.go +++ b/pkg/controller/common/name/name.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" ) diff --git a/pkg/controller/common/operator/parameters.go b/pkg/controller/common/operator/parameters.go index 5a26bd703a..73eafee9c2 100644 --- a/pkg/controller/common/operator/parameters.go +++ b/pkg/controller/common/operator/parameters.go @@ -5,9 +5,9 @@ package operator import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/about" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/pkg/about" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/utils/net" ) // Parameters contain parameters to create new operators. diff --git a/pkg/controller/common/reconciler/reconciler.go b/pkg/controller/common/reconciler/reconciler.go index 3a3020ff4f..dbbbad001b 100644 --- a/pkg/controller/common/reconciler/reconciler.go +++ b/pkg/controller/common/reconciler/reconciler.go @@ -8,7 +8,7 @@ import ( "fmt" "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/controller/common/reconciler/reconciler_test.go b/pkg/controller/common/reconciler/reconciler_test.go index 96e7246573..68916e28a7 100644 --- a/pkg/controller/common/reconciler/reconciler_test.go +++ b/pkg/controller/common/reconciler/reconciler_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/controller/common/service_control.go b/pkg/controller/common/service_control.go index 6b95137e81..0f10cdd9d4 100644 --- a/pkg/controller/common/service_control.go +++ b/pkg/controller/common/service_control.go @@ -7,8 +7,8 @@ package common import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/common/user/finalizer.go b/pkg/controller/common/user/finalizer.go index cb752650c7..7d53e8f174 100644 --- a/pkg/controller/common/user/finalizer.go +++ b/pkg/controller/common/user/finalizer.go @@ -5,8 +5,8 @@ package user import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "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/labels" diff --git a/pkg/controller/common/user/label.go b/pkg/controller/common/user/label.go index 77f13a1dcf..726c09e1d3 100644 --- a/pkg/controller/common/user/label.go +++ b/pkg/controller/common/user/label.go @@ -5,9 +5,9 @@ package user import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/handler" diff --git a/pkg/controller/common/watches/handler_integration_test.go b/pkg/controller/common/watches/handler_integration_test.go index bdb08f60f9..af02981788 100644 --- a/pkg/controller/common/watches/handler_integration_test.go +++ b/pkg/controller/common/watches/handler_integration_test.go @@ -19,9 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/test" + "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/test" ) func TestMain(m *testing.M) { diff --git a/pkg/controller/common/watches/handler_test.go b/pkg/controller/common/watches/handler_test.go index 8586dbf43e..9c4f007582 100644 --- a/pkg/controller/common/watches/handler_test.go +++ b/pkg/controller/common/watches/handler_test.go @@ -18,7 +18,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) type fakeHandler struct { diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index e9babf945b..d73daaa5df 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/controller/elasticsearch/certificates/ca_reconcile.go b/pkg/controller/elasticsearch/certificates/ca_reconcile.go index 498dea8569..5dac681e8b 100644 --- a/pkg/controller/elasticsearch/certificates/ca_reconcile.go +++ b/pkg/controller/elasticsearch/certificates/ca_reconcile.go @@ -8,15 +8,15 @@ import ( "crypto/x509" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/certificates/transport" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "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/controller/elasticsearch/certificates/transport" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controller/elasticsearch/certificates/transport/csr.go b/pkg/controller/elasticsearch/certificates/transport/csr.go index bea7b8cc5c..1f23e2e5d3 100644 --- a/pkg/controller/elasticsearch/certificates/transport/csr.go +++ b/pkg/controller/elasticsearch/certificates/transport/csr.go @@ -11,9 +11,9 @@ import ( "net" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - netutil "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/elasticsearch/certificates/transport/csr_test.go b/pkg/controller/elasticsearch/certificates/transport/csr_test.go index 738457d5ed..88bed623db 100644 --- a/pkg/controller/elasticsearch/certificates/transport/csr_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/csr_test.go @@ -9,8 +9,8 @@ import ( "net" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" diff --git a/pkg/controller/elasticsearch/certificates/transport/pod_secret.go b/pkg/controller/elasticsearch/certificates/transport/pod_secret.go index 1809d11e13..83a1032682 100644 --- a/pkg/controller/elasticsearch/certificates/transport/pod_secret.go +++ b/pkg/controller/elasticsearch/certificates/transport/pod_secret.go @@ -13,8 +13,8 @@ import ( "reflect" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go b/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go index f3356b22bd..3c8cca8e27 100644 --- a/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/pod_secret_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" + "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" diff --git a/pkg/controller/elasticsearch/certificates/transport/public_secret.go b/pkg/controller/elasticsearch/certificates/transport/public_secret.go index c98e737a5a..e8f82666bf 100644 --- a/pkg/controller/elasticsearch/certificates/transport/public_secret.go +++ b/pkg/controller/elasticsearch/certificates/transport/public_secret.go @@ -7,13 +7,13 @@ package transport import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/maps" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/maps" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go b/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go index 68d46b7376..2d9b0ba5b1 100644 --- a/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/public_secret_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/require" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/certificates/transport/reconcile.go b/pkg/controller/elasticsearch/certificates/transport/reconcile.go index dfb206aa38..0e6111e0f2 100644 --- a/pkg/controller/elasticsearch/certificates/transport/reconcile.go +++ b/pkg/controller/elasticsearch/certificates/transport/reconcile.go @@ -9,13 +9,13 @@ import ( "reflect" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" + "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/controller/elasticsearch/name" + "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/runtime" diff --git a/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go b/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go index e072fbd76a..3e05297cce 100644 --- a/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/reconcile_test.go @@ -7,11 +7,11 @@ package transport import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go b/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go index 15174fecf0..d09fae1f7f 100644 --- a/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go +++ b/pkg/controller/elasticsearch/certificates/transport/transport_fixtures_test.go @@ -11,8 +11,8 @@ import ( "crypto/x509/pkix" "encoding/pem" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/controller/elasticsearch/cleanup/resources.go b/pkg/controller/elasticsearch/cleanup/resources.go index 63e75128fe..4735df887f 100644 --- a/pkg/controller/elasticsearch/cleanup/resources.go +++ b/pkg/controller/elasticsearch/cleanup/resources.go @@ -7,9 +7,9 @@ package cleanup import ( "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/controller/elasticsearch/cleanup/resources_test.go b/pkg/controller/elasticsearch/cleanup/resources_test.go index ab5d2c53cc..e84e9ad594 100644 --- a/pkg/controller/elasticsearch/cleanup/resources_test.go +++ b/pkg/controller/elasticsearch/cleanup/resources_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" diff --git a/pkg/controller/elasticsearch/client/base.go b/pkg/controller/elasticsearch/client/base.go index 69c5545606..6e73a098d8 100644 --- a/pkg/controller/elasticsearch/client/base.go +++ b/pkg/controller/elasticsearch/client/base.go @@ -12,8 +12,8 @@ import ( "io" "net/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) type baseClient struct { diff --git a/pkg/controller/elasticsearch/client/client.go b/pkg/controller/elasticsearch/client/client.go index 560b43a273..350a7b9c3e 100644 --- a/pkg/controller/elasticsearch/client/client.go +++ b/pkg/controller/elasticsearch/client/client.go @@ -14,10 +14,10 @@ import ( "net/http" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/cryptutil" + "github.com/elastic/cloud-on-k8s/pkg/utils/cryptutil" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/net" ) const ( diff --git a/pkg/controller/elasticsearch/client/client_test.go b/pkg/controller/elasticsearch/client/client_test.go index d38f7813b5..8bd47644df 100644 --- a/pkg/controller/elasticsearch/client/client_test.go +++ b/pkg/controller/elasticsearch/client/client_test.go @@ -17,10 +17,10 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - fixtures "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client/test_fixtures" - "github.com/elastic/cloud-on-k8s/operators/pkg/dev/portforward" + "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" ) diff --git a/pkg/controller/elasticsearch/client/mock.go b/pkg/controller/elasticsearch/client/mock.go index 3ebbb35e16..0d4931cf35 100644 --- a/pkg/controller/elasticsearch/client/mock.go +++ b/pkg/controller/elasticsearch/client/mock.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" ) type RoundTripFunc func(req *http.Request) *http.Response diff --git a/pkg/controller/elasticsearch/client/model.go b/pkg/controller/elasticsearch/client/model.go index 9ae91c998e..5d23e1d3fa 100644 --- a/pkg/controller/elasticsearch/client/model.go +++ b/pkg/controller/elasticsearch/client/model.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) // Info represents the response from / diff --git a/pkg/controller/elasticsearch/client/v6.go b/pkg/controller/elasticsearch/client/v6.go index 2b212c7cfe..66de8f8511 100644 --- a/pkg/controller/elasticsearch/client/v6.go +++ b/pkg/controller/elasticsearch/client/v6.go @@ -9,7 +9,7 @@ import ( "net/http" "net/url" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "github.com/pkg/errors" ) diff --git a/pkg/controller/elasticsearch/configmap/configmap.go b/pkg/controller/elasticsearch/configmap/configmap.go index afea378314..c7f7f8ab38 100644 --- a/pkg/controller/elasticsearch/configmap/configmap.go +++ b/pkg/controller/elasticsearch/configmap/configmap.go @@ -5,12 +5,12 @@ package configmap import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/initcontainer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" + "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/runtime" diff --git a/pkg/controller/elasticsearch/configmap/configmap_control.go b/pkg/controller/elasticsearch/configmap/configmap_control.go index 50b044f478..3d7c115730 100644 --- a/pkg/controller/elasticsearch/configmap/configmap_control.go +++ b/pkg/controller/elasticsearch/configmap/configmap_control.go @@ -7,9 +7,9 @@ package configmap import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/runtime" ) diff --git a/pkg/controller/elasticsearch/driver/downscale.go b/pkg/controller/elasticsearch/driver/downscale.go index 63dc477f2e..4f3c118c93 100644 --- a/pkg/controller/elasticsearch/driver/downscale.go +++ b/pkg/controller/elasticsearch/driver/downscale.go @@ -7,14 +7,14 @@ package driver import ( v1 "k8s.io/api/core/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/migration" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version/zen1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version/zen2" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + esclient "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/migration" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen2" ) // HandleDownscale attempts to downscale actual StatefulSets towards expected ones. diff --git a/pkg/controller/elasticsearch/driver/downscale_invariants.go b/pkg/controller/elasticsearch/driver/downscale_invariants.go index 9bb71b32e3..7d7a8eeebf 100644 --- a/pkg/controller/elasticsearch/driver/downscale_invariants.go +++ b/pkg/controller/elasticsearch/driver/downscale_invariants.go @@ -5,11 +5,11 @@ package driver import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "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" ) diff --git a/pkg/controller/elasticsearch/driver/downscale_invariants_test.go b/pkg/controller/elasticsearch/driver/downscale_invariants_test.go index 391f0a2202..89e0fc286e 100644 --- a/pkg/controller/elasticsearch/driver/downscale_invariants_test.go +++ b/pkg/controller/elasticsearch/driver/downscale_invariants_test.go @@ -15,9 +15,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) 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 06c2108b81..8ea0da9a46 100644 --- a/pkg/controller/elasticsearch/driver/downscale_test.go +++ b/pkg/controller/elasticsearch/driver/downscale_test.go @@ -17,16 +17,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + esclient "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/nodespec" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "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" ) // 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 9eb67894ae..c8f1bb8ad9 100644 --- a/pkg/controller/elasticsearch/driver/downscale_utils.go +++ b/pkg/controller/elasticsearch/driver/downscale_utils.go @@ -5,13 +5,13 @@ package driver import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "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" ) diff --git a/pkg/controller/elasticsearch/driver/driver.go b/pkg/controller/elasticsearch/driver/driver.go index efba28f50a..30957a3921 100644 --- a/pkg/controller/elasticsearch/driver/driver.go +++ b/pkg/controller/elasticsearch/driver/driver.go @@ -14,29 +14,29 @@ import ( "k8s.io/client-go/tools/record" controller "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/cleanup" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/configmap" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/initcontainer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/network" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/pdb" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/services" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - esversion "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "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/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/cleanup" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/configmap" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/initcontainer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/network" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/pdb" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + esversion "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var ( diff --git a/pkg/controller/elasticsearch/driver/esstate.go b/pkg/controller/elasticsearch/driver/esstate.go index 02a60e2736..4cd7207b59 100644 --- a/pkg/controller/elasticsearch/driver/esstate.go +++ b/pkg/controller/elasticsearch/driver/esstate.go @@ -8,9 +8,9 @@ import ( "context" "sync" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) type ESState interface { diff --git a/pkg/controller/elasticsearch/driver/nodes.go b/pkg/controller/elasticsearch/driver/nodes.go index 98271935c4..c3086dabdd 100644 --- a/pkg/controller/elasticsearch/driver/nodes.go +++ b/pkg/controller/elasticsearch/driver/nodes.go @@ -5,17 +5,17 @@ package driver import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version/zen1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version/zen2" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "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/controller/elasticsearch/version/zen1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version/zen2" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func (d *defaultDriver) reconcileNodeSpecs( diff --git a/pkg/controller/elasticsearch/driver/nodes_test.go b/pkg/controller/elasticsearch/driver/nodes_test.go index 0830099e1e..5883a9a812 100644 --- a/pkg/controller/elasticsearch/driver/nodes_test.go +++ b/pkg/controller/elasticsearch/driver/nodes_test.go @@ -11,10 +11,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func Test_expectedResources_zen2(t *testing.T) { diff --git a/pkg/controller/elasticsearch/driver/upgrade.go b/pkg/controller/elasticsearch/driver/upgrade.go index 4a149926fd..cdbbd25a3e 100644 --- a/pkg/controller/elasticsearch/driver/upgrade.go +++ b/pkg/controller/elasticsearch/driver/upgrade.go @@ -12,12 +12,12 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + esclient "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" ) func (d *defaultDriver) handleRollingUpgrades( diff --git a/pkg/controller/elasticsearch/driver/upgrade_test.go b/pkg/controller/elasticsearch/driver/upgrade_test.go index 40286497ac..12a375a53c 100644 --- a/pkg/controller/elasticsearch/driver/upgrade_test.go +++ b/pkg/controller/elasticsearch/driver/upgrade_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "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/stringsutil" "github.com/go-test/deep" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/controller/elasticsearch/driver/upscale.go b/pkg/controller/elasticsearch/driver/upscale.go index d035f60609..6404fac695 100644 --- a/pkg/controller/elasticsearch/driver/upscale.go +++ b/pkg/controller/elasticsearch/driver/upscale.go @@ -7,12 +7,12 @@ package driver import ( "k8s.io/apimachinery/pkg/runtime" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" + "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/utils/k8s" ) // HandleUpscaleAndSpecChanges reconciles expected NodeSpec resources. diff --git a/pkg/controller/elasticsearch/driver/upscale_test.go b/pkg/controller/elasticsearch/driver/upscale_test.go index eca0c90448..5b92c2f87c 100644 --- a/pkg/controller/elasticsearch/driver/upscale_test.go +++ b/pkg/controller/elasticsearch/driver/upscale_test.go @@ -15,13 +15,13 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" + "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/utils/k8s" ) func TestHandleUpscaleAndSpecChanges(t *testing.T) { diff --git a/pkg/controller/elasticsearch/elasticsearch_controller.go b/pkg/controller/elasticsearch/elasticsearch_controller.go index da9787511c..0b0414e1f6 100644 --- a/pkg/controller/elasticsearch/elasticsearch_controller.go +++ b/pkg/controller/elasticsearch/elasticsearch_controller.go @@ -23,25 +23,25 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" "sigs.k8s.io/controller-runtime/pkg/source" - esversion "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version" - - elasticsearchv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - commonversion "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/driver" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - esreconcile "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + esversion "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version" + + elasticsearchv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + commonversion "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/driver" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + esreconcile "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/validation" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const name = "elasticsearch-controller" diff --git a/pkg/controller/elasticsearch/initcontainer/initcontainer.go b/pkg/controller/elasticsearch/initcontainer/initcontainer.go index 82397c2308..41718ccb18 100644 --- a/pkg/controller/elasticsearch/initcontainer/initcontainer.go +++ b/pkg/controller/elasticsearch/initcontainer/initcontainer.go @@ -5,8 +5,8 @@ package initcontainer import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "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" ) diff --git a/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go b/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go index bf1c02f459..4c70a95fd5 100644 --- a/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go +++ b/pkg/controller/elasticsearch/initcontainer/initcontainer_test.go @@ -7,8 +7,8 @@ package initcontainer import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "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" ) diff --git a/pkg/controller/elasticsearch/initcontainer/keystore.go b/pkg/controller/elasticsearch/initcontainer/keystore.go index db093a9e12..1d80e4a0e7 100644 --- a/pkg/controller/elasticsearch/initcontainer/keystore.go +++ b/pkg/controller/elasticsearch/initcontainer/keystore.go @@ -5,8 +5,8 @@ package initcontainer import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - esvolume "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" + "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 c3a77f66ef..c92a272237 100644 --- a/pkg/controller/elasticsearch/initcontainer/prepare_fs.go +++ b/pkg/controller/elasticsearch/initcontainer/prepare_fs.go @@ -7,13 +7,13 @@ package initcontainer import ( "path" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - esvolume "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "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/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + 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" ) diff --git a/pkg/controller/elasticsearch/label/label.go b/pkg/controller/elasticsearch/label/label.go index b78c3acdc8..40d6dad363 100644 --- a/pkg/controller/elasticsearch/label/label.go +++ b/pkg/controller/elasticsearch/label/label.go @@ -7,9 +7,9 @@ package label import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/controller/elasticsearch/label/label_test.go b/pkg/controller/elasticsearch/label/label_test.go index df0bcd50ed..e8b670e2f8 100644 --- a/pkg/controller/elasticsearch/label/label_test.go +++ b/pkg/controller/elasticsearch/label/label_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "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" diff --git a/pkg/controller/elasticsearch/license/apply.go b/pkg/controller/elasticsearch/license/apply.go index a69b3a0457..b615f8dbcb 100644 --- a/pkg/controller/elasticsearch/license/apply.go +++ b/pkg/controller/elasticsearch/license/apply.go @@ -9,10 +9,10 @@ import ( "encoding/json" "fmt" - common_license "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + common_license "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/controller/elasticsearch/name" + "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" diff --git a/pkg/controller/elasticsearch/license/apply_test.go b/pkg/controller/elasticsearch/license/apply_test.go index 833e1eded0..7c7f7a8f4a 100644 --- a/pkg/controller/elasticsearch/license/apply_test.go +++ b/pkg/controller/elasticsearch/license/apply_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - fixtures "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client/test_fixtures" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + esclient "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/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/controller/elasticsearch/license/reconcile.go b/pkg/controller/elasticsearch/license/reconcile.go index dcf640ca91..b37ab83317 100644 --- a/pkg/controller/elasticsearch/license/reconcile.go +++ b/pkg/controller/elasticsearch/license/reconcile.go @@ -5,9 +5,9 @@ package license import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // Reconcile reconciles the current Elasticsearch license with the desired one. diff --git a/pkg/controller/elasticsearch/migration/migrate_data.go b/pkg/controller/elasticsearch/migration/migrate_data.go index 885c5a84e0..453ee168b0 100644 --- a/pkg/controller/elasticsearch/migration/migrate_data.go +++ b/pkg/controller/elasticsearch/migration/migrate_data.go @@ -8,8 +8,8 @@ import ( "context" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" ) func shardIsMigrating(toMigrate client.Shard, others []client.Shard) bool { diff --git a/pkg/controller/elasticsearch/migration/migrate_data_test.go b/pkg/controller/elasticsearch/migration/migrate_data_test.go index 71dc5a0714..bcaf6001f8 100644 --- a/pkg/controller/elasticsearch/migration/migrate_data_test.go +++ b/pkg/controller/elasticsearch/migration/migrate_data_test.go @@ -8,8 +8,8 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/controller/elasticsearch/name/name.go b/pkg/controller/elasticsearch/name/name.go index 106d49ea07..59cd497357 100644 --- a/pkg/controller/elasticsearch/name/name.go +++ b/pkg/controller/elasticsearch/name/name.go @@ -5,7 +5,7 @@ package name import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/controller/elasticsearch/nodespec/defaults.go b/pkg/controller/elasticsearch/nodespec/defaults.go index 23f7440924..40c0225beb 100644 --- a/pkg/controller/elasticsearch/nodespec/defaults.go +++ b/pkg/controller/elasticsearch/nodespec/defaults.go @@ -11,12 +11,12 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/network" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - esvolume "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" + "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/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) const ( diff --git a/pkg/controller/elasticsearch/nodespec/fixtures.go b/pkg/controller/elasticsearch/nodespec/fixtures.go index 7c5fca1862..c00b1a0176 100644 --- a/pkg/controller/elasticsearch/nodespec/fixtures.go +++ b/pkg/controller/elasticsearch/nodespec/fixtures.go @@ -5,7 +5,7 @@ package nodespec import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/nodespec/podspec.go b/pkg/controller/elasticsearch/nodespec/podspec.go index 55faf05e17..928ce8b15a 100644 --- a/pkg/controller/elasticsearch/nodespec/podspec.go +++ b/pkg/controller/elasticsearch/nodespec/podspec.go @@ -10,19 +10,19 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/initcontainer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - esvolume "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" + "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/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) // BuildPodTemplateSpec builds a new PodTemplateSpec for an Elasticsearch node. diff --git a/pkg/controller/elasticsearch/nodespec/podspec_test.go b/pkg/controller/elasticsearch/nodespec/podspec_test.go index 91c58c760d..233b30187e 100644 --- a/pkg/controller/elasticsearch/nodespec/podspec_test.go +++ b/pkg/controller/elasticsearch/nodespec/podspec_test.go @@ -8,11 +8,11 @@ import ( "sort" "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/initcontainer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/initcontainer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/elasticsearch/nodespec/readiness_probe.go b/pkg/controller/elasticsearch/nodespec/readiness_probe.go index 0ba5681422..89fc0b30c0 100644 --- a/pkg/controller/elasticsearch/nodespec/readiness_probe.go +++ b/pkg/controller/elasticsearch/nodespec/readiness_probe.go @@ -7,7 +7,7 @@ package nodespec import ( "path" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/elasticsearch/nodespec/resources.go b/pkg/controller/elasticsearch/nodespec/resources.go index 1a9f8b3b44..3044934b0a 100644 --- a/pkg/controller/elasticsearch/nodespec/resources.go +++ b/pkg/controller/elasticsearch/nodespec/resources.go @@ -8,13 +8,13 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "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/utils/k8s" ) // Resources contain per-NodeSpec resources to be created. diff --git a/pkg/controller/elasticsearch/nodespec/statefulset.go b/pkg/controller/elasticsearch/nodespec/statefulset.go index 9f3ef902e0..0304a07e8b 100644 --- a/pkg/controller/elasticsearch/nodespec/statefulset.go +++ b/pkg/controller/elasticsearch/nodespec/statefulset.go @@ -5,15 +5,15 @@ package nodespec import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - esvolume "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + 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" diff --git a/pkg/controller/elasticsearch/nodespec/volumes.go b/pkg/controller/elasticsearch/nodespec/volumes.go index df4decfe52..fd377b5c6f 100644 --- a/pkg/controller/elasticsearch/nodespec/volumes.go +++ b/pkg/controller/elasticsearch/nodespec/volumes.go @@ -7,15 +7,15 @@ package nodespec import ( corev1 "k8s.io/api/core/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/initcontainer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - esvolume "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "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/controller/elasticsearch/initcontainer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) func buildVolumes(esName string, nodeSpec v1alpha1.NodeSpec, keystoreResources *keystore.Resources) ([]corev1.Volume, []corev1.VolumeMount) { diff --git a/pkg/controller/elasticsearch/observer/finalizer.go b/pkg/controller/elasticsearch/observer/finalizer.go index dc1781583a..36e3925a10 100644 --- a/pkg/controller/elasticsearch/observer/finalizer.go +++ b/pkg/controller/elasticsearch/observer/finalizer.go @@ -5,7 +5,7 @@ package observer import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/elasticsearch/observer/manager.go b/pkg/controller/elasticsearch/observer/manager.go index 7f7fc5d611..7cc7a83f5e 100644 --- a/pkg/controller/elasticsearch/observer/manager.go +++ b/pkg/controller/elasticsearch/observer/manager.go @@ -7,7 +7,7 @@ package observer import ( "sync" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/elasticsearch/observer/manager_test.go b/pkg/controller/elasticsearch/observer/manager_test.go index 8df3cec1b2..41c06bf306 100644 --- a/pkg/controller/elasticsearch/observer/manager_test.go +++ b/pkg/controller/elasticsearch/observer/manager_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/elasticsearch/observer/observer.go b/pkg/controller/elasticsearch/observer/observer.go index 7938c60bc1..0a77e60d48 100644 --- a/pkg/controller/elasticsearch/observer/observer.go +++ b/pkg/controller/elasticsearch/observer/observer.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "k8s.io/apimachinery/pkg/types" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" ) diff --git a/pkg/controller/elasticsearch/observer/observer_test.go b/pkg/controller/elasticsearch/observer/observer_test.go index 9040febaa4..4981c344eb 100644 --- a/pkg/controller/elasticsearch/observer/observer_test.go +++ b/pkg/controller/elasticsearch/observer/observer_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - fixtures "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client/test_fixtures" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/test" + "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" ) diff --git a/pkg/controller/elasticsearch/observer/state.go b/pkg/controller/elasticsearch/observer/state.go index f68bd85a75..d5ecf4e1d5 100644 --- a/pkg/controller/elasticsearch/observer/state.go +++ b/pkg/controller/elasticsearch/observer/state.go @@ -7,8 +7,8 @@ package observer import ( "context" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/elasticsearch/observer/state_test.go b/pkg/controller/elasticsearch/observer/state_test.go index 077e0940a0..ee9ed55edf 100644 --- a/pkg/controller/elasticsearch/observer/state_test.go +++ b/pkg/controller/elasticsearch/observer/state_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - fixtures "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client/test_fixtures" + "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" ) diff --git a/pkg/controller/elasticsearch/observer/watch_test.go b/pkg/controller/elasticsearch/observer/watch_test.go index 8b545ca197..4b036f55cd 100644 --- a/pkg/controller/elasticsearch/observer/watch_test.go +++ b/pkg/controller/elasticsearch/observer/watch_test.go @@ -7,7 +7,7 @@ package observer import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" ) func Test_hasHealthChanged(t *testing.T) { diff --git a/pkg/controller/elasticsearch/pdb/reconcile.go b/pkg/controller/elasticsearch/pdb/reconcile.go index 18c19ec3e7..a7733e290b 100644 --- a/pkg/controller/elasticsearch/pdb/reconcile.go +++ b/pkg/controller/elasticsearch/pdb/reconcile.go @@ -7,13 +7,13 @@ package pdb import ( "reflect" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "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/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/pdb/reconcile_test.go b/pkg/controller/elasticsearch/pdb/reconcile_test.go index 4ef6cf7922..06fc9da742 100644 --- a/pkg/controller/elasticsearch/pdb/reconcile_test.go +++ b/pkg/controller/elasticsearch/pdb/reconcile_test.go @@ -7,12 +7,12 @@ package pdb import ( "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/reconcile/resources_state.go b/pkg/controller/elasticsearch/reconcile/resources_state.go index b44c3b9dfc..ba62c91af2 100644 --- a/pkg/controller/elasticsearch/reconcile/resources_state.go +++ b/pkg/controller/elasticsearch/reconcile/resources_state.go @@ -10,10 +10,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/services" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/utils/k8s" ) // ResourcesState contains information about a deployments resources. diff --git a/pkg/controller/elasticsearch/reconcile/state.go b/pkg/controller/elasticsearch/reconcile/state.go index c35a81c418..3d24c969c8 100644 --- a/pkg/controller/elasticsearch/reconcile/state.go +++ b/pkg/controller/elasticsearch/reconcile/state.go @@ -8,11 +8,11 @@ import ( "fmt" "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/elasticsearch/reconcile/state_test.go b/pkg/controller/elasticsearch/reconcile/state_test.go index 968e9832a2..4348079a09 100644 --- a/pkg/controller/elasticsearch/reconcile/state_test.go +++ b/pkg/controller/elasticsearch/reconcile/state_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - v1alpha12 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" + v1alpha12 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controller/elasticsearch/services/services.go b/pkg/controller/elasticsearch/services/services.go index 1fa6998063..a7efe51f1a 100644 --- a/pkg/controller/elasticsearch/services/services.go +++ b/pkg/controller/elasticsearch/services/services.go @@ -10,13 +10,13 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/network" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/name" + "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" ) const ( diff --git a/pkg/controller/elasticsearch/services/services_test.go b/pkg/controller/elasticsearch/services/services_test.go index 561e8f7a08..525f690ba2 100644 --- a/pkg/controller/elasticsearch/services/services_test.go +++ b/pkg/controller/elasticsearch/services/services_test.go @@ -7,7 +7,7 @@ package services import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/settings/canonical_config.go b/pkg/controller/elasticsearch/settings/canonical_config.go index 82d96efba0..56925f4b95 100644 --- a/pkg/controller/elasticsearch/settings/canonical_config.go +++ b/pkg/controller/elasticsearch/settings/canonical_config.go @@ -5,8 +5,8 @@ package settings import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" ) // CanonicalConfig contains configuration for Elasticsearch ("elasticsearch.yml"), diff --git a/pkg/controller/elasticsearch/settings/config_volume.go b/pkg/controller/elasticsearch/settings/config_volume.go index 04c07a2f29..da4a62dea5 100644 --- a/pkg/controller/elasticsearch/settings/config_volume.go +++ b/pkg/controller/elasticsearch/settings/config_volume.go @@ -13,13 +13,13 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // 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 b55b3e1d31..864fa365db 100644 --- a/pkg/controller/elasticsearch/settings/config_volume_test.go +++ b/pkg/controller/elasticsearch/settings/config_volume_test.go @@ -8,10 +8,10 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + 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/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/elasticsearch/settings/masters.go b/pkg/controller/elasticsearch/settings/masters.go index 81ad7b7783..be3ce8e303 100644 --- a/pkg/controller/elasticsearch/settings/masters.go +++ b/pkg/controller/elasticsearch/settings/masters.go @@ -9,14 +9,14 @@ import ( "reflect" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/network" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" + "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/name" + "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" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/elasticsearch/settings/masters_test.go b/pkg/controller/elasticsearch/settings/masters_test.go index 9ca9e982f8..fa5c991eb2 100644 --- a/pkg/controller/elasticsearch/settings/masters_test.go +++ b/pkg/controller/elasticsearch/settings/masters_test.go @@ -7,11 +7,11 @@ package settings import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "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" diff --git a/pkg/controller/elasticsearch/settings/merged_config.go b/pkg/controller/elasticsearch/settings/merged_config.go index 57ef74cd21..4a8bb24785 100644 --- a/pkg/controller/elasticsearch/settings/merged_config.go +++ b/pkg/controller/elasticsearch/settings/merged_config.go @@ -7,10 +7,10 @@ package settings import ( "path" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" ) // NewMergedESConfig merges user provided Elasticsearch configuration with configuration derived from the given diff --git a/pkg/controller/elasticsearch/settings/secure_settings.go b/pkg/controller/elasticsearch/settings/secure_settings.go index 974a86f9af..94b85f69aa 100644 --- a/pkg/controller/elasticsearch/settings/secure_settings.go +++ b/pkg/controller/elasticsearch/settings/secure_settings.go @@ -8,14 +8,14 @@ import ( "fmt" "reflect" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "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/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "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" diff --git a/pkg/controller/elasticsearch/settings/secure_settings_test.go b/pkg/controller/elasticsearch/settings/secure_settings_test.go index fd170c81e6..da501fd306 100644 --- a/pkg/controller/elasticsearch/settings/secure_settings_test.go +++ b/pkg/controller/elasticsearch/settings/secure_settings_test.go @@ -13,13 +13,13 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestSecureSettingsSecret(t *testing.T) { diff --git a/pkg/controller/elasticsearch/sset/getter.go b/pkg/controller/elasticsearch/sset/getter.go index 1adadb9716..36eaa05325 100644 --- a/pkg/controller/elasticsearch/sset/getter.go +++ b/pkg/controller/elasticsearch/sset/getter.go @@ -5,8 +5,8 @@ package sset import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" appsv1 "k8s.io/api/apps/v1" ) diff --git a/pkg/controller/elasticsearch/sset/getter_test.go b/pkg/controller/elasticsearch/sset/getter_test.go index 7437aa057e..23b9ac86ff 100644 --- a/pkg/controller/elasticsearch/sset/getter_test.go +++ b/pkg/controller/elasticsearch/sset/getter_test.go @@ -7,7 +7,7 @@ package sset import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" appsv1 "k8s.io/api/apps/v1" ) diff --git a/pkg/controller/elasticsearch/sset/list.go b/pkg/controller/elasticsearch/sset/list.go index 9d9c767693..c61c02f054 100644 --- a/pkg/controller/elasticsearch/sset/list.go +++ b/pkg/controller/elasticsearch/sset/list.go @@ -12,11 +12,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/elastic/cloud-on-k8s/pkg/utils/stringsutil" ) var log = logf.Log.WithName("statefulset") diff --git a/pkg/controller/elasticsearch/sset/list_test.go b/pkg/controller/elasticsearch/sset/list_test.go index 3a4269e879..30836d864f 100644 --- a/pkg/controller/elasticsearch/sset/list_test.go +++ b/pkg/controller/elasticsearch/sset/list_test.go @@ -14,11 +14,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "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 c721ca9c10..916cd6d2c4 100644 --- a/pkg/controller/elasticsearch/sset/pod.go +++ b/pkg/controller/elasticsearch/sset/pod.go @@ -14,9 +14,9 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // 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 d3e7d2bf51..1ca13d0535 100644 --- a/pkg/controller/elasticsearch/sset/pod_test.go +++ b/pkg/controller/elasticsearch/sset/pod_test.go @@ -13,8 +13,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestPodName(t *testing.T) { diff --git a/pkg/controller/elasticsearch/sset/reconcile.go b/pkg/controller/elasticsearch/sset/reconcile.go index 9d2c5d5362..d5c5ee9dc0 100644 --- a/pkg/controller/elasticsearch/sset/reconcile.go +++ b/pkg/controller/elasticsearch/sset/reconcile.go @@ -5,10 +5,10 @@ package sset import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/controller/elasticsearch/sset/reconcile_test.go b/pkg/controller/elasticsearch/sset/reconcile_test.go index ac1509734f..9ae51f33cc 100644 --- a/pkg/controller/elasticsearch/sset/reconcile_test.go +++ b/pkg/controller/elasticsearch/sset/reconcile_test.go @@ -17,9 +17,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) func TestReconcileStatefulSet(t *testing.T) { diff --git a/pkg/controller/elasticsearch/user/credentials.go b/pkg/controller/elasticsearch/user/credentials.go index aa1bce483e..289c1d1744 100644 --- a/pkg/controller/elasticsearch/user/credentials.go +++ b/pkg/controller/elasticsearch/user/credentials.go @@ -10,10 +10,10 @@ import ( "sort" "strings" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" + common "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "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/name" "github.com/ghodss/yaml" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/user/credentials_test.go b/pkg/controller/elasticsearch/user/credentials_test.go index 571b0e9601..665e24e86e 100644 --- a/pkg/controller/elasticsearch/user/credentials_test.go +++ b/pkg/controller/elasticsearch/user/credentials_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" "k8s.io/apimachinery/pkg/types" "golang.org/x/crypto/bcrypt" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "github.com/stretchr/testify/assert" ) diff --git a/pkg/controller/elasticsearch/user/predefined_users.go b/pkg/controller/elasticsearch/user/predefined_users.go index 61cece2c90..27dcc8b08d 100644 --- a/pkg/controller/elasticsearch/user/predefined_users.go +++ b/pkg/controller/elasticsearch/user/predefined_users.go @@ -4,7 +4,7 @@ package user -import "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" +import "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" const ( // ExternalUserName also known as the 'elastic' diff --git a/pkg/controller/elasticsearch/user/reconciler.go b/pkg/controller/elasticsearch/user/reconciler.go index 199cb1c763..73941d78ed 100644 --- a/pkg/controller/elasticsearch/user/reconciler.go +++ b/pkg/controller/elasticsearch/user/reconciler.go @@ -5,10 +5,10 @@ package user import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/elasticsearch/user/reconciler_test.go b/pkg/controller/elasticsearch/user/reconciler_test.go index ffa75312f5..ea859f90a6 100644 --- a/pkg/controller/elasticsearch/user/reconciler_test.go +++ b/pkg/controller/elasticsearch/user/reconciler_test.go @@ -7,7 +7,7 @@ package user import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/user/user.go b/pkg/controller/elasticsearch/user/user.go index 83065e68f2..bb377bb12f 100644 --- a/pkg/controller/elasticsearch/user/user.go +++ b/pkg/controller/elasticsearch/user/user.go @@ -5,8 +5,8 @@ package user import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" "golang.org/x/crypto/bcrypt" ) diff --git a/pkg/controller/elasticsearch/validation/upgrade_checks.go b/pkg/controller/elasticsearch/validation/upgrade_checks.go index 49a7bde88b..ce87841698 100644 --- a/pkg/controller/elasticsearch/validation/upgrade_checks.go +++ b/pkg/controller/elasticsearch/validation/upgrade_checks.go @@ -7,9 +7,9 @@ package validation import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - esversion "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + esversion "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version" ) const ( diff --git a/pkg/controller/elasticsearch/validation/upgrade_checks_test.go b/pkg/controller/elasticsearch/validation/upgrade_checks_test.go index e622c3e7cf..1ad2045fa0 100644 --- a/pkg/controller/elasticsearch/validation/upgrade_checks_test.go +++ b/pkg/controller/elasticsearch/validation/upgrade_checks_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/validation/validation.go b/pkg/controller/elasticsearch/validation/validation.go index 3e747599b4..ed968d65e6 100644 --- a/pkg/controller/elasticsearch/validation/validation.go +++ b/pkg/controller/elasticsearch/validation/validation.go @@ -5,9 +5,9 @@ package validation import ( - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" pkgerrors "github.com/pkg/errors" ) diff --git a/pkg/controller/elasticsearch/validation/validation_test.go b/pkg/controller/elasticsearch/validation/validation_test.go index e2a5865efe..1714db7227 100644 --- a/pkg/controller/elasticsearch/validation/validation_test.go +++ b/pkg/controller/elasticsearch/validation/validation_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - common "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" + common "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" ) func TestNewValidationContext(t *testing.T) { diff --git a/pkg/controller/elasticsearch/validation/validations.go b/pkg/controller/elasticsearch/validation/validations.go index 979e76e2fc..9377d93637 100644 --- a/pkg/controller/elasticsearch/validation/validations.go +++ b/pkg/controller/elasticsearch/validation/validations.go @@ -12,14 +12,14 @@ import ( "strconv" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - esversion "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/version" - netutil "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/set" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + esversion "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/version" + netutil "github.com/elastic/cloud-on-k8s/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/pkg/utils/set" ) // Validations are all registered Elasticsearch validations. diff --git a/pkg/controller/elasticsearch/validation/validations_test.go b/pkg/controller/elasticsearch/validation/validations_test.go index 4e18859146..388e8cb137 100644 --- a/pkg/controller/elasticsearch/validation/validations_test.go +++ b/pkg/controller/elasticsearch/validation/validations_test.go @@ -15,13 +15,13 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - common "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" + common "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/elasticsearch/version/running_versions.go b/pkg/controller/elasticsearch/version/running_versions.go index ddfee435b3..bb5f39092a 100644 --- a/pkg/controller/elasticsearch/version/running_versions.go +++ b/pkg/controller/elasticsearch/version/running_versions.go @@ -7,8 +7,8 @@ package version import ( corev1 "k8s.io/api/core/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" ) // MinVersion extracts the currently running Elasticsearch versions from the running pods diff --git a/pkg/controller/elasticsearch/version/running_versions_test.go b/pkg/controller/elasticsearch/version/running_versions_test.go index 22d8ee5194..4f1a84b643 100644 --- a/pkg/controller/elasticsearch/version/running_versions_test.go +++ b/pkg/controller/elasticsearch/version/running_versions_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/elasticsearch/version/supported_versions.go b/pkg/controller/elasticsearch/version/supported_versions.go index 872f07084f..663eb5dc43 100644 --- a/pkg/controller/elasticsearch/version/supported_versions.go +++ b/pkg/controller/elasticsearch/version/supported_versions.go @@ -7,10 +7,10 @@ package version import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" "github.com/pkg/errors" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/elasticsearch/version/supported_versions_test.go b/pkg/controller/elasticsearch/version/supported_versions_test.go index 83d3c760ce..0037258a1b 100644 --- a/pkg/controller/elasticsearch/version/supported_versions_test.go +++ b/pkg/controller/elasticsearch/version/supported_versions_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/elasticsearch/version/zen1/compatibility.go b/pkg/controller/elasticsearch/version/zen1/compatibility.go index f9c41230b9..3c8e9425d3 100644 --- a/pkg/controller/elasticsearch/version/zen1/compatibility.go +++ b/pkg/controller/elasticsearch/version/zen1/compatibility.go @@ -7,8 +7,8 @@ package zen1 import ( appsv1 "k8s.io/api/apps/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" ) // versionCompatibleWithZen1 returns true if the given Elasticsearch version is compatible with zen1. diff --git a/pkg/controller/elasticsearch/version/zen1/compatibility_test.go b/pkg/controller/elasticsearch/version/zen1/compatibility_test.go index 9916a7e3c4..d698c6c32a 100644 --- a/pkg/controller/elasticsearch/version/zen1/compatibility_test.go +++ b/pkg/controller/elasticsearch/version/zen1/compatibility_test.go @@ -11,8 +11,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/sset" ) func createStatefulSetWithVersion(version string) appsv1.StatefulSet { diff --git a/pkg/controller/elasticsearch/version/zen1/minimum_masters.go b/pkg/controller/elasticsearch/version/zen1/minimum_masters.go index 29128ca561..cf7b83d378 100644 --- a/pkg/controller/elasticsearch/version/zen1/minimum_masters.go +++ b/pkg/controller/elasticsearch/version/zen1/minimum_masters.go @@ -10,15 +10,15 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - common "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + common "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "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/nodespec" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" + "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/utils/k8s" ) var ( diff --git a/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go b/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go index f6a94db5a7..97ea1a0378 100644 --- a/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go +++ b/pkg/controller/elasticsearch/version/zen1/minimum_masters_test.go @@ -8,15 +8,15 @@ import ( "context" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - settings2 "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/reconcile" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + settings2 "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "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/nodespec" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/reconcile" + "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/utils/k8s" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/elasticsearch/version/zen2/compatibility.go b/pkg/controller/elasticsearch/version/zen2/compatibility.go index 33fcac7acb..115d9e4457 100644 --- a/pkg/controller/elasticsearch/version/zen2/compatibility.go +++ b/pkg/controller/elasticsearch/version/zen2/compatibility.go @@ -7,11 +7,11 @@ package zen2 import ( appsv1 "k8s.io/api/apps/v1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" ) // 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 534fda7283..169a9c86f7 100644 --- a/pkg/controller/elasticsearch/version/zen2/compatibility_test.go +++ b/pkg/controller/elasticsearch/version/zen2/compatibility_test.go @@ -14,10 +14,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" ) 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 44a333dd30..343d8f6f33 100644 --- a/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go +++ b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes.go @@ -5,12 +5,12 @@ package zen2 import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/observer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go index 3d7e8425c6..1165de57d8 100644 --- a/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go +++ b/pkg/controller/elasticsearch/version/zen2/initial_master_nodes_test.go @@ -15,13 +15,13 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - settings2 "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/observer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + settings2 "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/nodespec" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/observer" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/settings" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) const ( diff --git a/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go b/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go index d2d8fa8bb2..c1060f6104 100644 --- a/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go +++ b/pkg/controller/elasticsearch/version/zen2/voting_exclusions.go @@ -9,10 +9,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" ) var ( diff --git a/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go b/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go index 03e2c6034f..2b57dd9c82 100644 --- a/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go +++ b/pkg/controller/elasticsearch/version/zen2/voting_exclusions_test.go @@ -13,11 +13,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/nodespec" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "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" ) type fakeESClient struct { diff --git a/pkg/controller/kibana/certificates/reconcile.go b/pkg/controller/kibana/certificates/reconcile.go index 57eca8a9a7..de43da06b4 100644 --- a/pkg/controller/kibana/certificates/reconcile.go +++ b/pkg/controller/kibana/certificates/reconcile.go @@ -7,14 +7,14 @@ package certificates import ( "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "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/controller/kibana/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" coverv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controller/kibana/config/reconciler.go b/pkg/controller/kibana/config/reconciler.go index 67e27036ad..535e4d9575 100644 --- a/pkg/controller/kibana/config/reconciler.go +++ b/pkg/controller/kibana/config/reconciler.go @@ -7,11 +7,11 @@ package config import ( "reflect" - "github.com/elastic/cloud-on-k8s/operators/pkg/about" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/about" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "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/client-go/kubernetes/scheme" diff --git a/pkg/controller/kibana/config/reconciler_test.go b/pkg/controller/kibana/config/reconciler_test.go index e87a361617..ebde9c6e2d 100644 --- a/pkg/controller/kibana/config/reconciler_test.go +++ b/pkg/controller/kibana/config/reconciler_test.go @@ -7,11 +7,11 @@ package config import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/about" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/about" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "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" diff --git a/pkg/controller/kibana/config/secret_volume.go b/pkg/controller/kibana/config/secret_volume.go index 2979c1c5f0..0347c74595 100644 --- a/pkg/controller/kibana/config/secret_volume.go +++ b/pkg/controller/kibana/config/secret_volume.go @@ -5,8 +5,8 @@ package config import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" ) // Constants to use for the config files in a Kibana pod. diff --git a/pkg/controller/kibana/config/settings.go b/pkg/controller/kibana/config/settings.go index 7a0adbb680..439783e55d 100644 --- a/pkg/controller/kibana/config/settings.go +++ b/pkg/controller/kibana/config/settings.go @@ -7,14 +7,14 @@ package config import ( "path" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/association" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/es" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/association" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/es" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) // Kibana configuration settings file diff --git a/pkg/controller/kibana/config/settings_test.go b/pkg/controller/kibana/config/settings_test.go index a9a0807f5c..e0fa31cb6c 100644 --- a/pkg/controller/kibana/config/settings_test.go +++ b/pkg/controller/kibana/config/settings_test.go @@ -7,10 +7,10 @@ package config import ( "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/settings" + "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" diff --git a/pkg/controller/kibana/config/telemetry.go b/pkg/controller/kibana/config/telemetry.go index 51fd50e650..c144fab5b3 100644 --- a/pkg/controller/kibana/config/telemetry.go +++ b/pkg/controller/kibana/config/telemetry.go @@ -5,7 +5,7 @@ package config import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/about" + "github.com/elastic/cloud-on-k8s/pkg/about" "github.com/ghodss/yaml" ) diff --git a/pkg/controller/kibana/deployment_control.go b/pkg/controller/kibana/deployment_control.go index 387072b25e..0e7646249b 100644 --- a/pkg/controller/kibana/deployment_control.go +++ b/pkg/controller/kibana/deployment_control.go @@ -5,10 +5,10 @@ package kibana import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/hash" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/hash" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "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" diff --git a/pkg/controller/kibana/driver.go b/pkg/controller/kibana/driver.go index 8714b21a70..b3196115b4 100644 --- a/pkg/controller/kibana/driver.go +++ b/pkg/controller/kibana/driver.go @@ -8,28 +8,28 @@ import ( "crypto/sha256" "fmt" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/settings" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - kbcerts "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/config" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/es" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - kbname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/pod" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/version/version6" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/version/version7" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "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/settings" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + kbcerts "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/config" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/es" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + kbname "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/pod" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/version/version6" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/version/version7" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/kibana/driver_test.go b/pkg/controller/kibana/driver_test.go index 021b055a0c..7949eedb8d 100644 --- a/pkg/controller/kibana/driver_test.go +++ b/pkg/controller/kibana/driver_test.go @@ -7,14 +7,14 @@ package kibana import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/go-test/deep" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/kibana/es/secret.go b/pkg/controller/kibana/es/secret.go index 5484b39682..41b1dcb5fd 100644 --- a/pkg/controller/kibana/es/secret.go +++ b/pkg/controller/kibana/es/secret.go @@ -8,9 +8,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) var eSCertsVolumeMountPath = "/usr/share/kibana/config/elasticsearch-certs" diff --git a/pkg/controller/kibana/kibana_controller.go b/pkg/controller/kibana/kibana_controller.go index fecf36cec0..4df0b000bd 100644 --- a/pkg/controller/kibana/kibana_controller.go +++ b/pkg/controller/kibana/kibana_controller.go @@ -9,17 +9,17 @@ import ( "sync/atomic" "time" - kibanav1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + kibanav1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/version" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "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/errors" diff --git a/pkg/controller/kibana/label/labels.go b/pkg/controller/kibana/label/labels.go index 50c11657d1..3eb9cb618c 100644 --- a/pkg/controller/kibana/label/labels.go +++ b/pkg/controller/kibana/label/labels.go @@ -4,7 +4,7 @@ package label -import "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" +import "github.com/elastic/cloud-on-k8s/pkg/controller/common" const ( // KibanaNameLabelName used to represent a Kibana in k8s resources diff --git a/pkg/controller/kibana/name/name.go b/pkg/controller/kibana/name/name.go index 35d0be62e0..0d3b175f31 100644 --- a/pkg/controller/kibana/name/name.go +++ b/pkg/controller/kibana/name/name.go @@ -5,7 +5,7 @@ package name import ( - common_name "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" + common_name "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" ) const ( diff --git a/pkg/controller/kibana/pod/pod.go b/pkg/controller/kibana/pod/pod.go index f397b15504..56eee7140e 100644 --- a/pkg/controller/kibana/pod/pod.go +++ b/pkg/controller/kibana/pod/pod.go @@ -5,13 +5,13 @@ package pod import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/pod" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/volume" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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/pod" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/volume" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/controller/kibana/pod/pod_test.go b/pkg/controller/kibana/pod/pod_test.go index fed76f7abd..6b09172848 100644 --- a/pkg/controller/kibana/pod/pod_test.go +++ b/pkg/controller/kibana/pod/pod_test.go @@ -7,9 +7,9 @@ package pod import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/keystore" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/kibana/services.go b/pkg/controller/kibana/services.go index 944f164914..669c7dec7b 100644 --- a/pkg/controller/kibana/services.go +++ b/pkg/controller/kibana/services.go @@ -7,11 +7,11 @@ package kibana import ( corev1 "k8s.io/api/core/v1" - kibanav1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/defaults" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - kbname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/pod" + kibanav1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + kbname "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/pod" ) func NewService(kb kibanav1alpha1.Kibana) *corev1.Service { diff --git a/pkg/controller/kibana/state.go b/pkg/controller/kibana/state.go index 072628d0a1..7dc911c250 100644 --- a/pkg/controller/kibana/state.go +++ b/pkg/controller/kibana/state.go @@ -5,7 +5,7 @@ package kibana import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controller/kibana/version/version6/settings.go b/pkg/controller/kibana/version/version6/settings.go index e8f97582d1..3a6c300732 100644 --- a/pkg/controller/kibana/version/version6/settings.go +++ b/pkg/controller/kibana/version/version6/settings.go @@ -5,8 +5,8 @@ package version6 import ( - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/config" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/config" ) // SettingsFactory returns Kibana settings for a 6.x Kibana. diff --git a/pkg/controller/kibana/version/version7/settings.go b/pkg/controller/kibana/version/version7/settings.go index 4b3abd61a4..39ffcdd24d 100644 --- a/pkg/controller/kibana/version/version7/settings.go +++ b/pkg/controller/kibana/version/version7/settings.go @@ -5,8 +5,8 @@ package version7 import ( - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/config" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/config" ) // SettingsFactory returns Kibana settings for a 7.x Kibana. diff --git a/pkg/controller/kibana/volume/volumes.go b/pkg/controller/kibana/volume/volumes.go index cc248fe142..ef801de631 100644 --- a/pkg/controller/kibana/volume/volumes.go +++ b/pkg/controller/kibana/volume/volumes.go @@ -5,7 +5,7 @@ package volume import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/volume" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" ) const ( diff --git a/pkg/controller/kibanaassociation/association_controller.go b/pkg/controller/kibanaassociation/association_controller.go index 49186939d4..fde630285c 100644 --- a/pkg/controller/kibanaassociation/association_controller.go +++ b/pkg/controller/kibanaassociation/association_controller.go @@ -9,21 +9,21 @@ import ( "sync/atomic" "time" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/association" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/services" - elasticsearchuser "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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/association" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/services" + elasticsearchuser "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/user" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "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" diff --git a/pkg/controller/kibanaassociation/association_controller_test.go b/pkg/controller/kibanaassociation/association_controller_test.go index d03b3f0af0..886c88918e 100644 --- a/pkg/controller/kibanaassociation/association_controller_test.go +++ b/pkg/controller/kibanaassociation/association_controller_test.go @@ -7,13 +7,13 @@ package kibanaassociation import ( "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" + "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" diff --git a/pkg/controller/kibanaassociation/ca.go b/pkg/controller/kibanaassociation/ca.go index 86ab94fc24..c28b8f03e6 100644 --- a/pkg/controller/kibanaassociation/ca.go +++ b/pkg/controller/kibanaassociation/ca.go @@ -7,13 +7,13 @@ package kibanaassociation import ( "reflect" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - kblabel "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + kblabel "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "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" diff --git a/pkg/controller/kibanaassociation/ca_test.go b/pkg/controller/kibanaassociation/ca_test.go index d159107c77..36647b0dcf 100644 --- a/pkg/controller/kibanaassociation/ca_test.go +++ b/pkg/controller/kibanaassociation/ca_test.go @@ -7,12 +7,12 @@ package kibanaassociation import ( "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "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" diff --git a/pkg/controller/kibanaassociation/labels.go b/pkg/controller/kibanaassociation/labels.go index 3698ae6000..64c67abfa4 100644 --- a/pkg/controller/kibanaassociation/labels.go +++ b/pkg/controller/kibanaassociation/labels.go @@ -5,9 +5,9 @@ package kibanaassociation import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/user" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/user" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/kibanaassociation/watch.go b/pkg/controller/kibanaassociation/watch.go index 5aeba6074a..ce2cfd82da 100644 --- a/pkg/controller/kibanaassociation/watch.go +++ b/pkg/controller/kibanaassociation/watch.go @@ -5,10 +5,10 @@ package kibanaassociation import ( - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/finalizer" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/watches" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/finalizer" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/watches" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/pkg/controller/license/license_controller.go b/pkg/controller/license/license_controller.go index 65440f8355..d7a9b4667b 100644 --- a/pkg/controller/license/license_controller.go +++ b/pkg/controller/license/license_controller.go @@ -11,14 +11,14 @@ import ( "sync/atomic" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/reconciler" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "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" diff --git a/pkg/controller/license/license_controller_integration_test.go b/pkg/controller/license/license_controller_integration_test.go index 93b6594040..75b0e86963 100644 --- a/pkg/controller/license/license_controller_integration_test.go +++ b/pkg/controller/license/license_controller_integration_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + esclient "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/chrono" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/controller/license/license_controller_test.go b/pkg/controller/license/license_controller_test.go index 0ca461b93f..3c7219466f 100644 --- a/pkg/controller/license/license_controller_test.go +++ b/pkg/controller/license/license_controller_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - commonlicense "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/chrono" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + commonlicense "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "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" diff --git a/pkg/controller/license/list.go b/pkg/controller/license/list.go index a3ceac0662..eed9bfaecf 100644 --- a/pkg/controller/license/list.go +++ b/pkg/controller/license/list.go @@ -5,8 +5,8 @@ package license import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "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" diff --git a/pkg/controller/license/list_test.go b/pkg/controller/license/list_test.go index 4fc45aba87..680bae1fe2 100644 --- a/pkg/controller/license/list_test.go +++ b/pkg/controller/license/list_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/license/trial/trial_controller.go b/pkg/controller/license/trial/trial_controller.go index 854949af5f..1d1fd2d2dd 100644 --- a/pkg/controller/license/trial/trial_controller.go +++ b/pkg/controller/license/trial/trial_controller.go @@ -12,11 +12,11 @@ import ( "sync/atomic" "time" - licensing "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/license/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - license_validation "github.com/elastic/cloud-on-k8s/operators/pkg/webhook/license" + 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/license/validation" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + license_validation "github.com/elastic/cloud-on-k8s/pkg/webhook/license" pkgerrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/license/trial/trial_controller_integration_test.go b/pkg/controller/license/trial/trial_controller_integration_test.go index f4058c8ba5..d4dc6c3135 100644 --- a/pkg/controller/license/trial/trial_controller_integration_test.go +++ b/pkg/controller/license/trial/trial_controller_integration_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/test" + "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/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/utils/test" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/controller/license/validation/validations.go b/pkg/controller/license/validation/validations.go index 5b72baadd8..16fe42706e 100644 --- a/pkg/controller/license/validation/validations.go +++ b/pkg/controller/license/validation/validations.go @@ -5,8 +5,8 @@ package validation import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/license/validation/validations_test.go b/pkg/controller/license/validation/validations_test.go index adb9524be2..0c0db45db1 100644 --- a/pkg/controller/license/validation/validations_test.go +++ b/pkg/controller/license/validation/validations_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" + "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/validation" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/dev/portforward/pod_forwarder.go b/pkg/dev/portforward/pod_forwarder.go index 03ddb1e38b..d747fe3e30 100644 --- a/pkg/dev/portforward/pod_forwarder.go +++ b/pkg/dev/portforward/pod_forwarder.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - utilsnet "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" + "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" diff --git a/pkg/utils/test/integration.go b/pkg/utils/test/integration.go index ba606d514c..02d6f614ec 100644 --- a/pkg/utils/test/integration.go +++ b/pkg/utils/test/integration.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/pkg/apis" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/stretchr/testify/require" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/utils/test/retry.go b/pkg/utils/test/retry.go index bc24d08286..2b0d968547 100644 --- a/pkg/utils/test/retry.go +++ b/pkg/utils/test/retry.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/retry" + "github.com/elastic/cloud-on-k8s/pkg/utils/retry" "github.com/stretchr/testify/require" ) diff --git a/pkg/webhook/add_validations.go b/pkg/webhook/add_validations.go index 8cec6af7f8..2ec5dac4ce 100644 --- a/pkg/webhook/add_validations.go +++ b/pkg/webhook/add_validations.go @@ -5,7 +5,7 @@ package webhook import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" ) func init() { diff --git a/pkg/webhook/elasticsearch/handler.go b/pkg/webhook/elasticsearch/handler.go index f29a209025..3ac45a1aa4 100644 --- a/pkg/webhook/elasticsearch/handler.go +++ b/pkg/webhook/elasticsearch/handler.go @@ -8,10 +8,10 @@ import ( "context" "net/http" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - commonvalidation "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + commonvalidation "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/validation" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "k8s.io/api/admission/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/webhook/elasticsearch/handler_test.go b/pkg/webhook/elasticsearch/handler_test.go index 74dc4f5ae6..42e2467357 100644 --- a/pkg/webhook/elasticsearch/handler_test.go +++ b/pkg/webhook/elasticsearch/handler_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" "github.com/stretchr/testify/assert" "k8s.io/api/admission/v1beta1" admissionv1beta1 "k8s.io/api/admission/v1beta1" diff --git a/pkg/webhook/license/handler.go b/pkg/webhook/license/handler.go index 04ab2a3814..068f03db83 100644 --- a/pkg/webhook/license/handler.go +++ b/pkg/webhook/license/handler.go @@ -8,9 +8,9 @@ import ( "context" "net/http" - commonvalidation "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/license/validation" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + commonvalidation "github.com/elastic/cloud-on-k8s/pkg/controller/common/validation" + "github.com/elastic/cloud-on-k8s/pkg/controller/license/validation" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/webhook/license/handler_test.go b/pkg/webhook/license/handler_test.go index 492023aefb..841cb6a67f 100644 --- a/pkg/webhook/license/handler_test.go +++ b/pkg/webhook/license/handler_test.go @@ -10,9 +10,9 @@ import ( "reflect" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/license/validation" + "github.com/elastic/cloud-on-k8s/pkg/apis" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/pkg/controller/license/validation" "github.com/pkg/errors" "github.com/stretchr/testify/require" "k8s.io/api/admission/v1beta1" diff --git a/pkg/webhook/server.go b/pkg/webhook/server.go index cbe1e77898..863d2b156e 100644 --- a/pkg/webhook/server.go +++ b/pkg/webhook/server.go @@ -7,9 +7,9 @@ package webhook import ( "context" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/webhook/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/pkg/webhook/license" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/webhook/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/webhook/license" admission "k8s.io/api/admissionregistration/v1beta1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go index a75f78e12f..90a2c0bc4c 100644 --- a/pkg/webhook/webhook.go +++ b/pkg/webhook/webhook.go @@ -5,8 +5,8 @@ package webhook import ( - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/operator" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/operator" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/test/e2e/apm/association_test.go b/test/e2e/apm/association_test.go index f6a399d680..71c8a3ff63 100644 --- a/test/e2e/apm/association_test.go +++ b/test/e2e/apm/association_test.go @@ -8,14 +8,14 @@ import ( "fmt" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/apmserver" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "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/apmserver" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" ) diff --git a/test/e2e/apm/configuration_test.go b/test/e2e/apm/configuration_test.go index ad9e51697d..fb80aa0018 100644 --- a/test/e2e/apm/configuration_test.go +++ b/test/e2e/apm/configuration_test.go @@ -8,14 +8,14 @@ import ( "fmt" "testing" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/services" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/apmserver" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "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/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/apmserver" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/pkg/errors" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" diff --git a/test/e2e/apm/sample_test.go b/test/e2e/apm/sample_test.go index 23366e5650..64a735bd01 100644 --- a/test/e2e/apm/sample_test.go +++ b/test/e2e/apm/sample_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/apmserver" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/apmserver" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/test/e2e/test/kibana" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/yaml" ) diff --git a/test/e2e/apm/standalone_test.go b/test/e2e/apm/standalone_test.go index bb313359e4..353206a59f 100644 --- a/test/e2e/apm/standalone_test.go +++ b/test/e2e/apm/standalone_test.go @@ -7,9 +7,9 @@ package apm import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/apmserver" + "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/apmserver" ) // TestApmStandalone runs a test suite on an APM server that is not outputting to Elasticsearch diff --git a/test/e2e/cmd/main.go b/test/e2e/cmd/main.go index 835e39289a..5cd7a30311 100644 --- a/test/e2e/cmd/main.go +++ b/test/e2e/cmd/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/cmd/run" + "github.com/elastic/cloud-on-k8s/test/e2e/cmd/run" "github.com/spf13/cobra" "github.com/spf13/viper" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" diff --git a/test/e2e/cmd/run/eventlog.go b/test/e2e/cmd/run/eventlog.go index 3b5bd60907..612ade55ca 100644 --- a/test/e2e/cmd/run/eventlog.go +++ b/test/e2e/cmd/run/eventlog.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "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" diff --git a/test/e2e/cmd/run/run.go b/test/e2e/cmd/run/run.go index 367820c73b..341fb6322e 100644 --- a/test/e2e/cmd/run/run.go +++ b/test/e2e/cmd/run/run.go @@ -17,8 +17,8 @@ import ( "time" "github.com/Masterminds/sprig" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/command" + "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" diff --git a/test/e2e/es/certs_test.go b/test/e2e/es/certs_test.go index e807fd25fd..d0c00bbbde 100644 --- a/test/e2e/es/certs_test.go +++ b/test/e2e/es/certs_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "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" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/es/failure_test.go b/test/e2e/es/failure_test.go index 2e5e9acb47..0b69ea86db 100644 --- a/test/e2e/es/failure_test.go +++ b/test/e2e/es/failure_test.go @@ -7,10 +7,10 @@ package es import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/es/keystore_test.go b/test/e2e/es/keystore_test.go index e7650f9cbd..42002beda1 100644 --- a/test/e2e/es/keystore_test.go +++ b/test/e2e/es/keystore_test.go @@ -7,10 +7,10 @@ package es import ( "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/es/license_test.go b/test/e2e/es/license_test.go index 9934223822..b56801ced2 100644 --- a/test/e2e/es/license_test.go +++ b/test/e2e/es/license_test.go @@ -8,9 +8,9 @@ import ( "io/ioutil" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/license" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/es/mutation_test.go b/test/e2e/es/mutation_test.go index 43ae5cf09d..ba0c753051 100644 --- a/test/e2e/es/mutation_test.go +++ b/test/e2e/es/mutation_test.go @@ -7,8 +7,8 @@ package es import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/test/e2e/es/podtemplate_test.go b/test/e2e/es/podtemplate_test.go index bf4c031c1c..59ec566a80 100644 --- a/test/e2e/es/podtemplate_test.go +++ b/test/e2e/es/podtemplate_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" "github.com/magiconair/properties/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/es/reversal_test.go b/test/e2e/es/reversal_test.go index 8f5cdba3fb..185023e8fb 100644 --- a/test/e2e/es/reversal_test.go +++ b/test/e2e/es/reversal_test.go @@ -7,10 +7,10 @@ package es import ( "testing" - common "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + common "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" ) func TestReversalIllegalConfig(t *testing.T) { diff --git a/test/e2e/es/volume_test.go b/test/e2e/es/volume_test.go index 6bbb42e880..3b65930a73 100644 --- a/test/e2e/es/volume_test.go +++ b/test/e2e/es/volume_test.go @@ -7,8 +7,8 @@ package es import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" ) // TestVolumeEmptyDir tests a manual override of the default persistent storage with emptyDir. diff --git a/test/e2e/kb/association_test.go b/test/e2e/kb/association_test.go index fc6834cad2..291a89d9d4 100644 --- a/test/e2e/kb/association_test.go +++ b/test/e2e/kb/association_test.go @@ -8,14 +8,14 @@ import ( "fmt" "testing" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/annotation" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/events" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/events" + "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" + "github.com/elastic/cloud-on-k8s/test/e2e/test/kibana" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" ) diff --git a/test/e2e/kb/failure_test.go b/test/e2e/kb/failure_test.go index 26a9c4a83c..ff8426ba0d 100644 --- a/test/e2e/kb/failure_test.go +++ b/test/e2e/kb/failure_test.go @@ -7,10 +7,10 @@ package kb import ( "testing" - kbname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + kbname "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "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/require" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/kb/keystore_test.go b/test/e2e/kb/keystore_test.go index 8db9afb7b2..fb05c1b6a6 100644 --- a/test/e2e/kb/keystore_test.go +++ b/test/e2e/kb/keystore_test.go @@ -7,11 +7,11 @@ package kb import ( "testing" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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" + "github.com/elastic/cloud-on-k8s/test/e2e/test/kibana" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/kb/resource_test.go b/test/e2e/kb/resource_test.go index 9597b8d6c2..0cc0af720e 100644 --- a/test/e2e/kb/resource_test.go +++ b/test/e2e/kb/resource_test.go @@ -7,9 +7,9 @@ package kb import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + "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/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/test/e2e/kb/sample_test.go b/test/e2e/kb/sample_test.go index 5d7f5e8c90..f5a8efa7ca 100644 --- a/test/e2e/kb/sample_test.go +++ b/test/e2e/kb/sample_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + "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" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/yaml" ) diff --git a/test/e2e/kb/telemetry_test.go b/test/e2e/kb/telemetry_test.go index 5e4e7a2aab..195cd17140 100644 --- a/test/e2e/kb/telemetry_test.go +++ b/test/e2e/kb/telemetry_test.go @@ -8,10 +8,10 @@ import ( "encoding/json" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/about" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + "github.com/elastic/cloud-on-k8s/pkg/about" + "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/require" ) diff --git a/test/e2e/smoke_test.go b/test/e2e/smoke_test.go index 6c9981a8f7..eb23162ebb 100644 --- a/test/e2e/smoke_test.go +++ b/test/e2e/smoke_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/apmserver" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/kibana" + "github.com/elastic/cloud-on-k8s/test/e2e/test" + "github.com/elastic/cloud-on-k8s/test/e2e/test/apmserver" + "github.com/elastic/cloud-on-k8s/test/e2e/test/elasticsearch" + "github.com/elastic/cloud-on-k8s/test/e2e/test/kibana" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/yaml" ) diff --git a/test/e2e/test/apmserver/builder.go b/test/e2e/test/apmserver/builder.go index 6fdc71b1e8..c74bbd16b1 100644 --- a/test/e2e/test/apmserver/builder.go +++ b/test/e2e/test/apmserver/builder.go @@ -5,9 +5,9 @@ package apmserver import ( - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "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/runtime" diff --git a/test/e2e/test/apmserver/checks_apm.go b/test/e2e/test/apmserver/checks_apm.go index c38030318d..50a126d537 100644 --- a/test/e2e/test/apmserver/checks_apm.go +++ b/test/e2e/test/apmserver/checks_apm.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test/elasticsearch" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/test/apmserver/checks_k8s.go b/test/e2e/test/apmserver/checks_k8s.go index c1cdec95f7..fca1e23459 100644 --- a/test/e2e/test/apmserver/checks_k8s.go +++ b/test/e2e/test/apmserver/checks_k8s.go @@ -7,7 +7,7 @@ package apmserver import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "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" diff --git a/test/e2e/test/apmserver/http_client.go b/test/e2e/test/apmserver/http_client.go index 64e478ab1a..e8458e81fd 100644 --- a/test/e2e/test/apmserver/http_client.go +++ b/test/e2e/test/apmserver/http_client.go @@ -15,12 +15,12 @@ import ( "strings" "time" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/config" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/config" + "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/stringsutil" + "github.com/elastic/cloud-on-k8s/test/e2e/test" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/test/e2e/test/apmserver/steps_creation.go b/test/e2e/test/apmserver/steps_creation.go index 12f92530a0..972cd98bd7 100644 --- a/test/e2e/test/apmserver/steps_creation.go +++ b/test/e2e/test/apmserver/steps_creation.go @@ -7,9 +7,9 @@ package apmserver import ( "testing" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/require" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) diff --git a/test/e2e/test/apmserver/steps_deletion.go b/test/e2e/test/apmserver/steps_deletion.go index 7044f18cc7..08a86b490b 100644 --- a/test/e2e/test/apmserver/steps_deletion.go +++ b/test/e2e/test/apmserver/steps_deletion.go @@ -7,8 +7,8 @@ package apmserver import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" "github.com/stretchr/testify/require" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/test/e2e/test/apmserver/steps_init.go b/test/e2e/test/apmserver/steps_init.go index 7c8e5d9575..a3afa949e3 100644 --- a/test/e2e/test/apmserver/steps_init.go +++ b/test/e2e/test/apmserver/steps_init.go @@ -7,8 +7,8 @@ package apmserver import ( "testing" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + "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" diff --git a/test/e2e/test/apmserver/steps_mutation.go b/test/e2e/test/apmserver/steps_mutation.go index 7e1f370f72..3f1b557466 100644 --- a/test/e2e/test/apmserver/steps_mutation.go +++ b/test/e2e/test/apmserver/steps_mutation.go @@ -4,7 +4,7 @@ package apmserver -import "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" +import "github.com/elastic/cloud-on-k8s/test/e2e/test" func (b Builder) MutationTestSteps(k *test.K8sClient) test.StepList { panic("not implemented") diff --git a/test/e2e/test/elasticsearch/builder.go b/test/e2e/test/elasticsearch/builder.go index 35f8dbf81d..02f41d7bec 100644 --- a/test/e2e/test/elasticsearch/builder.go +++ b/test/e2e/test/elasticsearch/builder.go @@ -5,11 +5,11 @@ package elasticsearch import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "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" diff --git a/test/e2e/test/elasticsearch/checks_data.go b/test/e2e/test/elasticsearch/checks_data.go index cc40063c9b..36e99d36e8 100644 --- a/test/e2e/test/elasticsearch/checks_data.go +++ b/test/e2e/test/elasticsearch/checks_data.go @@ -14,9 +14,9 @@ import ( "net/http" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/go-test/deep" ) diff --git a/test/e2e/test/elasticsearch/checks_es.go b/test/e2e/test/elasticsearch/checks_es.go index 04df4eac19..059748e8b7 100644 --- a/test/e2e/test/elasticsearch/checks_es.go +++ b/test/e2e/test/elasticsearch/checks_es.go @@ -10,10 +10,10 @@ import ( "strconv" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/client" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/resource" diff --git a/test/e2e/test/elasticsearch/checks_k8s.go b/test/e2e/test/elasticsearch/checks_k8s.go index d3ffbf4a7a..4c00c25839 100644 --- a/test/e2e/test/elasticsearch/checks_k8s.go +++ b/test/e2e/test/elasticsearch/checks_k8s.go @@ -7,12 +7,12 @@ package elasticsearch import ( "fmt" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" corev1 "k8s.io/api/core/v1" ) diff --git a/test/e2e/test/elasticsearch/checks_keystore.go b/test/e2e/test/elasticsearch/checks_keystore.go index b1274fdd83..5f035115f0 100644 --- a/test/e2e/test/elasticsearch/checks_keystore.go +++ b/test/e2e/test/elasticsearch/checks_keystore.go @@ -9,10 +9,10 @@ import ( "reflect" "strings" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/initcontainer" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" ) diff --git a/test/e2e/test/elasticsearch/checks_reversal.go b/test/e2e/test/elasticsearch/checks_reversal.go index d59be8c28b..14f0d1f09b 100644 --- a/test/e2e/test/elasticsearch/checks_reversal.go +++ b/test/e2e/test/elasticsearch/checks_reversal.go @@ -8,10 +8,10 @@ import ( "errors" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/sset" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" ) diff --git a/test/e2e/test/elasticsearch/checks_volume.go b/test/e2e/test/elasticsearch/checks_volume.go index 67b33ae95e..c497a0d025 100644 --- a/test/e2e/test/elasticsearch/checks_volume.go +++ b/test/e2e/test/elasticsearch/checks_volume.go @@ -7,9 +7,9 @@ package elasticsearch import ( "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/volume" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/test/elasticsearch/cluster_uuid.go b/test/e2e/test/elasticsearch/cluster_uuid.go index b5dc23a524..f13b34e771 100644 --- a/test/e2e/test/elasticsearch/cluster_uuid.go +++ b/test/e2e/test/elasticsearch/cluster_uuid.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/test/elasticsearch/http_client.go b/test/e2e/test/elasticsearch/http_client.go index 588b69b85b..87409b78c0 100644 --- a/test/e2e/test/elasticsearch/http_client.go +++ b/test/e2e/test/elasticsearch/http_client.go @@ -7,13 +7,13 @@ package elasticsearch import ( "fmt" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/version" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/dev/portforward" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/net" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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/pkg/controller/elasticsearch/name" + "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" + "github.com/elastic/cloud-on-k8s/pkg/utils/net" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) // NewElasticsearchClient returns an ES client for the given ES cluster diff --git a/test/e2e/test/elasticsearch/pause.go b/test/e2e/test/elasticsearch/pause.go index 295475f508..8f7a22de69 100644 --- a/test/e2e/test/elasticsearch/pause.go +++ b/test/e2e/test/elasticsearch/pause.go @@ -8,10 +8,10 @@ import ( "fmt" "strconv" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" ) func togglePauseOn(paused bool, es v1alpha1.Elasticsearch, k *test.K8sClient) test.Step { diff --git a/test/e2e/test/elasticsearch/steps_creation.go b/test/e2e/test/elasticsearch/steps_creation.go index 6e74c72ab3..cd6ff0db60 100644 --- a/test/e2e/test/elasticsearch/steps_creation.go +++ b/test/e2e/test/elasticsearch/steps_creation.go @@ -7,9 +7,9 @@ package elasticsearch import ( "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/require" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) diff --git a/test/e2e/test/elasticsearch/steps_deletion.go b/test/e2e/test/elasticsearch/steps_deletion.go index 258d239bc2..c69789a70b 100644 --- a/test/e2e/test/elasticsearch/steps_deletion.go +++ b/test/e2e/test/elasticsearch/steps_deletion.go @@ -15,9 +15,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "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 394392acd4..2048ccb46b 100644 --- a/test/e2e/test/elasticsearch/steps_init.go +++ b/test/e2e/test/elasticsearch/steps_init.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "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" diff --git a/test/e2e/test/elasticsearch/steps_license.go b/test/e2e/test/elasticsearch/steps_license.go index bee0820d75..301a4d1bd8 100644 --- a/test/e2e/test/elasticsearch/steps_license.go +++ b/test/e2e/test/elasticsearch/steps_license.go @@ -9,11 +9,11 @@ import ( "fmt" "testing" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/license" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/stringsutil" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + "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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/test/elasticsearch/steps_mutation.go b/test/e2e/test/elasticsearch/steps_mutation.go index e7c984d94f..09fb9bd7d7 100644 --- a/test/e2e/test/elasticsearch/steps_mutation.go +++ b/test/e2e/test/elasticsearch/steps_mutation.go @@ -10,10 +10,10 @@ import ( "testing" "time" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - esclient "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/client" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + 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" ) diff --git a/test/e2e/test/http_client.go b/test/e2e/test/http_client.go index 8fc709021f..de28675dbe 100644 --- a/test/e2e/test/http_client.go +++ b/test/e2e/test/http_client.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/dev/portforward" + "github.com/elastic/cloud-on-k8s/pkg/dev/portforward" ) // NewHTTPClient creates a new HTTP client that is aware of any port forwarding configuration. diff --git a/test/e2e/test/k8s_client.go b/test/e2e/test/k8s_client.go index ac1585da33..3377316946 100644 --- a/test/e2e/test/k8s_client.go +++ b/test/e2e/test/k8s_client.go @@ -10,20 +10,20 @@ import ( "fmt" "os" - apmtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/apm/v1alpha1" - assoctype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/associations/v1alpha1" - estype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/elasticsearch/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - apmlabels "github.com/elastic/cloud-on-k8s/operators/pkg/controller/apmserver/labels" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/certificates/http" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/common/name" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/certificates/transport" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/label" - esname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/elasticsearch/name" - kblabel "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/label" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" + apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1alpha1" + assoctype "github.com/elastic/cloud-on-k8s/pkg/apis/associations/v1alpha1" + estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + apmlabels "github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/labels" + "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/certificates/http" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/name" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/certificates/transport" + "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/label" + esname "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/name" + kblabel "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" diff --git a/test/e2e/test/kibana/builder.go b/test/e2e/test/kibana/builder.go index ba97b87a3d..514343a0f9 100644 --- a/test/e2e/test/kibana/builder.go +++ b/test/e2e/test/kibana/builder.go @@ -5,9 +5,9 @@ package kibana import ( - commonv1alpha1 "github.com/elastic/cloud-on-k8s/operators/pkg/apis/common/v1alpha1" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + commonv1alpha1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1alpha1" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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/runtime" diff --git a/test/e2e/test/kibana/checks_k8s.go b/test/e2e/test/kibana/checks_k8s.go index 4a65ed4f48..2c4611d601 100644 --- a/test/e2e/test/kibana/checks_k8s.go +++ b/test/e2e/test/kibana/checks_k8s.go @@ -7,8 +7,8 @@ package kibana import ( "fmt" - kbname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + kbname "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "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" diff --git a/test/e2e/test/kibana/checks_kb.go b/test/e2e/test/kibana/checks_kb.go index 46eb7bff67..fd2fb3230c 100644 --- a/test/e2e/test/kibana/checks_kb.go +++ b/test/e2e/test/kibana/checks_kb.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/test/kibana/http_client.go b/test/e2e/test/kibana/http_client.go index 5a81412262..50736faa95 100644 --- a/test/e2e/test/kibana/http_client.go +++ b/test/e2e/test/kibana/http_client.go @@ -13,10 +13,10 @@ import ( "net/url" "path" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - kbname "github.com/elastic/cloud-on-k8s/operators/pkg/controller/kibana/name" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + kbname "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/name" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" ) diff --git a/test/e2e/test/kibana/steps_creation.go b/test/e2e/test/kibana/steps_creation.go index e728e55e41..cd025059b8 100644 --- a/test/e2e/test/kibana/steps_creation.go +++ b/test/e2e/test/kibana/steps_creation.go @@ -7,9 +7,9 @@ package kibana import ( "testing" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/require" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // auth on gke ) diff --git a/test/e2e/test/kibana/steps_deletion.go b/test/e2e/test/kibana/steps_deletion.go index 782f3f3661..c1b8185ebe 100644 --- a/test/e2e/test/kibana/steps_deletion.go +++ b/test/e2e/test/kibana/steps_deletion.go @@ -7,8 +7,8 @@ package kibana import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/pkg/errors" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/meta" diff --git a/test/e2e/test/kibana/steps_init.go b/test/e2e/test/kibana/steps_init.go index 8d48530ce3..6a7442da83 100644 --- a/test/e2e/test/kibana/steps_init.go +++ b/test/e2e/test/kibana/steps_init.go @@ -7,8 +7,8 @@ package kibana import ( "testing" - kbtype "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + kbtype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "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" diff --git a/test/e2e/test/kibana/steps_mutation.go b/test/e2e/test/kibana/steps_mutation.go index d1e2420cd6..6561250418 100644 --- a/test/e2e/test/kibana/steps_mutation.go +++ b/test/e2e/test/kibana/steps_mutation.go @@ -7,9 +7,9 @@ package kibana import ( "testing" - "github.com/elastic/cloud-on-k8s/operators/pkg/apis/kibana/v1alpha1" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/test/e2e/test" + "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1alpha1" + "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" + "github.com/elastic/cloud-on-k8s/test/e2e/test" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/test/utils.go b/test/e2e/test/utils.go index d47ddf4817..0f6bf856e4 100644 --- a/test/e2e/test/utils.go +++ b/test/e2e/test/utils.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/k8s" - "github.com/elastic/cloud-on-k8s/operators/pkg/utils/retry" + "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" From 14560e7f94ba5576e3763ca5c4f7bd848725a8c0 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 10:37:24 -0500 Subject: [PATCH 6/8] Update dockerfile --- build/ci/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/ci/Dockerfile b/build/ci/Dockerfile index 400d302afb..ba7c4d3d61 100644 --- a/build/ci/Dockerfile +++ b/build/ci/Dockerfile @@ -51,12 +51,12 @@ RUN apt-get update && apt-get --no-install-recommends -y install \ RUN curl -sSL https://aka.ms/InstallAzureCLIDeb | bash # Add Go dependencies to Docker image -WORKDIR /go/src/github.com/elastic/cloud-on-k8s/operators -COPY operators/Gopkg.lock . -COPY operators/Gopkg.toml . +WORKDIR /go/src/github.com/elastic/cloud-on-k8s +COPY Gopkg.lock . +COPY Gopkg.toml . RUN dep ensure --vendor-only -v # Cleanup -RUN rm /go/src/github.com/elastic/cloud-on-k8s/operators/Gopkg.lock && \ - rm /go/src/github.com/elastic/cloud-on-k8s/operators/Gopkg.toml +RUN rm /go/src/github.com/elastic/cloud-on-k8s/Gopkg.lock && \ + rm /go/src/github.com/elastic/cloud-on-k8s/Gopkg.toml WORKDIR / From 793c212e19a53f13f8f092082dcf1255c54cacc6 Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 11:35:33 -0500 Subject: [PATCH 7/8] Remove other operators refs --- CONTRIBUTING.md | 29 ++++++++++--------- Dockerfile | 6 ++-- Makefile | 10 +++---- PROJECT | 2 +- build/ci/Makefile | 4 +-- build/ci/e2e/GKE_k8s_versions.jenkinsfile | 2 +- build/ci/e2e/Jenkinsfile-aks | 4 +-- .../ci/e2e/custom_operator_image.jenkinsfile | 2 +- build/ci/e2e/stack_versions.jenkinsfile | 2 +- build/ci/nightly/Jenkinsfile | 2 +- build/ci/pr/Jenkinsfile | 2 +- dev-setup.md | 2 +- docs/k8s-quickstart.asciidoc | 6 ++-- hack/deployer/README.md | 2 +- pkg/apis/apm/v1alpha1/doc.go | 2 +- pkg/apis/apm/v1alpha1/register.go | 2 +- pkg/apis/associations/v1alpha1/doc.go | 2 +- pkg/apis/associations/v1alpha1/register.go | 2 +- pkg/apis/common/v1alpha1/doc.go | 2 +- pkg/apis/common/v1alpha1/register.go | 2 +- pkg/apis/elasticsearch/v1alpha1/doc.go | 2 +- pkg/apis/elasticsearch/v1alpha1/register.go | 2 +- pkg/apis/kibana/v1alpha1/doc.go | 2 +- pkg/apis/kibana/v1alpha1/register.go | 2 +- test/e2e/Dockerfile | 2 +- test/e2e/cmd/run/command.go | 2 +- test/e2e/run.sh | 2 +- 27 files changed, 52 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6dc7bf4605..b4f7bcb2ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,17 +3,20 @@ Thank you for your interest in contributing to Elastic Cloud on Kubernetes! The goal of this document is to provide a high-level overview on how you can get involved. -- [Report your bugs](#bug-reports) -- [Set up your development environment](#development-environment) -- [Contribute with your code](#contributing-code) - - [Format your code and manage imports](#format-your-code-and-import-management) - - [Test suites](#test-suites) - - [Logging](#logging) - - [License Headers](#license-headers) -- [Submit your changes](#submitting-changes) - - [Sign the CLA](#sign-the-cla) - - [Prepare a Pull Request](#prepare-a-pull-request) -- [Design documents](#design-documents) +- [How to Contribute to Elastic Cloud on Kubernetes](#how-to-contribute-to-elastic-cloud-on-kubernetes) + - [Report your bugs](#report-your-bugs) + - [Set up your development environment](#set-up-your-development-environment) + - [Contribute with your code](#contribute-with-your-code) + - [Format your code and manage imports](#format-your-code-and-manage-imports) + - [Scripts](#scripts) + - [Tests](#tests) + - [Test suites](#test-suites) + - [Logging](#logging) + - [License headers](#license-headers) + - [Submit your changes](#submit-your-changes) + - [Sign the CLA](#sign-the-cla) + - [Prepare a Pull Request](#prepare-a-pull-request) + - [Design documents](#design-documents) ## Report your bugs @@ -21,7 +24,7 @@ If you find an issue, check first our [list of issues](https://github.com/elasti ## Set up your development environment -Check requirements and steps in this [guide](./operators/dev-setup.md). +Check requirements and steps in this [guide](dev-setup.md). ## Contribute with your code @@ -99,4 +102,4 @@ Here are some good practices for a good pull request: We keep track of architectural decisions through the [architectural decision records](https://adr.github.io/). All records must apply the [Markdown Architectural Decision Records](https://adr.github.io/madr/) format. We recommend to read [these documents](https://github.com/elastic/cloud-on-k8s/tree/master/docs/design) to understand the technical choices that we make. -Thank you for taking the time to contribute. \ No newline at end of file +Thank you for taking the time to contribute. diff --git a/Dockerfile b/Dockerfile index 9c7aed7bb0..efc1cf4cb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.11 as builder # Copy in the go src -WORKDIR /go/src/github.com/elastic/cloud-on-k8s/operators +WORKDIR /go/src/github.com/elastic/cloud-on-k8s COPY pkg/ pkg/ COPY cmd/ cmd/ COPY vendor/ vendor/ @@ -14,7 +14,7 @@ ARG GO_TAGS RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \ go build \ -ldflags "$GO_LDFLAGS" -tags="$GO_TAGS" -a \ - -o elastic-operator github.com/elastic/cloud-on-k8s/operators/cmd + -o elastic-operator github.com/elastic/cloud-on-k8s/cmd # Copy the controller-manager into a thin image FROM centos:7 @@ -27,6 +27,6 @@ RUN set -x \ WORKDIR /eck USER 101 -COPY --from=builder /go/src/github.com/elastic/cloud-on-k8s/operators/elastic-operator . +COPY --from=builder /go/src/github.com/elastic/cloud-on-k8s/elastic-operator . ENTRYPOINT ["./elastic-operator"] CMD ["manager"] diff --git a/Makefile b/Makefile index bc30872ca9..e65ea7ea13 100644 --- a/Makefile +++ b/Makefile @@ -48,10 +48,10 @@ endif OPERATOR_IMAGE ?= $(IMG):$(VERSION)-$(TAG) -GO_LDFLAGS := -X github.com/elastic/cloud-on-k8s/operators/pkg/about.version=$(VERSION) \ - -X github.com/elastic/cloud-on-k8s/operators/pkg/about.buildHash=$(TAG) \ - -X github.com/elastic/cloud-on-k8s/operators/pkg/about.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ - -X github.com/elastic/cloud-on-k8s/operators/pkg/about.buildSnapshot=$(SNAPSHOT) +GO_LDFLAGS := -X github.com/elastic/cloud-on-k8s/pkg/about.version=$(VERSION) \ + -X github.com/elastic/cloud-on-k8s/pkg/about.buildHash=$(TAG) \ + -X github.com/elastic/cloud-on-k8s/pkg/about.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ + -X github.com/elastic/cloud-on-k8s/pkg/about.buildSnapshot=$(SNAPSHOT) # Setting for CI, if set to true will prevent building and using local Docker image SKIP_DOCKER_COMMAND ?= false @@ -93,7 +93,7 @@ generate: $(MAKE) --no-print-directory generate-all-in-one elastic-operator: generate - go build -ldflags "$(GO_LDFLAGS)" -tags='$(GO_TAGS)' -o bin/elastic-operator github.com/elastic/cloud-on-k8s/operators/cmd + go build -ldflags "$(GO_LDFLAGS)" -tags='$(GO_TAGS)' -o bin/elastic-operator github.com/elastic/cloud-on-k8s/cmd fmt: goimports -w pkg cmd diff --git a/PROJECT b/PROJECT index f8aa5e18cf..e4a0f8d88e 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,3 @@ version: "1" domain: k8s.elastic.co -repo: github.com/elastic/cloud-on-k8s/operators +repo: github.com/elastic/cloud-on-k8s diff --git a/build/ci/Makefile b/build/ci/Makefile index 8fcb5ac991..7cdd5f28f6 100644 --- a/build/ci/Makefile +++ b/build/ci/Makefile @@ -7,7 +7,7 @@ ROOT_DIR = $(CURDIR)/../.. GO_MOUNT_PATH ?= /go/src/github.com/elastic/cloud-on-k8s -CI_IMAGE ?= docker.elastic.co/eck/eck-ci:$(shell md5sum $(ROOT_DIR)/operators/Gopkg.lock $(ROOT_DIR)/build/ci/Dockerfile | awk '{print $$1}' | md5sum | awk '{print $$1}') +CI_IMAGE ?= docker.elastic.co/eck/eck-ci:$(shell md5sum $(ROOT_DIR)/Gopkg.lock $(ROOT_DIR)/build/ci/Dockerfile | awk '{print $$1}' | md5sum | awk '{print $$1}') VAULT_GKE_CREDS_SECRET ?= secret/cloud-team/cloud-ci/ci-gcp-k8s-operator GKE_CREDS_FILE ?= credentials.json @@ -109,7 +109,7 @@ yaml-upload: vault-aws-creds -e "AWS_ACCESS_KEY_ID=$(shell cat $(VAULT_AWS_ACCESS_KEY_FILE))" \ -e "AWS_SECRET_ACCESS_KEY=$(shell cat $(VAULT_AWS_SECRET_KEY_FILE))" \ $(CI_IMAGE) \ - bash -c "aws s3 cp $(GO_MOUNT_PATH)/operators/config/all-in-one.yaml \ + bash -c "aws s3 cp $(GO_MOUNT_PATH)/config/all-in-one.yaml \ s3://download.elasticsearch.org/downloads/eck/$(TAG_NAME)/all-in-one.yaml" ## -- End-to-end tests job diff --git a/build/ci/e2e/GKE_k8s_versions.jenkinsfile b/build/ci/e2e/GKE_k8s_versions.jenkinsfile index 3e2dda5f24..f4dafa88cd 100644 --- a/build/ci/e2e/GKE_k8s_versions.jenkinsfile +++ b/build/ci/e2e/GKE_k8s_versions.jenkinsfile @@ -83,7 +83,7 @@ pipeline { void createRunConfig(clusterVersion, clusterName) { sh """ - cat >operators/run-config.yml <run-config.yml <operators/run-config.yml <run-config.yml <operators/run-config.yml <run-config.yml <operators/run-config.yml <run-config.yml <operators/run-config.yml <run-config.yml < eck_image.txt diff --git a/build/ci/pr/Jenkinsfile b/build/ci/pr/Jenkinsfile index b6c1804817..0952b31a28 100644 --- a/build/ci/pr/Jenkinsfile +++ b/build/ci/pr/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { } steps { sh """ - cat >operators/run-config.yml <run-config.yml <>> Running tests in package $PKG" go test -v -failfast -timeout=2h -tags=e2e -p=1 $PKG $@ done From f79ca50f697e7c136eab4a5d668911f9bd56313b Mon Sep 17 00:00:00 2001 From: Anya Sabo Date: Thu, 22 Aug 2019 16:43:49 -0500 Subject: [PATCH 8/8] Update CI make --- build/ci/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/ci/Makefile b/build/ci/Makefile index 7cdd5f28f6..eeba0d8d43 100644 --- a/build/ci/Makefile +++ b/build/ci/Makefile @@ -82,7 +82,7 @@ ci-pr: check-license-header --net=host \ $(CI_IMAGE) \ bash -c \ - "make -C operators ci" + "make ci" ## -- Release job @@ -99,7 +99,7 @@ ci-release: vault-public-key vault-docker-creds -e "VERSION=$(VERSION)" \ -e "SNAPSHOT=$(SNAPSHOT)" \ $(CI_IMAGE) \ - bash -c "make -C operators ci-release" + bash -c "make ci-release" # Will be uploaded to https://download.elastic.co/downloads/eck/$TAG_NAME/all-in-one.yaml yaml-upload: vault-aws-creds @@ -128,7 +128,7 @@ ci-e2e: -e "OPERATOR_IMAGE=$(OPERATOR_IMAGE)" \ -e "STACK_VERSION=$(STACK_VERSION)" \ $(CI_IMAGE) \ - bash -c "make -C operators ci-e2e" + bash -c "make ci-e2e" ci-run-deployer: @ docker run --rm -t \ @@ -137,7 +137,7 @@ ci-run-deployer: -w $(GO_MOUNT_PATH) \ -e "GCLOUD_PROJECT=$(GCLOUD_PROJECT)" \ $(CI_IMAGE) \ - bash -c "make -C operators run-deployer" + bash -c "make run-deployer" # Check if Docker image exists by trying to pull it. If there is no image, then build and push it. ci-build-image: vault-docker-creds