-
Follow the steps in the installation guide to learn how to install the Operator SDK CLI tool. If you are using a release version of the SDK, make sure to follow the documentation for that version. You make use any of the following installation processes:
+
Follow the steps in the installation guide to learn how to install the Operator SDK CLI tool. If you are using a release version of the SDK, make sure to follow the documentation for that version. You make use any of the following installation processes:
- Install the Homebrew (macOS)
- Install from GitHub release
- Compile and install from master
+ Install the Homebrew (macOS)
+ Install from GitHub release
+ Compile and install from master
Learn More
@@ -44,19 +44,19 @@ Installing the SDK CLI
READ THE USER GUIDES
Operators can be created with the SDK using Ansible, Helm, or Go. Follow the one of the quickstart guides to dive in.
-
+
Ansible Quickstart
-
+
Helm Quickstart
-
+
Go Quickstart
@@ -80,7 +80,7 @@ PUBLISH YOUR OPERATOR
LEVEL UP YOUR OPERATOR
Learn about operator maturity and the requirements to approach full auto
pilot.
- Learn More
+ Learn More
+ Building operators using Operator SDK.
+---
\ No newline at end of file
diff --git a/website/content/en/docs/ansible/OWNERS b/website/content/en/docs/building-operators/ansible/OWNERS
similarity index 100%
rename from website/content/en/docs/ansible/OWNERS
rename to website/content/en/docs/building-operators/ansible/OWNERS
diff --git a/website/content/en/docs/ansible/_index.md b/website/content/en/docs/building-operators/ansible/_index.md
similarity index 55%
rename from website/content/en/docs/ansible/_index.md
rename to website/content/en/docs/building-operators/ansible/_index.md
index 5a2b4f7670..ac48585e0e 100644
--- a/website/content/en/docs/ansible/_index.md
+++ b/website/content/en/docs/building-operators/ansible/_index.md
@@ -1,6 +1,7 @@
---
-title: Ansible Based Operators
-weight: 20
+title: Ansible
+weight: 1
+description: Guide to building a Ansible Based Operator using Operator SDK
---
Ansible based operators run playbooks and roles to react to changes in tracked Kubernetes resources (usually CRs).
diff --git a/website/content/en/docs/ansible/development-tips.md b/website/content/en/docs/building-operators/ansible/development-tips.md
similarity index 99%
rename from website/content/en/docs/ansible/development-tips.md
rename to website/content/en/docs/building-operators/ansible/development-tips.md
index 7288509d99..8743144ea1 100644
--- a/website/content/en/docs/ansible/development-tips.md
+++ b/website/content/en/docs/building-operators/ansible/development-tips.md
@@ -509,4 +509,4 @@ operator. The `meta` fields can be accesses via dot notation in Ansible as so:
[manage_status_proposal]:../../proposals/ansible-operator-status.md
[time_pkg]:https://golang.org/pkg/time/
[time_parse_duration]:https://golang.org/pkg/time/#ParseDuration
-[watches]:/docs/ansible/reference/watches
\ No newline at end of file
+[watches]:/docs/building-operators/ansible/reference/watches
\ No newline at end of file
diff --git a/website/content/en/docs/ansible/installation.md b/website/content/en/docs/building-operators/ansible/installation.md
similarity index 93%
rename from website/content/en/docs/ansible/installation.md
rename to website/content/en/docs/building-operators/ansible/installation.md
index 4962014330..03a2ff5cae 100644
--- a/website/content/en/docs/ansible/installation.md
+++ b/website/content/en/docs/building-operators/ansible/installation.md
@@ -19,6 +19,6 @@ local Kubernetes cluster and [quay.io][quay-link] for the public registry.
[ansible-tool]:https://docs.ansible.com/ansible/latest/index.html
[ansible-runner-tool]:https://ansible-runner.readthedocs.io/en/latest/install.html
[ansible-runner-http-plugin]:https://github.com/ansible/ansible-runner-http
-[install-guide]: /docs/install-operator-sdk
+[install-guide]: /docs/installation/install-operator-sdk
[minikube-tool]:https://github.com/kubernetes/minikube#installation
[quay-link]:https://quay.io
diff --git a/website/content/en/docs/ansible/quickstart.md b/website/content/en/docs/building-operators/ansible/quickstart.md
similarity index 97%
rename from website/content/en/docs/ansible/quickstart.md
rename to website/content/en/docs/building-operators/ansible/quickstart.md
index bf273970fc..3901d0f068 100644
--- a/website/content/en/docs/ansible/quickstart.md
+++ b/website/content/en/docs/building-operators/ansible/quickstart.md
@@ -364,18 +364,18 @@ $ kubectl delete -f deploy/crds/cache.example.com_memcacheds_crd.yaml
**NOTE** Additional CR/CRD's can be added to the project by running, for example, the command :`operator-sdk add api --api-version=cache.example.com/v1alpha1 --kind=AppService`
For more information, refer [cli][addcli] doc.
-[ansible-install-guide]: /docs/ansible/installation
+[ansible-install-guide]: /docs/building-operators/ansible/installation
[ansible-runner-http-plugin]:https://github.com/ansible/ansible-runner-http
[ansible-runner-tool]: https://ansible-runner.readthedocs.io/en/latest/install.html
-[ansible-watches]: /docs/ansible/reference/watches
+[ansible-watches]: /docs/building-operators/ansible/reference/watches
[operator-scope]:https://v0-19-x.sdk.operatorframework.io/docs/legacy-common/operator-scope/
[layout-doc]:../reference/scaffolding
[homebrew-tool]:https://brew.sh/
-[install-guide]: /docs/install-operator-sdk
+[install-guide]: /docs/installation/install-operator-sdk
[git-tool]:https://git-scm.com/downloads
[go-tool]:https://golang.org/dl/
[docker-tool]:https://docs.docker.com/install/
[kubectl-tool]:https://kubernetes.io/docs/tasks/tools/install-kubectl/
-[addcli]: /docs/cli/operator-sdk_add_api
+[addcli]: /docs/cli/ansible-helm/operator-sdk_add_api
[quickstart-bundle]:https://v0-19-x.sdk.operatorframework.io/docs/olm-integration/legacy/quickstart-bundle/
diff --git a/website/content/en/docs/ansible/reference/_index.md b/website/content/en/docs/building-operators/ansible/reference/_index.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/_index.md
rename to website/content/en/docs/building-operators/ansible/reference/_index.md
diff --git a/website/content/en/docs/ansible/reference/advanced_options.md b/website/content/en/docs/building-operators/ansible/reference/advanced_options.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/advanced_options.md
rename to website/content/en/docs/building-operators/ansible/reference/advanced_options.md
diff --git a/website/content/en/docs/ansible/reference/apb-migration-guide.md b/website/content/en/docs/building-operators/ansible/reference/apb-migration-guide.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/apb-migration-guide.md
rename to website/content/en/docs/building-operators/ansible/reference/apb-migration-guide.md
diff --git a/website/content/en/docs/ansible/reference/dependent-watches.md b/website/content/en/docs/building-operators/ansible/reference/dependent-watches.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/dependent-watches.md
rename to website/content/en/docs/building-operators/ansible/reference/dependent-watches.md
diff --git a/website/content/en/docs/ansible/reference/finalizers.md b/website/content/en/docs/building-operators/ansible/reference/finalizers.md
similarity index 98%
rename from website/content/en/docs/ansible/reference/finalizers.md
rename to website/content/en/docs/building-operators/ansible/reference/finalizers.md
index fd3f0029b5..f86a8d368c 100644
--- a/website/content/en/docs/ansible/reference/finalizers.md
+++ b/website/content/en/docs/building-operators/ansible/reference/finalizers.md
@@ -168,4 +168,4 @@ let the operator remove our finalizer and allow the resource to be deleted.
## Further reading
• [Kubernetes finalizers](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#finalizers)
-[ansible-watches]:/docs/ansible/reference/watches/
+[ansible-watches]:/docs/building-operators/ansible/reference/watches/
diff --git a/website/content/en/docs/ansible/reference/information-flow-ansible-operator.md b/website/content/en/docs/building-operators/ansible/reference/information-flow-ansible-operator.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/information-flow-ansible-operator.md
rename to website/content/en/docs/building-operators/ansible/reference/information-flow-ansible-operator.md
diff --git a/website/content/en/docs/ansible/reference/retroactively-owned-resources.md b/website/content/en/docs/building-operators/ansible/reference/retroactively-owned-resources.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/retroactively-owned-resources.md
rename to website/content/en/docs/building-operators/ansible/reference/retroactively-owned-resources.md
diff --git a/website/content/en/docs/ansible/reference/scaffolding.md b/website/content/en/docs/building-operators/ansible/reference/scaffolding.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/scaffolding.md
rename to website/content/en/docs/building-operators/ansible/reference/scaffolding.md
diff --git a/website/content/en/docs/ansible/reference/watches.md b/website/content/en/docs/building-operators/ansible/reference/watches.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/watches.md
rename to website/content/en/docs/building-operators/ansible/reference/watches.md
diff --git a/website/content/en/docs/ansible/reference/webhooks.md b/website/content/en/docs/building-operators/ansible/reference/webhooks.md
similarity index 100%
rename from website/content/en/docs/ansible/reference/webhooks.md
rename to website/content/en/docs/building-operators/ansible/reference/webhooks.md
diff --git a/website/content/en/docs/ansible/testing-guide.md b/website/content/en/docs/building-operators/ansible/testing-guide.md
similarity index 100%
rename from website/content/en/docs/ansible/testing-guide.md
rename to website/content/en/docs/building-operators/ansible/testing-guide.md
diff --git a/website/content/en/docs/building-operators/golang/_index.md b/website/content/en/docs/building-operators/golang/_index.md
new file mode 100644
index 0000000000..488686c349
--- /dev/null
+++ b/website/content/en/docs/building-operators/golang/_index.md
@@ -0,0 +1,5 @@
+---
+title: Golang
+weight: 2
+description: Guide to building a Golang Based Operator using Operator SDK
+---
diff --git a/website/content/en/docs/golang/advanced-topics.md b/website/content/en/docs/building-operators/golang/advanced-topics.md
similarity index 100%
rename from website/content/en/docs/golang/advanced-topics.md
rename to website/content/en/docs/building-operators/golang/advanced-topics.md
diff --git a/website/content/en/docs/golang/crds-scope.md b/website/content/en/docs/building-operators/golang/crds-scope.md
similarity index 97%
rename from website/content/en/docs/golang/crds-scope.md
rename to website/content/en/docs/building-operators/golang/crds-scope.md
index 2e0d59fa92..480ba48ed2 100644
--- a/website/content/en/docs/golang/crds-scope.md
+++ b/website/content/en/docs/building-operators/golang/crds-scope.md
@@ -97,5 +97,5 @@ spec:
```
[RBAC]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/
-[manager_user_guide]:/docs/golang/quickstart/#manager
+[manager_user_guide]:/docs/building-operators/golang/quickstart/#manager
[manager_options]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/manager#Options
diff --git a/website/content/en/docs/golang/installation.md b/website/content/en/docs/building-operators/golang/installation.md
similarity index 94%
rename from website/content/en/docs/golang/installation.md
rename to website/content/en/docs/building-operators/golang/installation.md
index e0cf4ef550..fe84c139cb 100644
--- a/website/content/en/docs/golang/installation.md
+++ b/website/content/en/docs/building-operators/golang/installation.md
@@ -23,6 +23,6 @@ local Kubernetes cluster and [quay.io][quay-link] for the public registry.
[docker_tool]:https://docs.docker.com/install/
[mercurial_tool]:https://www.mercurial-scm.org/downloads
[kubectl_tool]:https://kubernetes.io/docs/tasks/tools/install-kubectl/
-[install-guide]: /docs/install-operator-sdk
+[install-guide]: /docs/installation/install-operator-sdk
[minikube-tool]:https://github.com/kubernetes/minikube#installation
[quay-link]:https://quay.io
diff --git a/website/content/en/docs/golang/operator-scope.md b/website/content/en/docs/building-operators/golang/operator-scope.md
similarity index 99%
rename from website/content/en/docs/golang/operator-scope.md
rename to website/content/en/docs/building-operators/golang/operator-scope.md
index 62c098871b..16395d440d 100644
--- a/website/content/en/docs/golang/operator-scope.md
+++ b/website/content/en/docs/building-operators/golang/operator-scope.md
@@ -269,5 +269,5 @@ if strings.Contains(namespace, ",") {
[k8s-rbac]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/
[kube-rbac-proxy]: https://github.com/brancz/kube-rbac-proxy
[rbac-clusterrole]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#role-and-clusterrole
-[crd-scope-doc]: /docs/golang/crds-scope/
+[crd-scope-doc]: /docs/building-operators/golang/crds-scope/
[rbac-markers]: https://book.kubebuilder.io/reference/markers/rbac.html
\ No newline at end of file
diff --git a/website/content/en/docs/golang/project_migration_guide.md b/website/content/en/docs/building-operators/golang/project_migration_guide.md
similarity index 97%
rename from website/content/en/docs/golang/project_migration_guide.md
rename to website/content/en/docs/building-operators/golang/project_migration_guide.md
index 443c8da0f4..0f12da95e8 100644
--- a/website/content/en/docs/golang/project_migration_guide.md
+++ b/website/content/en/docs/building-operators/golang/project_migration_guide.md
@@ -156,7 +156,7 @@ To update `config/rbac/role.yaml` after changing the markers, run `make manifest
The project can now be built, and the operator can be deployed on-cluster. For further steps regarding the deployment of the operator, creation of custom resources and cleaning up of resources, refer to the [quickstart guide][kb_quickstart].
-[memcached-operator]:/docs/golang/quickstart/
+[memcached-operator]:/docs/building-operators/golang/quickstart/
[git_tool]: https://git-scm.com/downloads
[go_tool]: https://golang.org/dl/
[docker_tool]:https://docs.docker.com/install/
@@ -171,5 +171,5 @@ The project can now be built, and the operator can be deployed on-cluster. For f
[memcached_cr]: https://github.com/operator-framework/operator-sdk-samples/blob/master/go/memcached-operator/deploy/crds/cache.example.com_v1alpha1_memcached_cr.yaml
[memcached_types]: https://github.com/operator-framework/operator-sdk-samples/blob/master/go/memcached-operator/pkg/apis/cache/v1alpha1/memcached_types.go
[kb_memcached_controller]: https://github.com/operator-framework/operator-sdk/blob/master/example/memcached-operator/memcached_controller.go.tmpl
-[kb_quickstart]: /docs/golang/quickstart/
-[install_guide]: /docs/install-operator-sdk/
+[kb_quickstart]: /docs/building-operators/golang/quickstart/
+[install_guide]: /docs/installation/install-operator-sdk/
diff --git a/website/content/en/docs/golang/quickstart.md b/website/content/en/docs/building-operators/golang/quickstart.md
similarity index 98%
rename from website/content/en/docs/golang/quickstart.md
rename to website/content/en/docs/building-operators/golang/quickstart.md
index f72ecd21af..d56b4abd1d 100644
--- a/website/content/en/docs/golang/quickstart.md
+++ b/website/content/en/docs/building-operators/golang/quickstart.md
@@ -457,15 +457,15 @@ Also see the [advanced topics][advanced_topics] doc for more use cases and under
[enqueue_requests_from_map_func]: https://godoc.org/sigs.k8s.io/controller-runtime/pkg/handler#EnqueueRequestsFromMapFunc
[event_handler_godocs]: https://godoc.org/sigs.k8s.io/controller-runtime/pkg/handler#hdr-EventHandlers
-[event_filtering]:/docs/golang/references/event-filtering/
+[event_filtering]:/docs/building-operators/golang/references/event-filtering/
[controller_options]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/controller#Options
[controller_godocs]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/controller
-[operator_scope]:/docs/golang/operator-scope/
+[operator_scope]:/docs/building-operators/golang/operator-scope/
[kubebuilder_layout_doc]:https://book.kubebuilder.io/cronjob-tutorial/basic-project.html
[homebrew_tool]:https://brew.sh/
[go_mod_wiki]: https://github.com/golang/go/wiki/Modules
[go_vendoring]: https://blog.gopheracademy.com/advent-2015/vendor-folder/
-[doc_client_api]:/docs/golang/references/client/
+[doc_client_api]:/docs/building-operators/golang/references/client/
[manager_go_doc]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/manager#Manager
[controller-go-doc]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg#hdr-Controller
[request-go-doc]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/reconcile#Request
@@ -487,8 +487,8 @@ Also see the [advanced topics][advanced_topics] doc for more use cases and under
[builder_godocs]: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/builder#example-Builder
[legacy_quickstart_doc]:https://v0-19-x.sdk.operatorframework.io/docs/golang/legacy/quickstart/
[activate_modules]: https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support
-[advanced_topics]: /docs/golang/advanced-topics/
-[create_a_webhook]: /docs/golang/webhooks/
+[advanced_topics]: /docs/building-operators/golang/advanced-topics/
+[create_a_webhook]: /docs/building-operators/golang/webhooks/
[status_marker]: https://book.kubebuilder.io/reference/generating-crd.html#status
[status_subresource]: https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#status-subresource
[API-groups]:https://kubernetes.io/docs/concepts/overview/kubernetes-api/#api-groups
diff --git a/website/content/en/docs/golang/references/_index.md b/website/content/en/docs/building-operators/golang/references/_index.md
similarity index 100%
rename from website/content/en/docs/golang/references/_index.md
rename to website/content/en/docs/building-operators/golang/references/_index.md
diff --git a/website/content/en/docs/golang/references/client.md b/website/content/en/docs/building-operators/golang/references/client.md
similarity index 100%
rename from website/content/en/docs/golang/references/client.md
rename to website/content/en/docs/building-operators/golang/references/client.md
diff --git a/website/content/en/docs/golang/references/event-filtering.md b/website/content/en/docs/building-operators/golang/references/event-filtering.md
similarity index 100%
rename from website/content/en/docs/golang/references/event-filtering.md
rename to website/content/en/docs/building-operators/golang/references/event-filtering.md
diff --git a/website/content/en/docs/golang/references/logging.md b/website/content/en/docs/building-operators/golang/references/logging.md
similarity index 100%
rename from website/content/en/docs/golang/references/logging.md
rename to website/content/en/docs/building-operators/golang/references/logging.md
diff --git a/website/content/en/docs/golang/references/markers.md b/website/content/en/docs/building-operators/golang/references/markers.md
similarity index 99%
rename from website/content/en/docs/golang/references/markers.md
rename to website/content/en/docs/building-operators/golang/references/markers.md
index 89c906886b..530dd704a8 100644
--- a/website/content/en/docs/golang/references/markers.md
+++ b/website/content/en/docs/building-operators/golang/references/markers.md
@@ -204,6 +204,6 @@ customresourcedefinitions:
[markers]:https://pkg.go.dev/sigs.k8s.io/controller-tools/pkg/markers
[code-markers-design]:https://github.com/operator-framework/operator-sdk/blob/master/proposals/sdk-code-annotations.md
-[cli-gen-kustomize-manifests]:/docs/new-cli/operator-sdk_generate_kustomize_manifests
+[cli-gen-kustomize-manifests]:/docs/cli/golang/operator-sdk_generate_kustomize_manifests
[csv-x-desc]:https://github.com/openshift/console/blob/feabd61/frontend/packages/operator-lifecycle-manager/src/components/descriptors/types.ts#L3-L39
[csv-spec]:https://github.com/operator-framework/operator-lifecycle-manager/blob/e0eea22/doc/design/building-your-csv.md
diff --git a/website/content/en/docs/golang/webhooks.md b/website/content/en/docs/building-operators/golang/webhooks.md
similarity index 97%
rename from website/content/en/docs/golang/webhooks.md
rename to website/content/en/docs/building-operators/golang/webhooks.md
index 387b6727d2..f5e327ccde 100644
--- a/website/content/en/docs/golang/webhooks.md
+++ b/website/content/en/docs/building-operators/golang/webhooks.md
@@ -201,8 +201,8 @@ memcached-operator-controller-manager 1/1 1 1 10m
memcached-sample 5/5 5 5 3m
```
-[quickstart_run_as_deployment]: /docs/golang/quickstart/#2-run-as-a-deployment-inside-the-cluster
-[quickstart_create_a_cr]: /docs/golang/quickstart/#create-a-memcached-cr
+[quickstart_run_as_deployment]: /docs/building-operators/golang/quickstart/#2-run-as-a-deployment-inside-the-cluster
+[quickstart_create_a_cr]: /docs/building-operators/golang/quickstart/#create-a-memcached-cr
[kubebuilder_admission_controllers]: https://book.kubebuilder.io/reference/admission-webhook.html
[kubebuilder_cronjob_webhook]: https://book.kubebuilder.io/cronjob-tutorial/webhook-implementation.html
diff --git a/website/content/en/docs/building-operators/helm/_index.md b/website/content/en/docs/building-operators/helm/_index.md
new file mode 100644
index 0000000000..41e3df5863
--- /dev/null
+++ b/website/content/en/docs/building-operators/helm/_index.md
@@ -0,0 +1,5 @@
+---
+title: Helm
+weight: 3
+description: Guide to building a Helm Based Operator using Operator SDK
+---
diff --git a/website/content/en/docs/helm/installation.md b/website/content/en/docs/building-operators/helm/installation.md
similarity index 92%
rename from website/content/en/docs/helm/installation.md
rename to website/content/en/docs/building-operators/helm/installation.md
index 5e27657b0d..422037b477 100644
--- a/website/content/en/docs/helm/installation.md
+++ b/website/content/en/docs/building-operators/helm/installation.md
@@ -16,6 +16,6 @@ local Kubernetes cluster and [quay.io][quay-link] for the public registry.
[docker-tool]:https://docs.docker.com/install/
[kubectl-tool]:https://kubernetes.io/docs/tasks/tools/install-kubectl/
-[install-guide]: /docs/install-operator-sdk
+[install-guide]: /docs/installation/install-operator-sdk
[minikube-tool]:https://github.com/kubernetes/minikube#installation
[quay-link]:https://quay.io
diff --git a/website/content/en/docs/helm/migration.md b/website/content/en/docs/building-operators/helm/migration.md
similarity index 93%
rename from website/content/en/docs/helm/migration.md
rename to website/content/en/docs/building-operators/helm/migration.md
index afafb604ed..bc0ea52cc4 100644
--- a/website/content/en/docs/helm/migration.md
+++ b/website/content/en/docs/building-operators/helm/migration.md
@@ -52,8 +52,8 @@ more than one chart or API's you can add them via `operator-sdk create api` comm
Now, follow the steps in the section [Build and run the operator][build-run-quick] to verify your project is running.
-[quickstart]: /docs/helm/quickstart
-[quickstart-new]: /docs/helm/quickstart
+[quickstart]: /docs/building-operators/helm/quickstart
+[quickstart-new]: /docs/building-operators/helm/quickstart
[integration-doc]: https://github.com/kubernetes-sigs/kubebuilder/blob/master/designs/integrating-kubebuilder-and-osdk.md
-[build-run-quick]: /docs/helm/quickstart#build-and-run-the-operator
+[build-run-quick]: /docs/building-operators/helm/quickstart#build-and-run-the-operator
[kustomize]: https://github.com/kubernetes-sigs/kustomize
diff --git a/website/content/en/docs/helm/quickstart.md b/website/content/en/docs/building-operators/helm/quickstart.md
similarity index 98%
rename from website/content/en/docs/helm/quickstart.md
rename to website/content/en/docs/building-operators/helm/quickstart.md
index 63e149778d..45fd882fb2 100644
--- a/website/content/en/docs/helm/quickstart.md
+++ b/website/content/en/docs/building-operators/helm/quickstart.md
@@ -308,10 +308,10 @@ kubectl delete -f deploy/crds/example.com_nginxes_crd.yaml
For more information, refer [cli][addcli] doc.
[operator-scope]:https://v0-19-x.sdk.operatorframework.io/docs/legacy-common/operator-scope/
-[layout-doc]: /docs/helm/reference/scaffolding
+[layout-doc]: /docs/building-operators/helm/reference/scaffolding
[helm-charts]:https://helm.sh/docs/topics/charts/
[helm-values]:https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing
[helm-official]:https://helm.sh/docs/
-[addcli]: /docs/cli/operator-sdk_add_api
+[addcli]: /docs/cli/ansible-helm/operator-sdk_add_api
[quickstart-bundle]:https://v0-19-x.sdk.operatorframework.io/docs/olm-integration/legacy/quickstart-bundle/
diff --git a/website/content/en/docs/helm/reference/_index.md b/website/content/en/docs/building-operators/helm/reference/_index.md
similarity index 100%
rename from website/content/en/docs/helm/reference/_index.md
rename to website/content/en/docs/building-operators/helm/reference/_index.md
diff --git a/website/content/en/docs/helm/reference/advanced_features.md b/website/content/en/docs/building-operators/helm/reference/advanced_features.md
similarity index 100%
rename from website/content/en/docs/helm/reference/advanced_features.md
rename to website/content/en/docs/building-operators/helm/reference/advanced_features.md
diff --git a/website/content/en/docs/helm/reference/scaffolding.md b/website/content/en/docs/building-operators/helm/reference/scaffolding.md
similarity index 100%
rename from website/content/en/docs/helm/reference/scaffolding.md
rename to website/content/en/docs/building-operators/helm/reference/scaffolding.md
diff --git a/website/content/en/docs/helm/reference/watches.md b/website/content/en/docs/building-operators/helm/reference/watches.md
similarity index 89%
rename from website/content/en/docs/helm/reference/watches.md
rename to website/content/en/docs/building-operators/helm/reference/watches.md
index 5222a1cf64..0f658a14e7 100644
--- a/website/content/en/docs/helm/reference/watches.md
+++ b/website/content/en/docs/building-operators/helm/reference/watches.md
@@ -27,4 +27,4 @@ An example Watches file:
chart: helm-charts/foo
```
-[override-values]: /docs/helm/reference/advanced_features/#passing-environment-variables-to-the-helm-chart
+[override-values]: /docs/building-operators/helm/reference/advanced_features/#passing-environment-variables-to-the-helm-chart
diff --git a/website/content/en/docs/cli/_index.md b/website/content/en/docs/cli/_index.md
index 1cd6565755..247a6db8e1 100644
--- a/website/content/en/docs/cli/_index.md
+++ b/website/content/en/docs/cli/_index.md
@@ -1,17 +1,6 @@
---
-title: Ansible/Helm CLI Reference
-weight: 31
----
-
-**Note:** For Golang Operators this CLI has been deprecated. Please consult the [new CLI reference][new_CLI] doc.
-
-[new_CLI]:/docs/new-cli
-
-
+title: Commands(CLI)
+linkTitle: Commands(CLI)
+weight: 7
+description: Working with operator-sdk cli
+---
\ No newline at end of file
diff --git a/website/content/en/docs/cli/ansible-helm/_index.md b/website/content/en/docs/cli/ansible-helm/_index.md
new file mode 100644
index 0000000000..06228285df
--- /dev/null
+++ b/website/content/en/docs/cli/ansible-helm/_index.md
@@ -0,0 +1,18 @@
+---
+title: Legacy CLI
+weight: 1
+description: Working with operator-sdk cli for ansible/helm based operators
+---
+
+**Note:** For Golang Operators this CLI has been deprecated. Please consult the [new CLI reference][new_CLI] doc.
+
+[new_CLI]:/docs/cli/golang
+
+
diff --git a/website/content/en/docs/cli/operator-sdk.md b/website/content/en/docs/cli/ansible-helm/operator-sdk.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk.md
diff --git a/website/content/en/docs/cli/operator-sdk_add.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_add.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_add.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_add.md
diff --git a/website/content/en/docs/cli/operator-sdk_add_api.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_add_api.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_add_api.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_add_api.md
diff --git a/website/content/en/docs/cli/operator-sdk_build.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_build.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_build.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_build.md
diff --git a/website/content/en/docs/cli/operator-sdk_completion.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_completion.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_completion.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_completion.md
diff --git a/website/content/en/docs/cli/operator-sdk_completion_bash.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_completion_bash.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_completion_bash.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_completion_bash.md
diff --git a/website/content/en/docs/cli/operator-sdk_completion_zsh.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_completion_zsh.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_completion_zsh.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_completion_zsh.md
diff --git a/website/content/en/docs/cli/operator-sdk_new.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_new.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_new.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_new.md
diff --git a/website/content/en/docs/cli/operator-sdk_olm.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_olm.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_olm.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_olm.md
diff --git a/website/content/en/docs/cli/operator-sdk_olm_install.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_olm_install.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_olm_install.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_olm_install.md
diff --git a/website/content/en/docs/cli/operator-sdk_olm_status.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_olm_status.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_olm_status.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_olm_status.md
diff --git a/website/content/en/docs/cli/operator-sdk_olm_uninstall.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_olm_uninstall.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_olm_uninstall.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_olm_uninstall.md
diff --git a/website/content/en/docs/cli/operator-sdk_scorecard.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_scorecard.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_scorecard.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_scorecard.md
diff --git a/website/content/en/docs/cli/operator-sdk_version.md b/website/content/en/docs/cli/ansible-helm/operator-sdk_version.md
similarity index 100%
rename from website/content/en/docs/cli/operator-sdk_version.md
rename to website/content/en/docs/cli/ansible-helm/operator-sdk_version.md
diff --git a/website/content/en/docs/cli/golang/_index.md b/website/content/en/docs/cli/golang/_index.md
new file mode 100644
index 0000000000..5f49d480ed
--- /dev/null
+++ b/website/content/en/docs/cli/golang/_index.md
@@ -0,0 +1,9 @@
+---
+title: New CLI
+weight: 2
+description: Working with operator-sdk cli for golang based operators
+---
+
+**Note:** This CLI reference is for the new Kubebuilder aligned CLI and project layout. See the [legacy CLI reference][legacy_cli] doc if using a legacy Golang project.
+
+[legacy_CLI]:/docs/cli/ansible-helm
diff --git a/website/content/en/docs/new-cli/operator-sdk.md b/website/content/en/docs/cli/golang/operator-sdk.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk.md
rename to website/content/en/docs/cli/golang/operator-sdk.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_build.md b/website/content/en/docs/cli/golang/operator-sdk_build.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_build.md
rename to website/content/en/docs/cli/golang/operator-sdk_build.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_bundle.md b/website/content/en/docs/cli/golang/operator-sdk_bundle.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_bundle.md
rename to website/content/en/docs/cli/golang/operator-sdk_bundle.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_bundle_validate.md b/website/content/en/docs/cli/golang/operator-sdk_bundle_validate.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_bundle_validate.md
rename to website/content/en/docs/cli/golang/operator-sdk_bundle_validate.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_cleanup.md b/website/content/en/docs/cli/golang/operator-sdk_cleanup.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_cleanup.md
rename to website/content/en/docs/cli/golang/operator-sdk_cleanup.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_cleanup_packagemanifests.md b/website/content/en/docs/cli/golang/operator-sdk_cleanup_packagemanifests.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_cleanup_packagemanifests.md
rename to website/content/en/docs/cli/golang/operator-sdk_cleanup_packagemanifests.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_completion.md b/website/content/en/docs/cli/golang/operator-sdk_completion.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_completion.md
rename to website/content/en/docs/cli/golang/operator-sdk_completion.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_completion_bash.md b/website/content/en/docs/cli/golang/operator-sdk_completion_bash.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_completion_bash.md
rename to website/content/en/docs/cli/golang/operator-sdk_completion_bash.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_completion_zsh.md b/website/content/en/docs/cli/golang/operator-sdk_completion_zsh.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_completion_zsh.md
rename to website/content/en/docs/cli/golang/operator-sdk_completion_zsh.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_create.md b/website/content/en/docs/cli/golang/operator-sdk_create.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_create.md
rename to website/content/en/docs/cli/golang/operator-sdk_create.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_create_api.md b/website/content/en/docs/cli/golang/operator-sdk_create_api.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_create_api.md
rename to website/content/en/docs/cli/golang/operator-sdk_create_api.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_create_webhook.md b/website/content/en/docs/cli/golang/operator-sdk_create_webhook.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_create_webhook.md
rename to website/content/en/docs/cli/golang/operator-sdk_create_webhook.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_generate.md b/website/content/en/docs/cli/golang/operator-sdk_generate.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_generate.md
rename to website/content/en/docs/cli/golang/operator-sdk_generate.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_generate_bundle.md b/website/content/en/docs/cli/golang/operator-sdk_generate_bundle.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_generate_bundle.md
rename to website/content/en/docs/cli/golang/operator-sdk_generate_bundle.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_generate_kustomize.md b/website/content/en/docs/cli/golang/operator-sdk_generate_kustomize.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_generate_kustomize.md
rename to website/content/en/docs/cli/golang/operator-sdk_generate_kustomize.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_generate_kustomize_manifests.md b/website/content/en/docs/cli/golang/operator-sdk_generate_kustomize_manifests.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_generate_kustomize_manifests.md
rename to website/content/en/docs/cli/golang/operator-sdk_generate_kustomize_manifests.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_generate_packagemanifests.md b/website/content/en/docs/cli/golang/operator-sdk_generate_packagemanifests.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_generate_packagemanifests.md
rename to website/content/en/docs/cli/golang/operator-sdk_generate_packagemanifests.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_init.md b/website/content/en/docs/cli/golang/operator-sdk_init.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_init.md
rename to website/content/en/docs/cli/golang/operator-sdk_init.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_new.md b/website/content/en/docs/cli/golang/operator-sdk_new.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_new.md
rename to website/content/en/docs/cli/golang/operator-sdk_new.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_olm.md b/website/content/en/docs/cli/golang/operator-sdk_olm.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_olm.md
rename to website/content/en/docs/cli/golang/operator-sdk_olm.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_olm_install.md b/website/content/en/docs/cli/golang/operator-sdk_olm_install.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_olm_install.md
rename to website/content/en/docs/cli/golang/operator-sdk_olm_install.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_olm_status.md b/website/content/en/docs/cli/golang/operator-sdk_olm_status.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_olm_status.md
rename to website/content/en/docs/cli/golang/operator-sdk_olm_status.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_olm_uninstall.md b/website/content/en/docs/cli/golang/operator-sdk_olm_uninstall.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_olm_uninstall.md
rename to website/content/en/docs/cli/golang/operator-sdk_olm_uninstall.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_run.md b/website/content/en/docs/cli/golang/operator-sdk_run.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_run.md
rename to website/content/en/docs/cli/golang/operator-sdk_run.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_run_packagemanifests.md b/website/content/en/docs/cli/golang/operator-sdk_run_packagemanifests.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_run_packagemanifests.md
rename to website/content/en/docs/cli/golang/operator-sdk_run_packagemanifests.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_scorecard.md b/website/content/en/docs/cli/golang/operator-sdk_scorecard.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_scorecard.md
rename to website/content/en/docs/cli/golang/operator-sdk_scorecard.md
diff --git a/website/content/en/docs/new-cli/operator-sdk_version.md b/website/content/en/docs/cli/golang/operator-sdk_version.md
similarity index 100%
rename from website/content/en/docs/new-cli/operator-sdk_version.md
rename to website/content/en/docs/cli/golang/operator-sdk_version.md
diff --git a/website/content/en/docs/contribution-guidelines/_index.md b/website/content/en/docs/contribution-guidelines/_index.md
index d51a56d17c..0bd9e9cfe0 100644
--- a/website/content/en/docs/contribution-guidelines/_index.md
+++ b/website/content/en/docs/contribution-guidelines/_index.md
@@ -1,6 +1,7 @@
---
title: How to Contribute
linkTitle: Contribution Guidelines
-weight: 40
+weight: 9
+description: Contribute to Operator SDK
---
diff --git a/website/content/en/docs/contribution-guidelines/release.md b/website/content/en/docs/contribution-guidelines/release.md
index 421f894d6e..897c578b0d 100644
--- a/website/content/en/docs/contribution-guidelines/release.md
+++ b/website/content/en/docs/contribution-guidelines/release.md
@@ -256,7 +256,7 @@ Commit the following changes:
- `internal/scaffold/go_mod.go`, change the `require` line version for `github.com/operator-framework/operator-sdk` from `master` to `v1.3.0`.
- `internal/scaffold/helm/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
- `internal/scaffold/ansible/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
-- `website/content/en/docs/install-operator-sdk.md`: update the linux and macOS URLs to point to the new release URLs.
+- `website/content/en/docs/installation/install-operator-sdk.md`: update the linux and macOS URLs to point to the new release URLs.
- `CHANGELOG.md`: commit changes (updated by changelog generation).
- `website/content/en/docs/migration/v1.3.0.md`: commit changes (created by changelog generation).
- `changelog/fragments/*`: commit deleted fragment files (deleted by changelog generation).
@@ -380,16 +380,16 @@ Add the following line to the top of the GitHub release notes for `v1.3.0`:
**NOTE:** ensure the `v1.3.0` tag is referenced when referring to sample code in the [SDK Operator samples repo](https://github.com/operator-framework/operator-sdk-samples/tree/v1.3.0) for this release. Links in SDK documentation are currently set to the samples repo `master` branch.
```
-[install-guide]: ../../install-operator-sdk
+[install-guide]: /docs/installation/install-operator-sdk
[doc-maintainers]: https://github.com/operator-framework/operator-sdk/blob/master/MAINTAINERS
[doc-owners]: https://github.com/operator-framework/operator-sdk/blob/master/OWNERS
-[doc-readme-prereqs]: ../../install-operator-sdk#prerequisites
+[doc-readme-prereqs]: /docs/installation/install-operator-sdk#prerequisites
[doc-git-default-key]:https://help.github.com/en/articles/telling-git-about-your-signing-key
[doc-gpg-default-key]:https://lists.gnupg.org/pipermail/gnupg-users/2001-September/010163.html
[link-github-gpg-key-upload]:https://github.com/settings/keys
[link-git-config-gpg-key]:https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work
[doc-changelog]: https://github.com/operator-framework/operator-sdk/blob/master/CHANGELOG.md
-[backports]:/docs/contribution-guidelines/backport-policy
+[backports]:/docs/upgrading-sdk-version/backport-policy
[release-page]:https://github.com/operator-framework/operator-sdk/releases
[homebrew]:https://brew.sh/
[homebrew-formula]:https://github.com/Homebrew/homebrew-core/blob/master/Formula/operator-sdk.rb
diff --git a/website/content/en/docs/faq.md b/website/content/en/docs/faqs/faqs.md
similarity index 98%
rename from website/content/en/docs/faq.md
rename to website/content/en/docs/faqs/faqs.md
index c365346b87..24da3d9e6c 100644
--- a/website/content/en/docs/faq.md
+++ b/website/content/en/docs/faqs/faqs.md
@@ -1,7 +1,7 @@
---
title: Operator SDK FAQ
linkTitle: FAQ
-weight: 80
+weight: 10
---
## Controller Runtime FAQ
@@ -104,7 +104,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
[kube-apiserver_options]: https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/#options
[controller-runtime_faq]: https://github.com/kubernetes-sigs/controller-runtime/blob/master/FAQ.md#q-how-do-i-have-different-logic-in-my-reconciler-for-different-types-of-events-eg-create-update-delete
-[finalizer]:/docs/golang/advanced-topics/#handle-cleanup-on-deletion
+[finalizer]:/docs/building-operators/golang/advanced-topics/#handle-cleanup-on-deletion
[cr-faq]:https://github.com/kubernetes-sigs/controller-runtime/blob/master/FAQ.md
[client.Reader]:https://godoc.org/sigs.k8s.io/controller-runtime/pkg/client#Reader
[rbac]:https://kubernetes.io/docs/reference/access-authn-authz/rbac/
diff --git a/website/content/en/docs/golang/_index.md b/website/content/en/docs/golang/_index.md
deleted file mode 100644
index e19f7eccdc..0000000000
--- a/website/content/en/docs/golang/_index.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Golang Based Operators
-weight: 20
----
diff --git a/website/content/en/docs/helm/_index.md b/website/content/en/docs/helm/_index.md
deleted file mode 100644
index 31657d9122..0000000000
--- a/website/content/en/docs/helm/_index.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Helm Based Operators
-weight: 20
----
diff --git a/website/content/en/docs/install-operator-sdk.md b/website/content/en/docs/installation/install-operator-sdk.md
similarity index 98%
rename from website/content/en/docs/install-operator-sdk.md
rename to website/content/en/docs/installation/install-operator-sdk.md
index 11b1dd20c1..1357f39a0f 100644
--- a/website/content/en/docs/install-operator-sdk.md
+++ b/website/content/en/docs/installation/install-operator-sdk.md
@@ -1,7 +1,10 @@
---
-title: Install the Operator SDK CLI
-linkTitle: Installation
-weight: 1
+title: "Installation"
+linkTitle: "Installation"
+date: 2020-03-25
+weight: 2
+description: >
+ Install the Operator SDK CLI
---
- [Install from Homebrew (macOS)](#install-from-homebrew-macos)
diff --git a/website/content/en/docs/migration/_index.md b/website/content/en/docs/migration/_index.md
deleted file mode 100644
index 8bac43f3eb..0000000000
--- a/website/content/en/docs/migration/_index.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Migration Reference
-weight: 50
----
diff --git a/website/content/en/docs/new-cli/_index.md b/website/content/en/docs/new-cli/_index.md
deleted file mode 100644
index c18a5a3963..0000000000
--- a/website/content/en/docs/new-cli/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Golang CLI Reference
-weight: 30
----
-
-**Note:** This CLI reference is for the new Kubebuilder aligned CLI and project layout. See the [legacy CLI reference][legacy_CLI] doc if using a legacy Golang project.
-
-[legacy_CLI]:/docs/cli
diff --git a/website/content/en/docs/olm-integration/_index.md b/website/content/en/docs/olm-integration/_index.md
index a28f6ba3a7..e49bc8fe1b 100644
--- a/website/content/en/docs/olm-integration/_index.md
+++ b/website/content/en/docs/olm-integration/_index.md
@@ -1,5 +1,6 @@
---
title: Operator SDK Integration with Operator Lifecycle Manager
linkTitle: OLM Integration
-weight: 25
+weight: 8
+description: Use operator-sdk to install OLM, package operators for OLM, and install and run Operators with OLM
---
diff --git a/website/content/en/docs/olm-integration/cli-overview.md b/website/content/en/docs/olm-integration/cli-overview.md
index 1f8fbdd889..dce63a0e4f 100644
--- a/website/content/en/docs/olm-integration/cli-overview.md
+++ b/website/content/en/docs/olm-integration/cli-overview.md
@@ -46,11 +46,11 @@ with an existing OLM installation.
[bundle]:https://github.com/operator-framework/operator-registry/blob/v1.12.6/docs/design/operator-bundle.md
[package-manifests]:https://github.com/operator-framework/operator-registry/tree/v1.5.3#manifest-format
[doc-olm-generate]:/docs/olm-integration/generating-a-csv
-[cli-olm-install]:/docs/new-cli/operator-sdk_olm_install
-[cli-olm-status]:/docs/new-cli/operator-sdk_olm_status
-[cli-olm-uninstall]:/docs/new-cli/operator-sdk_olm_uninstall
-[cli-gen-bundle]:/docs/new-cli/operator-sdk_generate_bundle
-[cli-gen-packagemanifests]:/docs/new-cli/operator-sdk_generate_packagemanifests
-[cli-gen-kustomize-manifests]:/docs/new-cli/operator-sdk_generate_kustomize_manifests
-[cli-bundle-validate]:/docs/new-cli/operator-sdk_bundle_validate
+[cli-olm-install]:/docs/cli/golang/operator-sdk_olm_install
+[cli-olm-status]:/docs/cli/golang/operator-sdk_olm_status
+[cli-olm-uninstall]:/docs/cli/golang/operator-sdk_olm_uninstall
+[cli-gen-bundle]:/docs/cli/golang/operator-sdk_generate_bundle
+[cli-gen-packagemanifests]:/docs/cli/golang/operator-sdk_generate_packagemanifests
+[cli-gen-kustomize-manifests]:/docs/cli/golang/operator-sdk_generate_kustomize_manifests
+[cli-bundle-validate]:/docs/cli/golang/operator-sdk_bundle_validate
[doc-testing-deployment]:/docs/olm-integration/testing-deployment
diff --git a/website/content/en/docs/olm-integration/generating-a-csv.md b/website/content/en/docs/olm-integration/generating-a-csv.md
index fc226e679e..54a6fbfb9b 100644
--- a/website/content/en/docs/olm-integration/generating-a-csv.md
+++ b/website/content/en/docs/olm-integration/generating-a-csv.md
@@ -1,5 +1,5 @@
---
-title: Generating Manifests and Metadata
+title: Generating Manifests and Metadata
linkTitle: Generating Manifests and Metadata
weight: 20
---
@@ -241,13 +241,13 @@ being managed, each with a `name` and `url`.
[olm]:https://github.com/operator-framework/operator-lifecycle-manager
[doc-csv]:https://github.com/operator-framework/operator-lifecycle-manager/blob/0.15.1/doc/design/building-your-csv.md
[cli-overview]:/docs/olm-integration/cli-overview
-[cli-gen-kustomize-manifests]:/docs/new-cli/operator-sdk_generate_kustomize_manifests
-[cli-gen-bundle]:/docs/new-cli/operator-sdk_generate_bundle
-[cli-gen-packagemanifests]:/docs/new-cli/operator-sdk_generate_packagemanifests
+[cli-gen-kustomize-manifests]:/docs/cli/golang/operator-sdk_generate_kustomize_manifests
+[cli-gen-bundle]:/docs/cli/golang/operator-sdk_generate_bundle
+[cli-gen-packagemanifests]:/docs/cli/golang/operator-sdk_generate_packagemanifests
[bundle]:https://github.com/operator-framework/operator-registry/blob/v1.12.6/docs/design/operator-bundle.md
[bundle-metadata]:https://github.com/operator-framework/operator-registry/blob/v1.12.6/docs/design/operator-bundle.md#bundle-annotations
[package-manifests]:https://github.com/operator-framework/operator-registry/tree/v1.5.3#manifest-format
[install-modes]:https://github.com/operator-framework/operator-lifecycle-manager/blob/4197455/Documentation/design/building-your-csv.md#operator-metadata
-[olm-capabilities]:/docs/operator-capabilities/
-[csv-markers]:/docs/golang/references/markers
+[olm-capabilities]:/docs/advanced-topics/operator-capabilities/operator-capabilities
+[csv-markers]:/docs/building-operators/golang/references/markers
[operatorhub]:https://operatorhub.io/
diff --git a/website/content/en/docs/olm-integration/quickstart-bundle.md b/website/content/en/docs/olm-integration/quickstart-bundle.md
index 11ae3fb06c..5f293f6105 100644
--- a/website/content/en/docs/olm-integration/quickstart-bundle.md
+++ b/website/content/en/docs/olm-integration/quickstart-bundle.md
@@ -139,15 +139,15 @@ to add an index to a cluster catalog, and the catalog [discovery docs][doc-olm-d
about your cataloged Operator.
-[sdk-user-guide-go]:/docs/golang/quickstart
-[sdk-user-guide-ansible]:/docs/ansible/quickstart
-[sdk-user-guide-helm]:/docs/helm/quickstart
+[sdk-user-guide-go]:/docs/building-operators/golang/quickstart
+[sdk-user-guide-ansible]:/docs/building-operators/ansible/quickstart
+[sdk-user-guide-helm]:/docs/building-operators/helm/quickstart
[quickstart-package-manifests]:/docs/olm-integration/quickstart-package-manifests
[olm]:https://github.com/operator-framework/operator-lifecycle-manager/
[bundle]:https://github.com/operator-framework/operator-registry/blob/v1.12.6/docs/design/operator-bundle.md
[bundle-metadata]:https://github.com/operator-framework/operator-registry/blob/v1.12.6/docs/design/operator-bundle.md#bundle-annotations
[bundle-dockerfile]:https://github.com/operator-framework/operator-registry/blob/v1.12.6/docs/design/operator-bundle.md#bundle-dockerfile
-[cli-olm]:/docs/new-cli/operator-sdk_olm
+[cli-olm]:/docs/cli/golang/operator-sdk_olm
[doc-cli-overview]:/docs/olm-integration/cli-overview
[doc-olm-generate]:/docs/olm-integration/generating-a-csv
[opm]:https://github.com/operator-framework/operator-registry/blob/master/docs/design/opm-tooling.md
diff --git a/website/content/en/docs/olm-integration/quickstart-package-manifests.md b/website/content/en/docs/olm-integration/quickstart-package-manifests.md
index 52ae9b69a5..7de9069610 100644
--- a/website/content/en/docs/olm-integration/quickstart-package-manifests.md
+++ b/website/content/en/docs/olm-integration/quickstart-package-manifests.md
@@ -85,7 +85,7 @@ INFO[0001] Successfully uninstalled "memcached-operator.v0.0.1" on OLM version "
[quickstart-bundle]:/docs/olm-integration/quickstart-bundle
[operator-registry]:https://github.com/operator-framework/operator-registry
-[cli-run-packagemanifests]:/docs/new-cli/operator-sdk_run_packagemanifests
-[cli-cleanup-packagemanifests]:/docs/new-cli/operator-sdk_cleanup_packagemanifests
+[cli-run-packagemanifests]:/docs/cli/golang/operator-sdk_run_packagemanifests
+[cli-cleanup-packagemanifests]:/docs/cli/golang/operator-sdk_cleanup_packagemanifests
[doc-olm-generate]:/docs/olm-integration/generating-a-csv#overview
[doc-testing-deployment]:/docs/olm-integration/testing-deployment
diff --git a/website/content/en/docs/olm-integration/testing-deployment.md b/website/content/en/docs/olm-integration/testing-deployment.md
index 150f48128d..52f52056b4 100644
--- a/website/content/en/docs/olm-integration/testing-deployment.md
+++ b/website/content/en/docs/olm-integration/testing-deployment.md
@@ -65,5 +65,5 @@ hence its intended purpose being testing only.
[doc-cli-overview]:/docs/olm-integration/cli-overview
[package-manifests]:https://github.com/operator-framework/operator-registry/tree/v1.5.3#manifest-format
[csv-install-modes]:https://github.com/operator-framework/operator-lifecycle-manager/blob/master/doc/design/building-your-csv.md#operator-metadata
-[cli-olm-install]:/docs/new-cli/operator-sdk_olm_install
-[cli-olm-status]:/docs/new-cli/operator-sdk_olm_status
+[cli-olm-install]:/docs/cli/golang/operator-sdk_olm_install
+[cli-olm-status]:/docs/cli/golang/operator-sdk_olm_status
diff --git a/website/content/en/docs/overview/_overview.md b/website/content/en/docs/overview/_overview.md
new file mode 100644
index 0000000000..fb54601bc2
--- /dev/null
+++ b/website/content/en/docs/overview/_overview.md
@@ -0,0 +1,97 @@
+---
+title: "Overview"
+linkTitle: "Overview"
+weight: 1
+description: >
+ What is Operator SDK? Why should I use it?
+---
+
+## What is Opearator SDK and why should I use it?
+
+This project is a component of the [Operator Framework][of-home], an open source toolkit to manage Kubernetes native applications, called Operators, in an effective, automated, and scalable way. Read more in the [introduction blog post][of-blog].
+
+[Operators][operator_link] make it easy to manage complex stateful applications on top of Kubernetes. However writing an operator today can be difficult because of challenges such as using low level APIs, writing boilerplate, and a lack of modularity which leads to duplication.
+
+The Operator SDK is a framework that uses the [controller-runtime][controller_runtime] library to make writing operators easier by providing:
+
+ - High level APIs and abstractions to write the operational logic more intuitively
+ - Tools for scaffolding and code generation to bootstrap a new project fast
+ - Extensions to cover common operator use cases
+
+## Workflow
+
+The SDK provides workflows to develop operators in Go, Ansible, or Helm.
+
+The following workflow is for a new [Golang operator][golang-guide]:
+
+ 1. Create a new operator project using the SDK Command Line Interface(CLI)
+ 2. Define new resource APIs by adding Custom Resource Definitions(CRD)
+ 3. Define Controllers to watch and reconcile resources
+ 4. Write the reconciling logic for your Controller using the SDK and controller-runtime APIs
+ 5. Use the SDK CLI to build and generate the operator deployment manifests
+
+The following workflow is for a new [Ansible operator][ansible-guide]:
+
+ 1. Create a new operator project using the SDK Command Line Interface(CLI)
+ 2. Write the reconciling logic for your object using ansible playbooks and roles
+ 3. Use the SDK CLI to build and generate the operator deployment manifests
+ 4. Optionally add additional CRD's using the SDK CLI and repeat steps 2 and 3
+
+The following workflow is for a new [Helm operator][helm-guide]:
+
+ 1. Create a new operator project using the SDK Command Line Interface(CLI)
+ 2. Create a new (or add your existing) Helm chart for use by the operator's reconciling logic
+ 3. Use the SDK CLI to build and generate the operator deployment manifests
+ 4. Optionally add additional CRD's using the SDK CLI and repeat steps 2 and 3
+
+## Command Line Interface
+
+To learn more about the SDK CLI, see the [SDK CLI Reference][sdk_cli_ref], or run `operator-sdk [command] -h`.
+
+### Operator capability level
+
+Note that each operator type has a different set of capabilities. When choosing what type to use for your project, it is important to understand the features and limitations of each of the project types and the use cases for your operator.
+
+
+
+Find more details about the various levels and the feature requirements for them in the [capability level documentation][capability_levels].
+
+## Samples
+
+To explore any operator samples built using the operator-sdk, see the [operator-sdk-samples][samples].
+
+## FAQ
+
+For common Operator SDK related questions, see the [FAQ][faq].
+
+## Contributing
+
+See [CONTRIBUTING][contrib] for details on submitting patches and the contribution workflow.
+
+See the [proposal docs][proposals_docs] and issues for ongoing or planned work.
+
+## Reporting bugs
+
+See [reporting bugs][bug_guide] for details about reporting any issues.
+
+## License
+
+Operator SDK is under Apache 2.0 license. See the [LICENSE][license_file] file for details.
+
+[ansible-guide]:/docs/building-operators/ansible/quickstart/
+[bug_guide]:/docs/contribution-guidelines/reporting-issues/
+[capability_levels]: /docs/advanced-topics/operator-capabilities/operator-capabilities
+[contrib]: https://github.com/operator-framework/operator-sdk/blob/master/CONTRIBUTING.MD
+[controller_runtime]: https://github.com/kubernetes-sigs/controller-runtime
+[faq]: /docs/faqs/faqs
+[getting_started]: https://github.com/operator-framework/getting-started/blob/master/README.md
+[golang-guide]:/docs/building-operators/golang/quickstart/
+[helm-guide]:/docs/building-operators/helm/quickstart/
+[install_guide]: /docs/installation/install-operator-sdk/
+[license_file]:https://github.com/operator-framework/operator-sdk/blob/master/LICENSE
+[of-blog]: https://coreos.com/blog/introducing-operator-framework
+[of-home]: https://github.com/operator-framework
+[operator_link]: https://coreos.com/operators/
+[proposals_docs]: https://github.com/operator-framework/operator-sdk/tree/master/proposals
+[samples]: https://github.com/operator-framework/operator-sdk-samples
+[sdk_cli_ref]: /docs/cli/
diff --git a/website/content/en/docs/scorecard/_index.md b/website/content/en/docs/scorecard/_index.md
deleted file mode 100644
index bc736b3fd7..0000000000
--- a/website/content/en/docs/scorecard/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Scorecard
-linkTitle: Scorecard
-weight: 25
----
diff --git a/website/content/en/docs/upgrading-sdk-version/_index.md b/website/content/en/docs/upgrading-sdk-version/_index.md
new file mode 100644
index 0000000000..9869270631
--- /dev/null
+++ b/website/content/en/docs/upgrading-sdk-version/_index.md
@@ -0,0 +1,5 @@
+---
+title: Upgrade SDK Version
+weight: 4
+description: Guide to upgrading sdk version for your operator
+---
\ No newline at end of file
diff --git a/website/content/en/docs/contribution-guidelines/backport-policy.md b/website/content/en/docs/upgrading-sdk-version/backport-policy.md
similarity index 98%
rename from website/content/en/docs/contribution-guidelines/backport-policy.md
rename to website/content/en/docs/upgrading-sdk-version/backport-policy.md
index 5691a84418..ddbef17899 100644
--- a/website/content/en/docs/contribution-guidelines/backport-policy.md
+++ b/website/content/en/docs/upgrading-sdk-version/backport-policy.md
@@ -1,6 +1,6 @@
---
title: Backport Policy
-weight: 30
+weight: 2
---
Mainly critical issue fixes are backported to the most recent minor release.
diff --git a/website/content/en/docs/versioning.md b/website/content/en/docs/upgrading-sdk-version/operator-sdk-versioning.md
similarity index 90%
rename from website/content/en/docs/versioning.md
rename to website/content/en/docs/upgrading-sdk-version/operator-sdk-versioning.md
index e6bd1fdff1..19ee9713d3 100644
--- a/website/content/en/docs/versioning.md
+++ b/website/content/en/docs/upgrading-sdk-version/operator-sdk-versioning.md
@@ -1,10 +1,11 @@
---
title: Versioning for Operator SDK
linkTitle: Versioning
-weight: 70
+weight: 1
+description: A concise explanation of how Operator SDK versions are determined.
---
-The following is a concise explanation of how Operator SDK versions are determined. The Operator SDK versioning follows [semantic versioning][link-semver] standards.
+The Operator SDK versioning follows [semantic versioning][link-semver] standards.
## Milestones
diff --git a/website/content/en/docs/migration/v0.1.0-migration-guide.md b/website/content/en/docs/upgrading-sdk-version/v0.1.0-migration-guide.md
similarity index 98%
rename from website/content/en/docs/migration/v0.1.0-migration-guide.md
rename to website/content/en/docs/upgrading-sdk-version/v0.1.0-migration-guide.md
index edc5a140b5..e50f3a0591 100644
--- a/website/content/en/docs/migration/v0.1.0-migration-guide.md
+++ b/website/content/en/docs/upgrading-sdk-version/v0.1.0-migration-guide.md
@@ -1,11 +1,10 @@
---
-title: Operator SDK Migration Guide from v0.0.x to v0.1.0
-linkTitle: Migration
-weight: 1
+title: v0.0.x to v0.1.0
+linkTitle: v0.0.x to v0.1.0
+weight: 3
+description: A guide to migrate an operator project built using Operator SDK `v0.0.x` to the project structure required by `v0.1.0`.
---
-This document describes how to migrate an operator project built using Operator SDK `v0.0.x` to the project structure required by `v0.1.0`.
-
The recommended way to migrate your project is to initialize a new `v0.1.0` project, then copy your code into the new project and modify as described below.
This guide goes over migrating the memcached-operator, an example project from the user guide, to illustrate migration steps. See the [v0.0.7 memcached-operator][v0.0.7-memcached-operator] and [v0.1.0 memcached-operator][v0.1.0-memcached-operator] project structures for pre- and post-migration examples, respectively.
diff --git a/website/content/en/docs/migration/v0.18.0.md b/website/content/en/docs/upgrading-sdk-version/v0.18.0.md
similarity index 99%
rename from website/content/en/docs/migration/v0.18.0.md
rename to website/content/en/docs/upgrading-sdk-version/v0.18.0.md
index d88eb3a422..e9b8f72490 100644
--- a/website/content/en/docs/migration/v0.18.0.md
+++ b/website/content/en/docs/upgrading-sdk-version/v0.18.0.md
@@ -1,6 +1,6 @@
---
-title: v0.18.0
-weight: 999982000
+title: v0.17.x to v0.18.0
+weight: 5
---
## Modules
diff --git a/website/content/en/docs/migration/v0.19.0.md b/website/content/en/docs/upgrading-sdk-version/v0.19.0.md
similarity index 98%
rename from website/content/en/docs/migration/v0.19.0.md
rename to website/content/en/docs/upgrading-sdk-version/v0.19.0.md
index 6417ab6fa7..fe120b39cb 100644
--- a/website/content/en/docs/migration/v0.19.0.md
+++ b/website/content/en/docs/upgrading-sdk-version/v0.19.0.md
@@ -1,6 +1,6 @@
---
-title: v0.19.0
-weight: 999981000
+title: v0.18.x to v0.19.0
+weight: 6
---
## Prevent mangling of Ansible variable names containing special words by the Ansible operator
diff --git a/website/content/en/docs/migration/version-upgrade-guide.md b/website/content/en/docs/upgrading-sdk-version/version-upgrade-guide.md
similarity index 99%
rename from website/content/en/docs/migration/version-upgrade-guide.md
rename to website/content/en/docs/upgrading-sdk-version/version-upgrade-guide.md
index 7639983a56..ab272e04c1 100644
--- a/website/content/en/docs/migration/version-upgrade-guide.md
+++ b/website/content/en/docs/upgrading-sdk-version/version-upgrade-guide.md
@@ -1,11 +1,10 @@
---
title: Operator SDK Version upgrade guide
-linkTitle: Version Upgrade
-weight: 1
+linkTitle: v0.2.x to v0.17.x
+weight: 4
+description: A guide to upgrading the Operator SDK version for an existing operator project from v0.2.x all the way through to 0.17.x.
---
-This document aims to facilitate the process of upgrading the Operator SDK version for an existing operator project.
-
In most cases the upgrading the SDK version should only entail updating the operator's SDK dependency version in the `Gopkg.toml` or `go.mod` file.
For some versions it might also be necessary to update the upstream Kubernetes and controller-runtime dependencies.
@@ -803,7 +802,7 @@ sigs.k8s.io/controller-runtime/pkg/client/apiutil.DynamicRESTMapper
**Add `operator_sdk.util` Ansible collection**
-The Ansible module `k8s_status` was extracted and is now provided by the `operator_sdk.util` Ansible collection. See [developer_guide](/docs/ansible/development-tips/#custom-resource-status-management) for new usage.
+The Ansible module `k8s_status` was extracted and is now provided by the `operator_sdk.util` Ansible collection. See [developer_guide](/docs/building-operators/ansible/development-tips/#custom-resource-status-management) for new usage.
To use the collection in a role, declare it at the root level in `meta/main.yaml`:
```yaml
diff --git a/website/content/en/faq/_index.md b/website/content/en/faq/_index.md
deleted file mode 100644
index b81e80790a..0000000000
--- a/website/content/en/faq/_index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: FAQ
-# menu:
-# main:
-# weight: 30
----
-
-### this is the title
- this is the text
\ No newline at end of file
diff --git a/website/layouts/index.html b/website/layouts/index.html
index 64b0e7a7d7..2c8eced7e6 100644
--- a/website/layouts/index.html
+++ b/website/layouts/index.html
@@ -58,7 +58,7 @@ Go
Use the SDK CLI to build and generate the operator deployment manifests
-
+
Develop with Go
@@ -76,7 +76,7 @@ Ansible
Use the SDK CLI to build and generate the operator deployment manifests
Optionally add additional CRD's using the SDK CLI and repeat steps 2 and 3
-
+
Develop with Ansible
@@ -93,7 +93,7 @@ Helm
Use the SDK CLI to build and generate the operator deployment manifests
Optionally add additional CRD’s using the SDK CLI and repeat steps 2 and 3
-
+
Develop with Helm