From 5d2e0cfaedd63135bcab891cea07c28b616cc58c Mon Sep 17 00:00:00 2001 From: Alex Dellapenta Date: Mon, 7 Oct 2019 12:45:31 -0400 Subject: [PATCH] Move Operator content to top-level dir --- _topic_map.yml | 111 +++++++++--------- .../dedicated-admin-role.adoc | 2 +- applications/operators/images | 1 - applications/operators/modules | 1 - ...ading-container-native-virtualization.adoc | 2 +- logging/cluster-logging-deploying-about.adoc | 2 +- logging/cluster-logging-deploying.adoc | 2 +- ...uilding-memcached-operator-using-osdk.adoc | 2 +- ...d-creating-custom-resources-from-file.adoc | 2 +- modules/creating-new-osdk-v0-1-0-project.adoc | 2 +- modules/dedicated-cluster-install-deploy.adoc | 2 +- ...managing-memcached-operator-using-olm.adoc | 2 +- modules/migrating-custom-types-pkg-apis.adoc | 2 +- modules/migrating-reconcile-code.adoc | 2 +- modules/olm-architecture.adoc | 2 +- ...m-creating-etcd-cluster-from-operator.adoc | 2 +- modules/olm-csv.adoc | 2 +- ...ng-operators-from-a-cluster-using-cli.adoc | 2 +- ...tors-from-a-cluster-using-web-console.adoc | 2 +- modules/olm-dependency-resolution.adoc | 2 +- ...installing-from-operatorhub-using-cli.adoc | 2 +- ...ng-from-operatorhub-using-web-console.adoc | 2 +- ...installing-operators-from-operatorhub.adoc | 2 +- modules/olm-metrics.adoc | 2 +- modules/olm-operator-framework.adoc | 2 +- modules/olm-operator-maturity-model.adoc | 2 +- modules/olm-operatorgroups.adoc | 2 +- modules/olm-operatorhub-architecture.adoc | 2 +- modules/olm-operatorhub-overview.adoc | 2 +- modules/olm-overview.adoc | 2 +- .../olm-policy-fine-grained-permissions.adoc | 2 +- modules/olm-policy-scenarios.adoc | 2 +- .../olm-policy-scoping-operator-install.adoc | 2 +- modules/olm-policy-troubleshooting.adoc | 2 +- modules/olm-policy-understanding.adoc | 2 +- modules/olm-policy-workflow.adoc | 2 +- ...cted-networks-configuring-operatorhub.adoc | 2 +- modules/olm-status-conditions.adoc | 2 +- modules/olm-status-viewing-cli.adoc | 2 +- modules/olm-upgrades.adoc | 2 +- modules/olm-why-use-operators.adoc | 2 +- .../osdk-ansible-custom-resource-files.adoc | 2 +- modules/osdk-ansible-extra-variables.adoc | 2 +- ...dk-ansible-k8s-module-inside-operator.adoc | 2 +- .../osdk-ansible-k8s-module-installing.adoc | 2 +- ...dk-ansible-k8s-module-testing-locally.adoc | 2 +- modules/osdk-ansible-managing-cr-status.adoc | 2 +- modules/osdk-ansible-runner-directory.adoc | 2 +- modules/osdk-ansible-support.adoc | 2 +- modules/osdk-ansible-watches-file.adoc | 2 +- modules/osdk-apiservices.adoc | 2 +- modules/osdk-architecture.adoc | 2 +- modules/osdk-building-ansible-operator.adoc | 2 +- modules/osdk-building-helm-operator.adoc | 2 +- modules/osdk-crds.adoc | 2 +- .../osdk-csv-composition-configuration.adoc | 2 +- modules/osdk-generating-a-csv.adoc | 2 +- modules/osdk-helm-chart-support.adoc | 2 +- modules/osdk-how-csv-gen-works.adoc | 2 +- modules/osdk-installing-cli.adoc | 6 +- modules/osdk-leader-election-types.adoc | 2 +- modules/osdk-manually-defined-csv-fields.adoc | 4 +- ...metheus-metrics-helper-modifying-port.adoc | 2 +- ...-monitoring-prometheus-metrics-helper.adoc | 2 +- ...onitoring-prometheus-operator-support.adoc | 4 +- ...ng-prometheus-servicemonitor-creating.adoc | 2 +- ...-monitoring-prometheus-servicemonitor.adoc | 2 +- modules/osdk-project-staffolding-layout.adoc | 2 +- .../olm-adding-operators-to-cluster.adoc | 0 ...reating-apps-from-installed-operators.adoc | 0 .../olm-creating-policy.adoc | 0 .../olm-deleting-operators-from-cluster.adoc | 0 .../olm-managing-resources-from-crds.adoc | 0 .../olm-restricted-networks.adoc | 10 +- .../operators => operators}/olm-status.adoc | 0 .../olm-understanding-olm.adoc | 0 .../olm-understanding-operatorhub.adoc | 0 .../olm-what-operators-are.adoc | 0 .../operator_sdk/images | 0 .../operator_sdk/modules | 0 .../operator_sdk/osdk-ansible.adoc | 2 +- .../operator_sdk/osdk-appendices.adoc | 0 .../operator_sdk/osdk-cli-reference.adoc | 0 .../operator_sdk/osdk-generating-csvs.adoc | 0 .../operator_sdk/osdk-getting-started.adoc | 2 +- .../operator_sdk/osdk-helm.adoc | 2 +- .../operator_sdk/osdk-leader-election.adoc | 0 .../osdk-migrating-to-v0-1-0.adoc | 0 .../osdk-monitoring-prometheus.adoc | 0 release_notes/ocp-4-1-release-notes.adoc | 6 +- release_notes/ocp-4-2-release-notes.adoc | 4 +- .../installing-openshift-serverless.adoc | 4 +- welcome/index.adoc | 16 +-- 93 files changed, 145 insertions(+), 152 deletions(-) delete mode 120000 applications/operators/images delete mode 120000 applications/operators/modules rename {applications/operators => operators}/olm-adding-operators-to-cluster.adoc (100%) rename {applications/operators => operators}/olm-creating-apps-from-installed-operators.adoc (100%) rename {applications/operators => operators}/olm-creating-policy.adoc (100%) rename {applications/operators => operators}/olm-deleting-operators-from-cluster.adoc (100%) rename {applications/operators => operators}/olm-managing-resources-from-crds.adoc (100%) rename {applications/operators => operators}/olm-restricted-networks.adoc (72%) rename {applications/operators => operators}/olm-status.adoc (100%) rename {applications/operators => operators}/olm-understanding-olm.adoc (100%) rename {applications/operators => operators}/olm-understanding-operatorhub.adoc (100%) rename {applications/operators => operators}/olm-what-operators-are.adoc (100%) rename {applications => operators}/operator_sdk/images (100%) rename {applications => operators}/operator_sdk/modules (100%) rename {applications => operators}/operator_sdk/osdk-ansible.adoc (95%) rename {applications => operators}/operator_sdk/osdk-appendices.adoc (100%) rename {applications => operators}/operator_sdk/osdk-cli-reference.adoc (100%) rename {applications => operators}/operator_sdk/osdk-generating-csvs.adoc (100%) rename {applications => operators}/operator_sdk/osdk-getting-started.adoc (94%) rename {applications => operators}/operator_sdk/osdk-helm.adoc (86%) rename {applications => operators}/operator_sdk/osdk-leader-election.adoc (100%) rename {applications => operators}/operator_sdk/osdk-migrating-to-v0-1-0.adoc (100%) rename {applications => operators}/operator_sdk/osdk-monitoring-prometheus.adoc (100%) diff --git a/_topic_map.yml b/_topic_map.yml index 78585e64be..3892b3fae7 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -418,6 +418,61 @@ Topics: File: securing-exposing-registry Distros: openshift-enterprise,openshift-origin --- +Name: Operators +Dir: operators +Topics: +- Name: Understanding Operators + File: olm-what-operators-are +- Name: Understanding the Operator Lifecycle Manager (OLM) + File: olm-understanding-olm +- Name: Understanding the OperatorHub + Distros: openshift-enterprise,openshift-origin + File: olm-understanding-operatorhub +- Name: Adding Operators to a cluster + File: olm-adding-operators-to-cluster + Distros: openshift-enterprise,openshift-origin,openshift-dedicated +- Name: Deleting Operators from a cluster + File: olm-deleting-operators-from-cluster + Distros: openshift-enterprise,openshift-origin,openshift-dedicated +- Name: Creating applications from installed Operators + File: olm-creating-apps-from-installed-operators + Distros: openshift-enterprise,openshift-origin,openshift-dedicated +- Name: Viewing Operator status + File: olm-status + Distros: openshift-enterprise,openshift-origin,openshift-dedicated +- Name: Managing resources from CRDs + File: olm-managing-resources-from-crds + Distros: openshift-origin,openshift-enterprise,openshift-dedicated +- Name: Creating policy for Operator installations and upgrades + File: olm-creating-policy + Distros: openshift-origin,openshift-enterprise +- Name: Configuring OLM for restricted networks + File: olm-restricted-networks + Distros: openshift-origin,openshift-enterprise +- Name: Operator SDK + Dir: operator_sdk + Distros: openshift-origin,openshift-enterprise + Topics: + - Name: Getting started with the Operator SDK + File: osdk-getting-started + - Name: Creating Ansible-based Operators + File: osdk-ansible + - Name: Creating Helm-based Operators + File: osdk-helm + - Name: Generating a ClusterServiceVersion (CSV) + File: osdk-generating-csvs + - Name: Configuring built-in monitoring with Prometheus + File: osdk-monitoring-prometheus + - Name: Configuring leader election + File: osdk-leader-election + - Name: Operator SDK CLI reference + File: osdk-cli-reference + - Name: Migrating to Operator SDK v0.1.0 + File: osdk-migrating-to-v0-1-0 + Distros: openshift-origin + - Name: Appendices + File: osdk-appendices +--- Name: Builds Dir: builds Distros: openshift-enterprise,openshift-origin,openshift-dedicated @@ -521,37 +576,6 @@ Topics: - Name: Configuring project creation File: configuring-project-creation Distros: openshift-enterprise,openshift-origin -- Name: Operators - Dir: operators - Topics: - - Name: Understanding Operators - File: olm-what-operators-are - - Name: Understanding the Operator Lifecycle Manager (OLM) - File: olm-understanding-olm - - Name: Understanding the OperatorHub - Distros: openshift-enterprise,openshift-origin - File: olm-understanding-operatorhub - - Name: Adding Operators to a cluster - File: olm-adding-operators-to-cluster - Distros: openshift-enterprise,openshift-origin,openshift-dedicated - - Name: Deleting Operators from a cluster - File: olm-deleting-operators-from-cluster - Distros: openshift-enterprise,openshift-origin,openshift-dedicated - - Name: Creating applications from installed Operators - File: olm-creating-apps-from-installed-operators - Distros: openshift-enterprise,openshift-origin,openshift-dedicated - - Name: Viewing Operator status - File: olm-status - Distros: openshift-enterprise,openshift-origin,openshift-dedicated - - Name: Managing resources from CRDs - File: olm-managing-resources-from-crds - Distros: openshift-origin,openshift-enterprise,openshift-dedicated - - Name: Creating policy for Operator installations and upgrades - File: olm-creating-policy - Distros: openshift-origin,openshift-enterprise - - Name: Configuring OLM for restricted networks - File: olm-restricted-networks - Distros: openshift-origin,openshift-enterprise - Name: Application life cycle management Dir: application-life-cycle-management Topics: @@ -619,29 +643,6 @@ Topics: - Name: Pruning objects to reclaim resources File: pruning-objects Distros: openshift-origin,openshift-enterprise -- Name: Operator SDK - Dir: operator_sdk - Distros: openshift-origin,openshift-enterprise - Topics: - - Name: Getting started with the Operator SDK - File: osdk-getting-started - - Name: Creating Ansible-based Operators - File: osdk-ansible - - Name: Creating Helm-based Operators - File: osdk-helm - - Name: Generating a ClusterServiceVersion (CSV) - File: osdk-generating-csvs - - Name: Configuring built-in monitoring with Prometheus - File: osdk-monitoring-prometheus - - Name: Configuring leader election - File: osdk-leader-election - - Name: Operator SDK CLI reference - File: osdk-cli-reference - - Name: Migrating to Operator SDK v0.1.0 - File: osdk-migrating-to-v0-1-0 - Distros: openshift-origin - - Name: Appendices - File: osdk-appendices --- Name: Machine management Dir: machine_management @@ -1130,7 +1131,7 @@ Topics: File: cnv-importing-virtual-machine-images-datavolumes-block - Name: Cloning a virtual machine disk into a new block storage DataVolume File: cnv-cloning-vm-disk-into-new-datavolume-block -### Virtual machine live migration +### Virtual machine live migration - Name: Virtual machine live migration File: cnv-live-migration - Name: Live migration limits and timeouts diff --git a/administering_a_cluster/dedicated-admin-role.adoc b/administering_a_cluster/dedicated-admin-role.adoc index dbeae8d351..a47a2934e8 100644 --- a/administering_a_cluster/dedicated-admin-role.adoc +++ b/administering_a_cluster/dedicated-admin-role.adoc @@ -48,4 +48,4 @@ namespace, except for the Cluster Logging Operator, which requires the .Additional resources -* xref:../applications/operators/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[Adding Operators to a cluster] +* xref:../operators/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[Adding Operators to a cluster] diff --git a/applications/operators/images b/applications/operators/images deleted file mode 120000 index 5e67573196..0000000000 --- a/applications/operators/images +++ /dev/null @@ -1 +0,0 @@ -../images \ No newline at end of file diff --git a/applications/operators/modules b/applications/operators/modules deleted file mode 120000 index 464b823aca..0000000000 --- a/applications/operators/modules +++ /dev/null @@ -1 +0,0 @@ -../modules \ No newline at end of file diff --git a/cnv/cnv_install/upgrading-container-native-virtualization.adoc b/cnv/cnv_install/upgrading-container-native-virtualization.adoc index 367463db30..5a9f0b2bc9 100644 --- a/cnv/cnv_install/upgrading-container-native-virtualization.adoc +++ b/cnv/cnv_install/upgrading-container-native-virtualization.adoc @@ -16,4 +16,4 @@ include::modules/cnv-monitoring-upgrade-status.adoc[leveloffset=+1] .Additional information -* xref:../../applications/operators/olm-understanding-olm.adoc#olm-csv_olm-understanding-olm[ClusterServiceVersions (CSVs)] \ No newline at end of file +* xref:../../operators/olm-understanding-olm.adoc#olm-csv_olm-understanding-olm[ClusterServiceVersions (CSVs)] \ No newline at end of file diff --git a/logging/cluster-logging-deploying-about.adoc b/logging/cluster-logging-deploying-about.adoc index 0a3fa3295a..ae3004e25d 100644 --- a/logging/cluster-logging-deploying-about.adoc +++ b/logging/cluster-logging-deploying-about.adoc @@ -18,6 +18,6 @@ include::modules/cluster-logging-deploy-storage-considerations.adoc[leveloffset= == Additional resources -For more information on installing operators,see xref:../applications/operators/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub]. +For more information on installing operators,see xref:../operators/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub]. // For information on scaling your Elasticsearch cluster, see ../logging/config/cluster-logging-elasticsearch.adoc#cluster-logging-elasticsearch-add-remove_cluster-logging-elasticsearch[Scaling your Elasticsearch cluster]. diff --git a/logging/cluster-logging-deploying.adoc b/logging/cluster-logging-deploying.adoc index f2a9a763e8..4c1bf9d501 100644 --- a/logging/cluster-logging-deploying.adoc +++ b/logging/cluster-logging-deploying.adoc @@ -29,4 +29,4 @@ include::modules/cluster-logging-deploy-subscription.adoc[leveloffset=+1] == Additional resources -For more information on installing operators,see xref:../applications/operators/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub]. +For more information on installing operators,see xref:../operators/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub]. diff --git a/modules/building-memcached-operator-using-osdk.adoc b/modules/building-memcached-operator-using-osdk.adoc index c41c85112d..4266370354 100644 --- a/modules/building-memcached-operator-using-osdk.adoc +++ b/modules/building-memcached-operator-using-osdk.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-getting-started.adoc +// * operators/operator_sdk/osdk-getting-started.adoc [id="building-memcached-operator-using-osdk_{context}"] = Building a Go-based Memcached Operator using the Operator SDK diff --git a/modules/crd-creating-custom-resources-from-file.adoc b/modules/crd-creating-custom-resources-from-file.adoc index abcf43a608..1f580cd574 100644 --- a/modules/crd-creating-custom-resources-from-file.adoc +++ b/modules/crd-creating-custom-resources-from-file.adoc @@ -2,7 +2,7 @@ // // Module included in the following assemblies: // -// * applications/operators/olm-managing-resources-from-crds.adoc +// * operators/olm-managing-resources-from-crds.adoc // * applications/crds/crd-managing-resources-from-crds.adoc // * applications/crds/extending-api-with-crds.adoc diff --git a/modules/creating-new-osdk-v0-1-0-project.adoc b/modules/creating-new-osdk-v0-1-0-project.adoc index 7277f9dbb9..a7247b601c 100644 --- a/modules/creating-new-osdk-v0-1-0-project.adoc +++ b/modules/creating-new-osdk-v0-1-0-project.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-migrating-to-v0-1-0.adoc +// * operators/operator_sdk/osdk-migrating-to-v0-1-0.adoc [id="creating-new-operator-sdk-v0-1-0-project_{context}"] = Creating a new Operator SDK v0.1.0 project diff --git a/modules/dedicated-cluster-install-deploy.adoc b/modules/dedicated-cluster-install-deploy.adoc index b8c3c75221..ddef47e8bb 100644 --- a/modules/dedicated-cluster-install-deploy.adoc +++ b/modules/dedicated-cluster-install-deploy.adoc @@ -29,7 +29,7 @@ memory setting though this is not recommended for production deployments. .Procedure -. Install the Elasticsearch Operator via the OperatorHub. See: xref:../applications/operators/olm-adding-operators-to-cluster.adoc[Adding Operators to a cluster]. +. Install the Elasticsearch Operator via the OperatorHub. See: xref:../operators/olm-adding-operators-to-cluster.adoc[Adding Operators to a cluster]. . Install the Cluster Logging Operator using the {product-title} web console for best results: diff --git a/modules/managing-memcached-operator-using-olm.adoc b/modules/managing-memcached-operator-using-olm.adoc index ef29ba2206..d60b0c6af3 100644 --- a/modules/managing-memcached-operator-using-olm.adoc +++ b/modules/managing-memcached-operator-using-olm.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-getting-started.adoc +// * operators/operator_sdk/osdk-getting-started.adoc [id="managing-memcached-operator-using-olm_{context}"] = Managing a Memcached Operator using the Operator Lifecycle Manager diff --git a/modules/migrating-custom-types-pkg-apis.adoc b/modules/migrating-custom-types-pkg-apis.adoc index d32dbf9e36..2c297112ab 100644 --- a/modules/migrating-custom-types-pkg-apis.adoc +++ b/modules/migrating-custom-types-pkg-apis.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-migrating-to-v0-1-0.adoc +// * operators/operator_sdk/osdk-migrating-to-v0-1-0.adoc [id="migrating-custom-types-from-pkg-apis_{context}"] = Migrating custom types from pkg/apis diff --git a/modules/migrating-reconcile-code.adoc b/modules/migrating-reconcile-code.adoc index f78029f9f3..afb01b3015 100644 --- a/modules/migrating-reconcile-code.adoc +++ b/modules/migrating-reconcile-code.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-migrating-to-v0-1-0.adoc +// * operators/operator_sdk/osdk-migrating-to-v0-1-0.adoc [id="migrating-reconcile-code_{context}"] = Migrating reconcile code diff --git a/modules/olm-architecture.adoc b/modules/olm-architecture.adoc index 3dde129615..1010e58cc2 100644 --- a/modules/olm-architecture.adoc +++ b/modules/olm-architecture.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-architecture_{context}"] = Operator Lifecycle Manager architecture diff --git a/modules/olm-creating-etcd-cluster-from-operator.adoc b/modules/olm-creating-etcd-cluster-from-operator.adoc index 6c492655d0..56508afa2f 100644 --- a/modules/olm-creating-etcd-cluster-from-operator.adoc +++ b/modules/olm-creating-etcd-cluster-from-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-apps-from-installed-operators.adoc +// * operators/olm-creating-apps-from-installed-operators.adoc [id="olm-creating-etcd-cluster-from-operator_{context}"] = Creating an etcd cluster using an Operator diff --git a/modules/olm-csv.adoc b/modules/olm-csv.adoc index e7749b5731..259d17cffe 100644 --- a/modules/olm-csv.adoc +++ b/modules/olm-csv.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-csv_{context}"] = ClusterServiceVersions (CSVs) diff --git a/modules/olm-deleting-operators-from-a-cluster-using-cli.adoc b/modules/olm-deleting-operators-from-a-cluster-using-cli.adoc index 883cf2fec9..072a9a3ea4 100644 --- a/modules/olm-deleting-operators-from-a-cluster-using-cli.adoc +++ b/modules/olm-deleting-operators-from-a-cluster-using-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-adding-operators-to-cluster.adoc +// * operators/olm-deleting-operators-to-cluster.adoc [id="olm-deleting-operator-from-a-cluster-using-cli_{context}"] = Deleting Operators from a cluster using the CLI diff --git a/modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc b/modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc index 7af795d842..b33eba0aa4 100644 --- a/modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc +++ b/modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-adding-operators-to-cluster.adoc +// * operators/olm-deleting-operators-to-cluster.adoc [id="olm-deleting-operators-from-a-cluster-using-web-console_{context}"] = Deleting Operators from a cluster using the web console diff --git a/modules/olm-dependency-resolution.adoc b/modules/olm-dependency-resolution.adoc index a6edcb105b..f39d0c7a07 100644 --- a/modules/olm-dependency-resolution.adoc +++ b/modules/olm-dependency-resolution.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-dependency-resolution_{context}"] = Dependency resolution and upgrades diff --git a/modules/olm-installing-from-operatorhub-using-cli.adoc b/modules/olm-installing-from-operatorhub-using-cli.adoc index 544b0a7631..8be22b86f8 100644 --- a/modules/olm-installing-from-operatorhub-using-cli.adoc +++ b/modules/olm-installing-from-operatorhub-using-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-adding-operators-to-cluster.adoc +// * operators/olm-adding-operators-to-cluster.adoc [id="olm-installing-operator-from-operatorhub-using-cli_{context}"] = Installing from the OperatorHub using the CLI diff --git a/modules/olm-installing-from-operatorhub-using-web-console.adoc b/modules/olm-installing-from-operatorhub-using-web-console.adoc index bdcc10d793..bbb2fe4953 100644 --- a/modules/olm-installing-from-operatorhub-using-web-console.adoc +++ b/modules/olm-installing-from-operatorhub-using-web-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-adding-operators-to-cluster.adoc +// * operators/olm-adding-operators-to-cluster.adoc [id="olm-installing-from-operatorhub-using-web-console_{context}"] = Installing from the OperatorHub using the web console diff --git a/modules/olm-installing-operators-from-operatorhub.adoc b/modules/olm-installing-operators-from-operatorhub.adoc index a3a09fcaa8..50d3dc3144 100644 --- a/modules/olm-installing-operators-from-operatorhub.adoc +++ b/modules/olm-installing-operators-from-operatorhub.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-adding-operators-to-cluster.adoc +// * operators/olm-adding-operators-to-cluster.adoc [id="olm-installing-operators-from-operatorhub_{context}"] = Installing Operators from the OperatorHub diff --git a/modules/olm-metrics.adoc b/modules/olm-metrics.adoc index 7483e4ae20..30af4767c3 100644 --- a/modules/olm-metrics.adoc +++ b/modules/olm-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-metrics_{context}"] = Metrics diff --git a/modules/olm-operator-framework.adoc b/modules/olm-operator-framework.adoc index bd7c26ffdf..a04d525ab0 100644 --- a/modules/olm-operator-framework.adoc +++ b/modules/olm-operator-framework.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-what-operators-are.adoc +// * operators/olm-what-operators-are.adoc [id="olm-operator-framework_{context}"] = Operator Framework diff --git a/modules/olm-operator-maturity-model.adoc b/modules/olm-operator-maturity-model.adoc index 7c258e8f97..1c11d3b11c 100644 --- a/modules/olm-operator-maturity-model.adoc +++ b/modules/olm-operator-maturity-model.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-what-operators-are.adoc +// * operators/olm-what-operators-are.adoc [id="olm-maturity-model_{context}"] = Operator maturity model diff --git a/modules/olm-operatorgroups.adoc b/modules/olm-operatorgroups.adoc index 10903086df..e53898597b 100644 --- a/modules/olm-operatorgroups.adoc +++ b/modules/olm-operatorgroups.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-operatorgroups_{context}"] = OperatorGroups diff --git a/modules/olm-operatorhub-architecture.adoc b/modules/olm-operatorhub-architecture.adoc index 77252e5f3f..41defdb8f6 100644 --- a/modules/olm-operatorhub-architecture.adoc +++ b/modules/olm-operatorhub-architecture.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-operatorhub.adoc +// * operators/olm-understanding-operatorhub.adoc [id="olm-operatorhub-arch_{context}"] = OperatorHub architecture diff --git a/modules/olm-operatorhub-overview.adoc b/modules/olm-operatorhub-overview.adoc index ab0abdf74a..9adddde224 100644 --- a/modules/olm-operatorhub-overview.adoc +++ b/modules/olm-operatorhub-overview.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-operatorhub.adoc +// * operators/olm-understanding-operatorhub.adoc [id="olm-operatorhub-overview_{context}"] = Overview of the OperatorHub diff --git a/modules/olm-overview.adoc b/modules/olm-overview.adoc index c4db24cc6e..fa4d9ec01e 100644 --- a/modules/olm-overview.adoc +++ b/modules/olm-overview.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-overview_{context}"] = Overview of the Operator Lifecycle Manager diff --git a/modules/olm-policy-fine-grained-permissions.adoc b/modules/olm-policy-fine-grained-permissions.adoc index 23a7d0eb7c..07c2d5c99c 100644 --- a/modules/olm-policy-fine-grained-permissions.adoc +++ b/modules/olm-policy-fine-grained-permissions.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-policy.adoc +// * operators/olm-creating-policy.adoc [id="olm-policy-fine-grained-permissions_{context}"] = Fine-grained permissions diff --git a/modules/olm-policy-scenarios.adoc b/modules/olm-policy-scenarios.adoc index 7faf122c18..c7abe821b6 100644 --- a/modules/olm-policy-scenarios.adoc +++ b/modules/olm-policy-scenarios.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-policy.adoc +// * operators/olm-creating-policy.adoc [id="olm-policy-scenarios_{context}"] = Installation scenarios diff --git a/modules/olm-policy-scoping-operator-install.adoc b/modules/olm-policy-scoping-operator-install.adoc index 80f5d91273..20467229bc 100644 --- a/modules/olm-policy-scoping-operator-install.adoc +++ b/modules/olm-policy-scoping-operator-install.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-policy.adoc +// * operators/olm-creating-policy.adoc [id="olm-policy-scoping-operator-install_{context}"] = Scoping Operator installations diff --git a/modules/olm-policy-troubleshooting.adoc b/modules/olm-policy-troubleshooting.adoc index 850e356b0a..8b1634afbd 100644 --- a/modules/olm-policy-troubleshooting.adoc +++ b/modules/olm-policy-troubleshooting.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-policy.adoc +// * operators/olm-creating-policy.adoc [id="olm-policy-troubleshooting_{context}"] = Troubleshooting permission failures diff --git a/modules/olm-policy-understanding.adoc b/modules/olm-policy-understanding.adoc index 5210868708..0d4bb6dc14 100644 --- a/modules/olm-policy-understanding.adoc +++ b/modules/olm-policy-understanding.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-policy.adoc +// * operators/olm-creating-policy.adoc [id="olm-policy-understanding_{context}"] = Understanding Operator installation policy diff --git a/modules/olm-policy-workflow.adoc b/modules/olm-policy-workflow.adoc index de852c94c4..30d0363b07 100644 --- a/modules/olm-policy-workflow.adoc +++ b/modules/olm-policy-workflow.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-creating-policy.adoc +// * operators/olm-creating-policy.adoc [id="olm-policy-workflow_{context}"] = Installation workflow diff --git a/modules/olm-restricted-networks-configuring-operatorhub.adoc b/modules/olm-restricted-networks-configuring-operatorhub.adoc index 611fd451cc..e2a283a3b7 100644 --- a/modules/olm-restricted-networks-configuring-operatorhub.adoc +++ b/modules/olm-restricted-networks-configuring-operatorhub.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-restricted-networks.adoc +// * operators/olm-restricted-networks.adoc [id="olm-restricted-networks-operatorhub_{context}"] = Configuring OperatorHub for restricted networks diff --git a/modules/olm-status-conditions.adoc b/modules/olm-status-conditions.adoc index 322cd112f8..5c608ef02d 100644 --- a/modules/olm-status-conditions.adoc +++ b/modules/olm-status-conditions.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-status.adoc +// * operators/olm-status.adoc [id="olm-status-conditions_{context}"] = Condition types diff --git a/modules/olm-status-viewing-cli.adoc b/modules/olm-status-viewing-cli.adoc index 67297ac7f4..da703668a7 100644 --- a/modules/olm-status-viewing-cli.adoc +++ b/modules/olm-status-viewing-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-status.adoc +// * operators/olm-status.adoc [id="olm-status-viewing-cli_{context}"] = Viewing Operator status using the CLI diff --git a/modules/olm-upgrades.adoc b/modules/olm-upgrades.adoc index d94af2bff6..582f3e53e5 100644 --- a/modules/olm-upgrades.adoc +++ b/modules/olm-upgrades.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-understanding-olm.adoc +// * operators/olm-understanding-olm.adoc [id="olm-upgrades_{context}"] = Operator installation and upgrade workflow in OLM diff --git a/modules/olm-why-use-operators.adoc b/modules/olm-why-use-operators.adoc index 12d857b074..f821180483 100644 --- a/modules/olm-why-use-operators.adoc +++ b/modules/olm-why-use-operators.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operators/olm-what-operators-are.adoc +// * operators/olm-what-operators-are.adoc [id="olm-why-use-operators_{context}"] = Why use Operators? diff --git a/modules/osdk-ansible-custom-resource-files.adoc b/modules/osdk-ansible-custom-resource-files.adoc index 207e244483..712820caea 100644 --- a/modules/osdk-ansible-custom-resource-files.adoc +++ b/modules/osdk-ansible-custom-resource-files.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-custom-resource-files_{context}"] = Custom Resource files diff --git a/modules/osdk-ansible-extra-variables.adoc b/modules/osdk-ansible-extra-variables.adoc index ad4d1ba7a5..aa43a6486c 100644 --- a/modules/osdk-ansible-extra-variables.adoc +++ b/modules/osdk-ansible-extra-variables.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-extra-variables_{context}"] = Extra variables sent to Ansible diff --git a/modules/osdk-ansible-k8s-module-inside-operator.adoc b/modules/osdk-ansible-k8s-module-inside-operator.adoc index b89ac60bff..209a4c8e07 100644 --- a/modules/osdk-ansible-k8s-module-inside-operator.adoc +++ b/modules/osdk-ansible-k8s-module-inside-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-k8s-module-inside-operator_{context}"] = Testing the k8s Ansible module inside an Operator diff --git a/modules/osdk-ansible-k8s-module-installing.adoc b/modules/osdk-ansible-k8s-module-installing.adoc index e77584b3d6..4d3dd21710 100644 --- a/modules/osdk-ansible-k8s-module-installing.adoc +++ b/modules/osdk-ansible-k8s-module-installing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-k8s-module-installing_{context}"] = Installing the k8s Ansible module diff --git a/modules/osdk-ansible-k8s-module-testing-locally.adoc b/modules/osdk-ansible-k8s-module-testing-locally.adoc index 89eecfaa84..deb18019d2 100644 --- a/modules/osdk-ansible-k8s-module-testing-locally.adoc +++ b/modules/osdk-ansible-k8s-module-testing-locally.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-k8s-module-testing-locally_{context}"] = Testing the k8s Ansible module locally diff --git a/modules/osdk-ansible-managing-cr-status.adoc b/modules/osdk-ansible-managing-cr-status.adoc index 7acc2bfa3a..1b68d6becd 100644 --- a/modules/osdk-ansible-managing-cr-status.adoc +++ b/modules/osdk-ansible-managing-cr-status.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-managing-cr-status_{context}"] = Managing Custom Resource status using the k8s_status Ansible module diff --git a/modules/osdk-ansible-runner-directory.adoc b/modules/osdk-ansible-runner-directory.adoc index 8ce08606e4..76797f127b 100644 --- a/modules/osdk-ansible-runner-directory.adoc +++ b/modules/osdk-ansible-runner-directory.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-runner-directory_{context}"] = Ansible Runner directory diff --git a/modules/osdk-ansible-support.adoc b/modules/osdk-ansible-support.adoc index fb75ad226a..ccfecebe09 100644 --- a/modules/osdk-ansible-support.adoc +++ b/modules/osdk-ansible-support.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-support_{context}"] = Ansible support in the Operator SDK diff --git a/modules/osdk-ansible-watches-file.adoc b/modules/osdk-ansible-watches-file.adoc index 341c62ee42..c4ee8a9952 100644 --- a/modules/osdk-ansible-watches-file.adoc +++ b/modules/osdk-ansible-watches-file.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-ansible-watches-file_{context}"] = Watches file diff --git a/modules/osdk-apiservices.adoc b/modules/osdk-apiservices.adoc index 0d26b1cf5e..d9d81133b5 100644 --- a/modules/osdk-apiservices.adoc +++ b/modules/osdk-apiservices.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-generating-csvs.adoc +// * operators/operator_sdk/osdk-generating-csvs.adoc [id="osdk-apiservices_{context}"] = Understanding your API services diff --git a/modules/osdk-architecture.adoc b/modules/osdk-architecture.adoc index e53c59e95a..70197f433e 100644 --- a/modules/osdk-architecture.adoc +++ b/modules/osdk-architecture.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-getting-started.adoc +// * operators/operator_sdk/osdk-getting-started.adoc [id="osdk-architecture_{context}"] = Architecture of the Operator SDK diff --git a/modules/osdk-building-ansible-operator.adoc b/modules/osdk-building-ansible-operator.adoc index ffa2ea1390..2b0df32f97 100644 --- a/modules/osdk-building-ansible-operator.adoc +++ b/modules/osdk-building-ansible-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-ansible.adoc [id="osdk-building-ansible-operator_{context}"] = Building an Ansible-based Operator using the Operator SDK diff --git a/modules/osdk-building-helm-operator.adoc b/modules/osdk-building-helm-operator.adoc index bf0e0d46de..1f850b582d 100644 --- a/modules/osdk-building-helm-operator.adoc +++ b/modules/osdk-building-helm-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-helm.adoc +// * operators/operator_sdk/osdk-helm.adoc [id="osdk-building-helm-operator_{context}"] = Building a Helm-based Operator using the Operator SDK diff --git a/modules/osdk-crds.adoc b/modules/osdk-crds.adoc index af8380823c..097b573296 100644 --- a/modules/osdk-crds.adoc +++ b/modules/osdk-crds.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-generating-csvs.adoc +// * operators/operator_sdk/osdk-generating-csvs.adoc [id="osdk-crds_{context}"] = Understanding your Custom Resource Definitions (CRDs) diff --git a/modules/osdk-csv-composition-configuration.adoc b/modules/osdk-csv-composition-configuration.adoc index 8e2d898db0..9270173ea2 100644 --- a/modules/osdk-csv-composition-configuration.adoc +++ b/modules/osdk-csv-composition-configuration.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-generating-csvs.adoc +// * operators/operator_sdk/osdk-generating-csvs.adoc [id="osdk-configuring-csv-composition_{context}"] = CSV composition configuration diff --git a/modules/osdk-generating-a-csv.adoc b/modules/osdk-generating-a-csv.adoc index b460066c7e..fb6f6c216b 100644 --- a/modules/osdk-generating-a-csv.adoc +++ b/modules/osdk-generating-a-csv.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-generating-csvs.adoc +// * operators/operator_sdk/osdk-generating-csvs.adoc [id="osdk-generating-a-csv_{context}"] = Generating a CSV diff --git a/modules/osdk-helm-chart-support.adoc b/modules/osdk-helm-chart-support.adoc index 9cec028413..3b1c22bead 100644 --- a/modules/osdk-helm-chart-support.adoc +++ b/modules/osdk-helm-chart-support.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-helm.adoc +// * operators/operator_sdk/osdk-helm.adoc [id="osdk-helm-chart-support_{context}"] = Helm chart support in the Operator SDK diff --git a/modules/osdk-how-csv-gen-works.adoc b/modules/osdk-how-csv-gen-works.adoc index ed1b4c4418..9e0845f5e4 100644 --- a/modules/osdk-how-csv-gen-works.adoc +++ b/modules/osdk-how-csv-gen-works.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-generating-csvs.adoc +// * operators/operator_sdk/osdk-generating-csvs.adoc [id="osdk-how-csv-gen-works_{context}"] = How CSV generation works diff --git a/modules/osdk-installing-cli.adoc b/modules/osdk-installing-cli.adoc index 1dffcb7686..961f36a7e6 100644 --- a/modules/osdk-installing-cli.adoc +++ b/modules/osdk-installing-cli.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-getting-started.adoc -// * applications/operator_sdk/osdk-ansible.adoc -// * applications/operator_sdk/osdk-helm.adoc +// * operators/operator_sdk/osdk-getting-started.adoc +// * operators/operator_sdk/osdk-ansible.adoc +// * operators/operator_sdk/osdk-helm.adoc [id="osdk-installing-cli_{context}"] = Installing the Operator SDK CLI diff --git a/modules/osdk-leader-election-types.adoc b/modules/osdk-leader-election-types.adoc index 921c138766..de5ae04e58 100644 --- a/modules/osdk-leader-election-types.adoc +++ b/modules/osdk-leader-election-types.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/oosdk-leader-election.adoc +// * operators/operator_sdk/oosdk-leader-election.adoc [id="osdk-leader-for-life-election_{context}"] = Using Leader-for-life election diff --git a/modules/osdk-manually-defined-csv-fields.adoc b/modules/osdk-manually-defined-csv-fields.adoc index fcf2390f9d..5b9f749f9f 100644 --- a/modules/osdk-manually-defined-csv-fields.adoc +++ b/modules/osdk-manually-defined-csv-fields.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-generating-csvs.adoc +// * operators/operator_sdk/osdk-generating-csvs.adoc [id="osdk-manually-defined-csv-fields_{context}"] = Manually-defined CSV fields @@ -91,4 +91,4 @@ a future design document. .Additional resources -- xref:../../applications/operators/olm-what-operators-are.adoc#olm-maturity-model_olm-what-operators-are[Operator maturity model] +- xref:../../operators/olm-what-operators-are.adoc#olm-maturity-model_olm-what-operators-are[Operator maturity model] diff --git a/modules/osdk-monitoring-prometheus-metrics-helper-modifying-port.adoc b/modules/osdk-monitoring-prometheus-metrics-helper-modifying-port.adoc index e3d2e89a49..1286d1bce0 100644 --- a/modules/osdk-monitoring-prometheus-metrics-helper-modifying-port.adoc +++ b/modules/osdk-monitoring-prometheus-metrics-helper-modifying-port.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-monitoring-prometheus.adoc +// * operators/operator_sdk/osdk-monitoring-prometheus.adoc [id="osdk-monitoring-prometheus-metrics-helper-modifying-port_{context}"] = Modifying the metrics port diff --git a/modules/osdk-monitoring-prometheus-metrics-helper.adoc b/modules/osdk-monitoring-prometheus-metrics-helper.adoc index 03425aa8c8..9fdb38fc7a 100644 --- a/modules/osdk-monitoring-prometheus-metrics-helper.adoc +++ b/modules/osdk-monitoring-prometheus-metrics-helper.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-monitoring-prometheus.adoc +// * operators/operator_sdk/osdk-monitoring-prometheus.adoc [id="osdk-monitoring-prometheus-metrics-helper_{context}"] = Metrics helper diff --git a/modules/osdk-monitoring-prometheus-operator-support.adoc b/modules/osdk-monitoring-prometheus-operator-support.adoc index 917201315b..c951e6de4a 100644 --- a/modules/osdk-monitoring-prometheus-operator-support.adoc +++ b/modules/osdk-monitoring-prometheus-operator-support.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-getting-started.adoc -// * applications/operator_sdk/osdk-monitoring-prometheus.adoc +// * operators/operator_sdk/osdk-getting-started.adoc +// * operators/operator_sdk/osdk-monitoring-prometheus.adoc [id="osdk-monitoring-prometheus-operator-support_{context}"] = Prometheus Operator support diff --git a/modules/osdk-monitoring-prometheus-servicemonitor-creating.adoc b/modules/osdk-monitoring-prometheus-servicemonitor-creating.adoc index 12922c7498..eebb51ece0 100644 --- a/modules/osdk-monitoring-prometheus-servicemonitor-creating.adoc +++ b/modules/osdk-monitoring-prometheus-servicemonitor-creating.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-monitoring-prometheus.adoc +// * operators/operator_sdk/osdk-monitoring-prometheus.adoc [id="osdk-monitoring-prometheus-servicemonitor-creating_{context}"] = Creating ServiceMonitor resources diff --git a/modules/osdk-monitoring-prometheus-servicemonitor.adoc b/modules/osdk-monitoring-prometheus-servicemonitor.adoc index 79ec5f7279..ffcadb9d6e 100644 --- a/modules/osdk-monitoring-prometheus-servicemonitor.adoc +++ b/modules/osdk-monitoring-prometheus-servicemonitor.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-monitoring-prometheus.adoc +// * operators/operator_sdk/osdk-monitoring-prometheus.adoc [id="osdk-monitoring-prometheus-servicemonitor_{context}"] = ServiceMonitor resources diff --git a/modules/osdk-project-staffolding-layout.adoc b/modules/osdk-project-staffolding-layout.adoc index c3d5fa27e7..7cd19f48eb 100644 --- a/modules/osdk-project-staffolding-layout.adoc +++ b/modules/osdk-project-staffolding-layout.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * applications/operator_sdk/osdk-appendices.adoc +// * operators/operator_sdk/osdk-appendices.adoc [id="osdk-project-scaffolding-layout_{context}"] = Operator project scaffolding layout diff --git a/applications/operators/olm-adding-operators-to-cluster.adoc b/operators/olm-adding-operators-to-cluster.adoc similarity index 100% rename from applications/operators/olm-adding-operators-to-cluster.adoc rename to operators/olm-adding-operators-to-cluster.adoc diff --git a/applications/operators/olm-creating-apps-from-installed-operators.adoc b/operators/olm-creating-apps-from-installed-operators.adoc similarity index 100% rename from applications/operators/olm-creating-apps-from-installed-operators.adoc rename to operators/olm-creating-apps-from-installed-operators.adoc diff --git a/applications/operators/olm-creating-policy.adoc b/operators/olm-creating-policy.adoc similarity index 100% rename from applications/operators/olm-creating-policy.adoc rename to operators/olm-creating-policy.adoc diff --git a/applications/operators/olm-deleting-operators-from-cluster.adoc b/operators/olm-deleting-operators-from-cluster.adoc similarity index 100% rename from applications/operators/olm-deleting-operators-from-cluster.adoc rename to operators/olm-deleting-operators-from-cluster.adoc diff --git a/applications/operators/olm-managing-resources-from-crds.adoc b/operators/olm-managing-resources-from-crds.adoc similarity index 100% rename from applications/operators/olm-managing-resources-from-crds.adoc rename to operators/olm-managing-resources-from-crds.adoc diff --git a/applications/operators/olm-restricted-networks.adoc b/operators/olm-restricted-networks.adoc similarity index 72% rename from applications/operators/olm-restricted-networks.adoc rename to operators/olm-restricted-networks.adoc index 0b4ddd7db4..1828a157c4 100644 --- a/applications/operators/olm-restricted-networks.adoc +++ b/operators/olm-restricted-networks.adoc @@ -11,17 +11,11 @@ full Internet connectivity. Cluster administrators can disable those default sources and create local mirrors so that OLM can install and manage Operators from the local sources instead. -//// -.Additional resources - -* Link to section about disconnected cluster installations. -//// - include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] .Additional resources * For details on exposing your {product-title} cluster's internal registry to off-cluster access, see -xref:../../registry/securing-exposing-registry.adoc#securing-exposing-registry[Exposing the registry]. +xref:../registry/securing-exposing-registry.adoc#securing-exposing-registry[Exposing the registry]. * For details on accessing the internal registry, see -xref:../../registry/accessing-the-registry.adoc#accessing-the-registry[Accessing the registry]. +xref:../registry/accessing-the-registry.adoc#accessing-the-registry[Accessing the registry]. diff --git a/applications/operators/olm-status.adoc b/operators/olm-status.adoc similarity index 100% rename from applications/operators/olm-status.adoc rename to operators/olm-status.adoc diff --git a/applications/operators/olm-understanding-olm.adoc b/operators/olm-understanding-olm.adoc similarity index 100% rename from applications/operators/olm-understanding-olm.adoc rename to operators/olm-understanding-olm.adoc diff --git a/applications/operators/olm-understanding-operatorhub.adoc b/operators/olm-understanding-operatorhub.adoc similarity index 100% rename from applications/operators/olm-understanding-operatorhub.adoc rename to operators/olm-understanding-operatorhub.adoc diff --git a/applications/operators/olm-what-operators-are.adoc b/operators/olm-what-operators-are.adoc similarity index 100% rename from applications/operators/olm-what-operators-are.adoc rename to operators/olm-what-operators-are.adoc diff --git a/applications/operator_sdk/images b/operators/operator_sdk/images similarity index 100% rename from applications/operator_sdk/images rename to operators/operator_sdk/images diff --git a/applications/operator_sdk/modules b/operators/operator_sdk/modules similarity index 100% rename from applications/operator_sdk/modules rename to operators/operator_sdk/modules diff --git a/applications/operator_sdk/osdk-ansible.adoc b/operators/operator_sdk/osdk-ansible.adoc similarity index 95% rename from applications/operator_sdk/osdk-ansible.adoc rename to operators/operator_sdk/osdk-ansible.adoc index 921eb44945..e3be30ad6a 100644 --- a/applications/operator_sdk/osdk-ansible.adoc +++ b/operators/operator_sdk/osdk-ansible.adoc @@ -45,7 +45,7 @@ include::modules/osdk-ansible-managing-cr-status.adoc[leveloffset=+1] == Additional resources - See -xref:../../applications/operator_sdk/osdk-appendices.adoc#osdk-project-scaffolding-layout_operator-appendices[Appendices] +xref:../../operators/operator_sdk/osdk-appendices.adoc#osdk-project-scaffolding-layout_operator-appendices[Appendices] to learn about the project directory structures created by the Operator SDK. - link:https://blog.openshift.com/reaching-for-the-stars-with-ansible-operator/[Reaching for the Stars with Ansible Operator] - Red Hat OpenShift Blog diff --git a/applications/operator_sdk/osdk-appendices.adoc b/operators/operator_sdk/osdk-appendices.adoc similarity index 100% rename from applications/operator_sdk/osdk-appendices.adoc rename to operators/operator_sdk/osdk-appendices.adoc diff --git a/applications/operator_sdk/osdk-cli-reference.adoc b/operators/operator_sdk/osdk-cli-reference.adoc similarity index 100% rename from applications/operator_sdk/osdk-cli-reference.adoc rename to operators/operator_sdk/osdk-cli-reference.adoc diff --git a/applications/operator_sdk/osdk-generating-csvs.adoc b/operators/operator_sdk/osdk-generating-csvs.adoc similarity index 100% rename from applications/operator_sdk/osdk-generating-csvs.adoc rename to operators/operator_sdk/osdk-generating-csvs.adoc diff --git a/applications/operator_sdk/osdk-getting-started.adoc b/operators/operator_sdk/osdk-getting-started.adoc similarity index 94% rename from applications/operator_sdk/osdk-getting-started.adoc rename to operators/operator_sdk/osdk-getting-started.adoc index 62d9e71d9d..165df69fff 100644 --- a/applications/operator_sdk/osdk-getting-started.adoc +++ b/operators/operator_sdk/osdk-getting-started.adoc @@ -30,7 +30,7 @@ include::modules/managing-memcached-operator-using-olm.adoc[leveloffset=+1] == Additional resources - See -xref:../../applications/operator_sdk/osdk-appendices.adoc#osdk-project-scaffolding-layout_operator-appendices[Appendices] +xref:../../operators/operator_sdk/osdk-appendices.adoc#osdk-project-scaffolding-layout_operator-appendices[Appendices] to learn about the project directory structures created by the Operator SDK. - link:https://operators.gitbook.io/operator-developer-guide-for-red-hat-partners/[Operator Development Guide for Red Hat Partners] diff --git a/applications/operator_sdk/osdk-helm.adoc b/operators/operator_sdk/osdk-helm.adoc similarity index 86% rename from applications/operator_sdk/osdk-helm.adoc rename to operators/operator_sdk/osdk-helm.adoc index f0f3010af7..d92d83ef6f 100644 --- a/applications/operator_sdk/osdk-helm.adoc +++ b/operators/operator_sdk/osdk-helm.adoc @@ -17,7 +17,7 @@ include::modules/osdk-building-helm-operator.adoc[leveloffset=+1] == Additional resources - See -xref:../../applications/operator_sdk/osdk-appendices.adoc#osdk-project-scaffolding-layout_operator-appendices[Appendices] +xref:../../operators/operator_sdk/osdk-appendices.adoc#osdk-project-scaffolding-layout_operator-appendices[Appendices] to learn about the project directory structures created by the Operator SDK. - link:https://operators.gitbook.io/operator-developer-guide-for-red-hat-partners/[Operator Development Guide for Red Hat Partners] diff --git a/applications/operator_sdk/osdk-leader-election.adoc b/operators/operator_sdk/osdk-leader-election.adoc similarity index 100% rename from applications/operator_sdk/osdk-leader-election.adoc rename to operators/operator_sdk/osdk-leader-election.adoc diff --git a/applications/operator_sdk/osdk-migrating-to-v0-1-0.adoc b/operators/operator_sdk/osdk-migrating-to-v0-1-0.adoc similarity index 100% rename from applications/operator_sdk/osdk-migrating-to-v0-1-0.adoc rename to operators/operator_sdk/osdk-migrating-to-v0-1-0.adoc diff --git a/applications/operator_sdk/osdk-monitoring-prometheus.adoc b/operators/operator_sdk/osdk-monitoring-prometheus.adoc similarity index 100% rename from applications/operator_sdk/osdk-monitoring-prometheus.adoc rename to operators/operator_sdk/osdk-monitoring-prometheus.adoc diff --git a/release_notes/ocp-4-1-release-notes.adoc b/release_notes/ocp-4-1-release-notes.adoc index 8ac3d4d957..95280d4d5f 100644 --- a/release_notes/ocp-4-1-release-notes.adoc +++ b/release_notes/ocp-4-1-release-notes.adoc @@ -152,7 +152,7 @@ This release adds improvements related to the following components and concepts. [id="ocp-4-1-operators"] === Operators -xref:../applications/operators/olm-what-operators-are.adoc#olm-what-operators-are[Operators] +xref:../operators/olm-what-operators-are.adoc#olm-what-operators-are[Operators] are pieces of software that ease the operational complexity of running another piece of software. They act like an extension of the software vendor’s engineering team, watching over a Kubernetes environment (such as @@ -174,7 +174,7 @@ access to Operators running on their cluster: * Supports role-based access control (RBAC) for certain teams to use certain Operators See -xref:../applications/operators/olm-understanding-olm.adoc#olm-understanding-olm[Understanding the Operator Lifecycle Manager (OLM)] for more information. +xref:../operators/olm-understanding-olm.adoc#olm-understanding-olm[Understanding the Operator Lifecycle Manager (OLM)] for more information. [id="ocp-4-1-installation-and-upgrade"] === Installation and upgrade @@ -252,7 +252,7 @@ from Red Hat products, Red Hat partners, and the community. |=== See -xref:../applications/operators/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the OperatorHub] for more information. +xref:../operators/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the OperatorHub] for more information. [id="ocp-4-1-storage"] === Storage diff --git a/release_notes/ocp-4-2-release-notes.adoc b/release_notes/ocp-4-2-release-notes.adoc index e2e3fda5a8..83b3113373 100644 --- a/release_notes/ocp-4-2-release-notes.adoc +++ b/release_notes/ocp-4-2-release-notes.adoc @@ -97,7 +97,7 @@ future release. See xref:../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Installing in restricted networks] -and xref:../applications/operators/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks] +and xref:../operators/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks] for details. [id="ocp-4-2-cluster-wide-egresss-proxy"] @@ -155,7 +155,7 @@ Operators in this namespace get equal or lower permissions of this ServiceAccount. See -xref:../applications/operators/olm-creating-policy.adoc#olm-creating-policy[Creating policy for Operator installations and upgrades] +xref:../operators/olm-creating-policy.adoc#olm-creating-policy[Creating policy for Operator installations and upgrades] for details. [id="ocp-4-2-ingress-operator"] diff --git a/serverless/installing-openshift-serverless.adoc b/serverless/installing-openshift-serverless.adoc index 90c1e2bc36..c0777cccde 100644 --- a/serverless/installing-openshift-serverless.adoc +++ b/serverless/installing-openshift-serverless.adoc @@ -49,14 +49,14 @@ You can install the {ServerlessOperatorName} in the host cluster by following th The {ServerlessOperatorName} only works for {product-title} versions 4.1.13 and later. ==== -For details, see the {product-title} documentation on xref:../applications/operators/olm-adding-operators-to-cluster.adoc[adding Operators to a cluster]. +For details, see the {product-title} documentation on xref:../operators/olm-adding-operators-to-cluster.adoc[adding Operators to a cluster]. [id="deleting-openshift-serverless-operator_{context}"] == Deleting the {ServerlessOperatorName} You can remove the {ServerlessOperatorName} from the host cluster by following the {product-title} instructions on deleting an Operator. -For details, see the {product-title} documentation on xref:../applications/operators/olm-deleting-operators-from-cluster.adoc[deleting Operators from a cluster]. +For details, see the {product-title} documentation on xref:../operators/olm-deleting-operators-from-cluster.adoc[deleting Operators from a cluster]. // Installing Knative Serving diff --git a/welcome/index.adoc b/welcome/index.adoc index e7e488036f..83c21d7279 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -44,7 +44,7 @@ containerized applications, from simple containers to advanced Kubernetes deploy - **xref:../applications/projects/working-with-projects.adoc[Work with projects]**: Create projects from the web console or CLI to organize and share the software you develop. -- **xref:../applications/operators/olm-what-operators-are.adoc#olm-what-operators-are[Understand Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn about the Operator Framework and how to deploy applications using installed Operators into your projects. +- **xref:../operators/olm-what-operators-are.adoc#olm-what-operators-are[Understand Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn about the Operator Framework and how to deploy applications using installed Operators into your projects. - **xref:../builds/understanding-image-builds.adoc[Understand image builds]**: Choose from different build strategies (Docker, S2I, custom and pipeline) that can include different kinds of source materials (from places like Git repositories, local binary inputs and external artifacts). Then, follow examples of build types from basic builds to advanced builds. @@ -56,8 +56,8 @@ Use the Workloads page or `oc` CLI to xref:../applications/deployments/managing- - **xref:../openshift_images/using-templates.adoc[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas, exposed ports and other content that defines how an application can be run or built. ifdef::openshift-enterprise,openshift-origin[] -- **xref:../applications/operator_sdk/osdk-getting-started.adoc[Create Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn the workflow for building, testing, and deploying Operators. Then create your own Operators based on xref:../applications/operator_sdk/osdk-ansible.adoc[Ansible] or -xref:../applications/operator_sdk/osdk-helm.adoc[Helm], or configure xref:../applications/operator_sdk/osdk-monitoring-prometheus.adoc[built-in Prometheus monitoring] using the Operator SDK. +- **xref:../operators/operator_sdk/osdk-getting-started.adoc[Create Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn the workflow for building, testing, and deploying Operators. Then create your own Operators based on xref:../operators/operator_sdk/osdk-ansible.adoc[Ansible] or +xref:../operators/operator_sdk/osdk-helm.adoc[Helm], or configure xref:../operators/operator_sdk/osdk-monitoring-prometheus.adoc[built-in Prometheus monitoring] using the Operator SDK. - **Use xref:../applications/service_brokers/installing-template-service-broker.adoc#sb-about-template-service-broker-sb-installing-tsb[Template Service Broker] or xref:../applications/service_brokers/installing-ansible-service-broker.html#sb-about-ansible-service-broker-sb-installing-asb[OpenShift Ansible Broker] applications**: Service brokers are a mechanism for provisioning applications outside of an {product-title} environment. endif::[] @@ -72,7 +72,7 @@ that watch over the cluster. As a cluster administrator, this documentation will help you: - **xref:../architecture/architecture.adoc#architecture-overview-architecture[Understand {product-title} management]**: Learn about components -of the {product-title} {product-version} control plane. See how OpenShift masters and workers are managed and updated through the xref:../machine_management/creating_machinesets/creating-machineset-aws.adoc#machine-api-overview_creating-machineset-aws[Machine API] and xref:../applications/operators/olm-what-operators-are.adoc#machine-api-overview-architecture[Operators]. +of the {product-title} {product-version} control plane. See how OpenShift masters and workers are managed and updated through the xref:../machine_management/creating_machinesets/creating-machineset-aws.adoc#machine-api-overview_creating-machineset-aws[Machine API] and xref:../operators/olm-what-operators-are.adoc#machine-api-overview-architecture[Operators]. === Manage cluster components @@ -122,8 +122,8 @@ As needed, you can xref:../storage/expanding-persistent-volumes.adoc[expand persistent volumes] and configure xref:../storage/dynamic-provisioning.adoc[dynamic provisioning]. -- **xref:../applications/operators/olm-what-operators-are.adoc#olm-what-operators-are[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can -be reviewed by cluster administrators and xref:../applications/operators/olm-adding-operators-to-cluster.adoc[installed on their clusters]. Once installed, you can xref:../applications/operators/olm-creating-apps-from-installed-operators.adoc[run], upgrade, back up or otherwise manage the Operator on your cluster (based on what the Operator is designed to do). +- **xref:../operators/olm-what-operators-are.adoc#olm-what-operators-are[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can +be reviewed by cluster administrators and xref:../operators/olm-adding-operators-to-cluster.adoc[installed on their clusters]. Once installed, you can xref:../operators/olm-creating-apps-from-installed-operators.adoc[run], upgrade, back up or otherwise manage the Operator on your cluster (based on what the Operator is designed to do). === Change cluster components @@ -160,8 +160,8 @@ cluster can be performed by {product-title} cluster administrators. As a - **xref:../administering_a_cluster/dedicated-admin-role.adoc#dedicated-administrator-role[Understand the `dedicated-admin` role]**: Learn about the elevated privileges provided to {product-title} cluster administrators. //// -- **xref:../applications/operators/olm-what-operators-are.adoc[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can -be reviewed by cluster administrators and xref:../applications/operators/olm-adding-operators-to-cluster.adoc[installed on their clusters]. Once installed, you can xref:../applications/operators/olm-creating-apps-from-installed-operators.adoc[run], upgrade, back up or otherwise manage the Operator on your cluster (based on what the Operator is designed to do). +- **xref:../operators/olm-what-operators-are.adoc[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can +be reviewed by cluster administrators and xref:../operators/olm-adding-operators-to-cluster.adoc[installed on their clusters]. Once installed, you can xref:../operators/olm-creating-apps-from-installed-operators.adoc[run], upgrade, back up or otherwise manage the Operator on your cluster (based on what the Operator is designed to do). //// - **xref:../administering_a_cluster/dedicated-admin-role.html#dedicated-managing-administrators_dedicated-administrator[Manage RBAC authorizations]**: Grant permissions to users or groups and manage service accounts.