elastic · pebrc · Aug 23, 2019 · Aug 22, 2019 · Aug 22, 2019 · Aug 22, 2019
diff --git 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
diff --git a/operators/.golangci.yml → .golangci.yml b/operators/.golangci.yml → .golangci.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,25 +3,28 @@
 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
 
 If you find an issue, check first our [list of issues](https://github.com/elastic/cloud-on-k8s/issues). If your problem has not been reported yet, open a new issue, add a detailed description on how to reproduce the problem and complete it with any additional information that might help solving the issue.
 
 ## 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.
+Thank you for taking the time to contribute.
diff --git a/operators/Dockerfile → Dockerfile b/operators/Dockerfile → 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/operators/Gopkg.lock → Gopkg.lock b/operators/Gopkg.lock → Gopkg.lock
diff --git a/operators/Gopkg.toml → Gopkg.toml b/operators/Gopkg.toml → Gopkg.toml
diff --git a/operators/Makefile → Makefile b/operators/Makefile → 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
@@ -0,0 +1,3 @@
+version: "1"
+domain: k8s.elastic.co
+repo: github.com/elastic/cloud-on-k8s
diff --git 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 → VERSION b/operators/VERSION → VERSION
diff --git 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 /
diff --git 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
@@ -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
@@ -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
@@ -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

diff --git 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 <<EOF
+        cat >run-config.yml <<EOF
 id: gke-ci
 overrides:
   operation: create

diff --git a/build/ci/e2e/Jenkinsfile-aks b/build/ci/e2e/Jenkinsfile-aks
@@ -27,7 +27,7 @@ pipeline {
         stage("Run E2E tests") {
             steps {
                 sh """
-                    cat >operators/run-config.yml <<EOF
+                    cat >run-config.yml <<EOF
 id: aks-ci
 overrides:
   kubernetesVersion: "$CLUSTER_VERSION"
@@ -47,7 +47,7 @@ EOF
         cleanup {
             script {
                 sh """
-                    cat >operators/run-config.yml <<EOF
+                    cat >run-config.yml <<EOF
 id: aks-ci
 overrides:
   operation: delete

diff --git a/build/ci/e2e/custom_operator_image.jenkinsfile b/build/ci/e2e/custom_operator_image.jenkinsfile
@@ -30,7 +30,7 @@ pipeline {
         stage("Run E2E tests") {
             steps {
                 sh """
-                    cat >operators/run-config.yml <<EOF
+                    cat >run-config.yml <<EOF
 id: gke-ci
 overrides:
   kubernetesVersion: "$CLUSTER_VERSION"

diff --git a/build/ci/e2e/stack_versions.jenkinsfile b/build/ci/e2e/stack_versions.jenkinsfile
@@ -103,7 +103,7 @@ pipeline {
 
 def createRunConfig(clusterName) {
     sh """
-        cat >operators/run-config.yml <<EOF
+        cat >run-config.yml <<EOF
 id: gke-ci
 overrides:
   operation: create

diff --git a/build/ci/nightly/Jenkinsfile b/build/ci/nightly/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
         stage('Build and push Docker image') {
             steps {
                 sh """
-                    export VERSION=\$(cat $WORKSPACE/operators/VERSION)-\$(date +%F)-\$(git rev-parse --short --verify HEAD)
+                    export VERSION=\$(cat $WORKSPACE/VERSION)-\$(date +%F)-\$(git rev-parse --short --verify HEAD)
                     export OPERATOR_IMAGE=${REGISTRY}/${REPOSITORY}/${IMG_NAME}:\$VERSION
                     export LATEST_RELEASED_IMG=docker.elastic.co/${REPOSITORY}/${IMG_NAME}:\$VERSION
                     echo \$LATEST_RELEASED_IMG > eck_image.txt

diff --git a/build/ci/pr/Jenkinsfile b/build/ci/pr/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
                     }
                     steps {
                         sh """
-                            cat >operators/run-config.yml <<EOF
+                            cat >run-config.yml <<EOF
 id: gke-ci
 overrides:
   kubernetesVersion: "$CLUSTER_VERSION"

diff --git a/operators/cmd/license-initializer/main.go → cmd/license-initializer/main.go b/operators/cmd/license-initializer/main.go → cmd/license-initializer/main.go
diff --git a/...tors/cmd/license-initializer/main_test.go → cmd/license-initializer/main_test.go b/...tors/cmd/license-initializer/main_test.go → cmd/license-initializer/main_test.go
diff --git a/...license-initializer/testdata/expected.src → ...license-initializer/testdata/expected.src b/...license-initializer/testdata/expected.src → ...license-initializer/testdata/expected.src
diff --git a/...cmd/license-initializer/testdata/test.key → cmd/license-initializer/testdata/test.key b/...cmd/license-initializer/testdata/test.key → cmd/license-initializer/testdata/test.key
diff --git a/operators/cmd/main.go → cmd/main.go b/operators/cmd/main.go → 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/operators/cmd/manager/main.go → cmd/manager/main.go b/operators/cmd/manager/main.go → 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/...s/config/crds/apm_v1alpha1_apmserver.yaml → config/crds/apm_v1alpha1_apmserver.yaml b/...s/config/crds/apm_v1alpha1_apmserver.yaml → config/crds/apm_v1alpha1_apmserver.yaml
diff --git a/...elasticsearch_v1alpha1_elasticsearch.yaml → ...elasticsearch_v1alpha1_elasticsearch.yaml b/...elasticsearch_v1alpha1_elasticsearch.yaml → ...elasticsearch_v1alpha1_elasticsearch.yaml
diff --git a/...s/config/crds/kibana_v1alpha1_kibana.yaml → config/crds/kibana_v1alpha1_kibana.yaml b/...s/config/crds/kibana_v1alpha1_kibana.yaml → config/crds/kibana_v1alpha1_kibana.yaml
diff --git a/operators/config/dev/elastic-psp.yaml → config/dev/elastic-psp.yaml b/operators/config/dev/elastic-psp.yaml → config/dev/elastic-psp.yaml
diff --git a/...ators/config/dev/gke-default-storage.yaml → config/dev/gke-default-storage.yaml b/...ators/config/dev/gke-default-storage.yaml → config/dev/gke-default-storage.yaml
diff --git a/operators/config/dev/registry.yaml → config/dev/registry.yaml b/operators/config/dev/registry.yaml → config/dev/registry.yaml
diff --git a/operators/config/e2e/batch_job.yaml → config/e2e/batch_job.yaml b/operators/config/e2e/batch_job.yaml → config/e2e/batch_job.yaml
diff --git a/operators/config/e2e/global_operator.yaml → config/e2e/global_operator.yaml b/operators/config/e2e/global_operator.yaml → config/e2e/global_operator.yaml
diff --git a/operators/config/e2e/managed_namespaces.yaml → config/e2e/managed_namespaces.yaml b/operators/config/e2e/managed_namespaces.yaml → config/e2e/managed_namespaces.yaml
diff --git a/operators/config/e2e/namespace_operator.yaml → config/e2e/namespace_operator.yaml b/operators/config/e2e/namespace_operator.yaml → config/e2e/namespace_operator.yaml
diff --git a/...ators/config/e2e/operator_namespaces.yaml → config/e2e/operator_namespaces.yaml b/...ators/config/e2e/operator_namespaces.yaml → config/e2e/operator_namespaces.yaml
diff --git a/operators/config/e2e/rbac.yaml → config/e2e/rbac.yaml b/operators/config/e2e/rbac.yaml → config/e2e/rbac.yaml
diff --git a/operators/config/operator/Makefile → config/operator/Makefile b/operators/config/operator/Makefile → config/operator/Makefile
diff --git a/operators/config/operator/README.md → config/operator/README.md b/operators/config/operator/README.md → config/operator/README.md
diff --git a/...tor/all-in-one/cluster_role.template.yaml → ...tor/all-in-one/cluster_role.template.yaml b/...tor/all-in-one/cluster_role.template.yaml → ...tor/all-in-one/cluster_role.template.yaml
diff --git a/...n-one/cluster_role_bindings.template.yaml → ...n-one/cluster_role_bindings.template.yaml b/...n-one/cluster_role_bindings.template.yaml → ...n-one/cluster_role_bindings.template.yaml
diff --git a/...erator/all-in-one/namespace.template.yaml → ...erator/all-in-one/namespace.template.yaml b/...erator/all-in-one/namespace.template.yaml → ...erator/all-in-one/namespace.template.yaml
diff --git a/...perator/all-in-one/operator.template.yaml → ...perator/all-in-one/operator.template.yaml b/...perator/all-in-one/operator.template.yaml → ...perator/all-in-one/operator.template.yaml
diff --git a/.../all-in-one/service_account.template.yaml → .../all-in-one/service_account.template.yaml b/.../all-in-one/service_account.template.yaml → .../all-in-one/service_account.template.yaml
diff --git a/...perator/global/cluster_role.template.yaml → ...perator/global/cluster_role.template.yaml b/...perator/global/cluster_role.template.yaml → ...perator/global/cluster_role.template.yaml
diff --git a/...lobal/cluster_role_bindings.template.yaml → ...lobal/cluster_role_bindings.template.yaml b/...lobal/cluster_role_bindings.template.yaml → ...lobal/cluster_role_bindings.template.yaml
diff --git a/...g/operator/global/namespace.template.yaml → ...g/operator/global/namespace.template.yaml b/...g/operator/global/namespace.template.yaml → ...g/operator/global/namespace.template.yaml
diff --git a/...ig/operator/global/operator.template.yaml → ...ig/operator/global/operator.template.yaml b/...ig/operator/global/operator.template.yaml → ...ig/operator/global/operator.template.yaml
diff --git a/...ator/global/service_account.template.yaml → ...ator/global/service_account.template.yaml b/...ator/global/service_account.template.yaml → ...ator/global/service_account.template.yaml
diff --git a/...ator/namespace/cluster_role.template.yaml → ...ator/namespace/cluster_role.template.yaml b/...ator/namespace/cluster_role.template.yaml → ...ator/namespace/cluster_role.template.yaml
diff --git a/...perator/namespace/namespace.template.yaml → ...perator/namespace/namespace.template.yaml b/...perator/namespace/namespace.template.yaml → ...perator/namespace/namespace.template.yaml
diff --git a/...operator/namespace/operator.template.yaml → ...operator/namespace/operator.template.yaml b/...operator/namespace/operator.template.yaml → ...operator/namespace/operator.template.yaml
diff --git a/...tor/namespace/role_bindings.template.yaml → ...tor/namespace/role_bindings.template.yaml b/...tor/namespace/role_bindings.template.yaml → ...tor/namespace/role_bindings.template.yaml
diff --git a/...r/namespace/service_account.template.yaml → ...r/namespace/service_account.template.yaml b/...r/namespace/service_account.template.yaml → ...r/namespace/service_account.template.yaml
diff --git a/...ors/config/samples/apm/apm_es_kibana.yaml → config/samples/apm/apm_es_kibana.yaml b/...ors/config/samples/apm/apm_es_kibana.yaml → config/samples/apm/apm_es_kibana.yaml
diff --git a/operators/config/samples/apm/apmserver.yaml → config/samples/apm/apmserver.yaml b/operators/config/samples/apm/apmserver.yaml → config/samples/apm/apmserver.yaml
diff --git a/.../samples/elasticsearch/elasticsearch.yaml → .../samples/elasticsearch/elasticsearch.yaml b/.../samples/elasticsearch/elasticsearch.yaml → .../samples/elasticsearch/elasticsearch.yaml
diff --git a/operators/config/samples/kibana/kibana.yaml → config/samples/kibana/kibana.yaml b/operators/config/samples/kibana/kibana.yaml → config/samples/kibana/kibana.yaml
diff --git a/...tors/config/samples/kibana/kibana_es.yaml → config/samples/kibana/kibana_es.yaml b/...tors/config/samples/kibana/kibana_es.yaml → config/samples/kibana/kibana_es.yaml
diff --git a/operators/dev-setup.md → dev-setup.md b/operators/dev-setup.md → dev-setup.md
@@ -21,7 +21,7 @@ Before you start, install the following tools and packages:
 
 ```bash
 go get -u github.com/elastic/cloud-on-k8s
-cd ${GOPATH:-$HOME/go}/src/github.com/elastic/cloud-on-k8s/operators
+cd ${GOPATH:-$HOME/go}/src/github.com/elastic/cloud-on-k8s
 ```
 
 ### Check prerequisites

diff --git a/docs/k8s-quickstart.asciidoc b/docs/k8s-quickstart.asciidoc
@@ -300,10 +300,10 @@ To aim for the best performance, the operator supports persistent volumes local
 [id="{p}-check-samples"]
 === Check out the samples
 
-You can find a set of sample resources link:https://github.com/elastic/cloud-on-k8s/tree/master/operators/config/samples[in the project repository].
-To customize the Elasticsearch resource, check the link:https://github.com/elastic/cloud-on-k8s/blob/master/operators/config/samples/elasticsearch/elasticsearch.yaml[Elasticsearch sample].
+You can find a set of sample resources link:https://github.com/elastic/cloud-on-k8s/tree/master/config/samples[in the project repository].
+To customize the Elasticsearch resource, check the link:https://github.com/elastic/cloud-on-k8s/blob/master/config/samples/elasticsearch/elasticsearch.yaml[Elasticsearch sample].
 
-For a full description of each `CustomResourceDefinition`, go to link:https://github.com/elastic/cloud-on-k8s/tree/master/operators/config/crds[the project repository].
+For a full description of each `CustomResourceDefinition`, go to link:https://github.com/elastic/cloud-on-k8s/tree/master/config/crds[the project repository].
 You can also retrieve it from the cluster. For example, describe the Elasticsearch CRD specification with:
 
 [source,sh]

diff --git a/operators/hack/boilerplate.go.txt → hack/boilerplate.go.txt b/operators/hack/boilerplate.go.txt → hack/boilerplate.go.txt
diff --git a/operators/hack/check-requisites.sh → hack/check-requisites.sh b/operators/hack/check-requisites.sh → hack/check-requisites.sh
diff --git a/operators/hack/deployer/README.md → hack/deployer/README.md b/operators/hack/deployer/README.md → hack/deployer/README.md
@@ -11,7 +11,7 @@ Default values for settings are kept in config/plans.yml file. More settings and
 While in:
 ```
 $ pwd
-/go/src/github.com/elastic/cloud-on-k8s/operators
+/go/src/github.com/elastic/cloud-on-k8s
 ```
 
 Run once with your GCLOUD_PROJECT:

diff --git a/operators/hack/deployer/cmd/create.go → hack/deployer/cmd/create.go b/operators/hack/deployer/cmd/create.go → hack/deployer/cmd/create.go
diff --git a/operators/hack/deployer/cmd/execute.go → hack/deployer/cmd/execute.go b/operators/hack/deployer/cmd/execute.go → 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/operators/hack/deployer/cmd/get.go → hack/deployer/cmd/get.go b/operators/hack/deployer/cmd/get.go → 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/operators/hack/deployer/cmd/root.go → hack/deployer/cmd/root.go b/operators/hack/deployer/cmd/root.go → hack/deployer/cmd/root.go
diff --git a/operators/hack/deployer/config/plans.yml → hack/deployer/config/plans.yml b/operators/hack/deployer/config/plans.yml → hack/deployer/config/plans.yml
diff --git a/operators/hack/deployer/main.go → hack/deployer/main.go b/operators/hack/deployer/main.go → 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/hack/deployer/runner/aks.go → hack/deployer/runner/aks.go b/operators/hack/deployer/runner/aks.go → hack/deployer/runner/aks.go
diff --git a/operators/hack/deployer/runner/command.go → hack/deployer/runner/command.go b/operators/hack/deployer/runner/command.go → hack/deployer/runner/command.go
diff --git a/operators/hack/deployer/runner/driver.go → hack/deployer/runner/driver.go b/operators/hack/deployer/runner/driver.go → hack/deployer/runner/driver.go
diff --git a/operators/hack/deployer/runner/gke.go → hack/deployer/runner/gke.go b/operators/hack/deployer/runner/gke.go → hack/deployer/runner/gke.go
diff --git a/operators/hack/deployer/runner/settings.go → hack/deployer/runner/settings.go b/operators/hack/deployer/runner/settings.go → hack/deployer/runner/settings.go
diff --git a/operators/hack/deployer/runner/vault.go → hack/deployer/runner/vault.go b/operators/hack/deployer/runner/vault.go → hack/deployer/runner/vault.go
diff --git a/operators/hack/eck-dump.sh → hack/eck-dump.sh b/operators/hack/eck-dump.sh → hack/eck-dump.sh
diff --git a/operators/hack/minikube-cluster.sh → hack/minikube-cluster.sh b/operators/hack/minikube-cluster.sh → hack/minikube-cluster.sh
diff --git a/operators/hack/registry.sh → hack/registry.sh b/operators/hack/registry.sh → hack/registry.sh
diff --git a/operators/hack/release_notes.go → hack/release_notes.go b/operators/hack/release_notes.go → hack/release_notes.go
diff --git a/operators/hack/release_notes_test.go → hack/release_notes_test.go b/operators/hack/release_notes_test.go → hack/release_notes_test.go
diff --git a/operators/hack/update-doc-stack-version.sh → hack/update-doc-stack-version.sh b/operators/hack/update-doc-stack-version.sh → hack/update-doc-stack-version.sh
diff --git a/operators/PROJECT b/operators/PROJECT
diff --git a/operators/README.md b/operators/README.md
diff --git a/operators/pkg/about/base.go → pkg/about/base.go b/operators/pkg/about/base.go → pkg/about/base.go
diff --git a/operators/pkg/about/info.go → pkg/about/info.go b/operators/pkg/about/info.go → pkg/about/info.go
diff --git a/operators/pkg/about/info_test.go → pkg/about/info_test.go b/operators/pkg/about/info_test.go → pkg/about/info_test.go
diff --git a/...tors/pkg/apis/addtoscheme_apm_v1alpha1.go → pkg/apis/addtoscheme_apm_v1alpha1.go b/...tors/pkg/apis/addtoscheme_apm_v1alpha1.go → 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/...apis/addtoscheme_associations_v1alpha1.go → ...apis/addtoscheme_associations_v1alpha1.go b/...apis/addtoscheme_associations_v1alpha1.go → ...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/...s/pkg/apis/addtoscheme_common_v1alpha1.go → pkg/apis/addtoscheme_common_v1alpha1.go b/...s/pkg/apis/addtoscheme_common_v1alpha1.go → 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() {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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).