From 79c56e4ed2ea14a3b150afdddfedea3f558c7307 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <doug.goldstein@rackspace.com>
Date: Thu, 22 Oct 2026 16:16:03 -0500
Subject: [PATCH] refactor: move operators/ into components/

Operators were split between operators/ and components/ with no
functional difference in how they are deployed. Consolidate them under
components/ and update the ArgoCD Application templates, docs, renovate
config and typos config to the new paths.
---
 .github/renovate/mariadb-operator.json                      | 2 +-
 .github/workflows/yamllint.yaml                             | 1 -
 .typos.toml                                                 | 2 +-
 .../templates/application-cnpg-system.yaml                  | 2 +-
 .../templates/application-external-secrets.yaml             | 2 +-
 .../templates/application-mariadb-operator.yaml             | 2 +-
 .../argocd-understack/templates/application-monitoring.yaml | 2 +-
 charts/argocd-understack/templates/application-openebs.yaml | 4 ++--
 .../application-openstack-resource-controller.yaml          | 2 +-
 .../templates/application-opentelemetry-operator.yaml       | 4 ++--
 .../templates/application-rabbitmq-system.yaml              | 2 +-
 .../templates/application-rook-ceph-cluster.yaml            | 4 ++--
 .../templates/application-rook-ceph-operator.yaml           | 4 ++--
 charts/argocd-understack/templates/application-rook.yaml    | 6 +++---
 {operators => components}/cnpg-system/README.md             | 0
 {operators => components}/cnpg-system/kustomization.yaml    | 0
 {operators => components}/cnpg-system/namespace.yaml        | 0
 .../cnpg-system/rule-backups-too-old.yaml                   | 0
 .../cnpg-system/rule-wal-archive-backlog-critical.yaml      | 0
 .../cnpg-system/rule-wal-archive-backlog-warning.yaml       | 0
 .../cnpg-system/rule-wal-archive-failure.yaml               | 0
 {operators => components}/cnpg-system/values.yaml           | 0
 .../external-secrets/kustomization.yaml                     | 0
 {operators => components}/external-secrets/values.yaml      | 0
 .../mariadb-operator/kustomization.yaml                     | 0
 {operators => components}/mariadb-operator/namespace.yaml   | 0
 {operators => components}/mariadb-operator/values.yaml      | 0
 {operators => components}/monitoring/README.md              | 0
 .../monitoring/external-secret-grafana-sso.yaml             | 0
 {operators => components}/monitoring/values.tpl.yaml        | 0
 {operators => components}/monitoring/values.yaml            | 0
 {operators => components}/openebs/values.yaml               | 0
 .../openstack-resource-controller/kustomization.yaml        | 0
 .../secret-openstack-resource-controller.yaml               | 0
 .../opentelemetry-operator/cert-manager-issuer.yaml         | 0
 .../opentelemetry-operator/kustomization.yaml               | 0
 .../opentelemetry-operator/values.yaml                      | 0
 .../rabbitmq-system/cluster-operator/kustomization.yaml     | 0
 .../rabbitmq-system/kustomization.yaml                      | 0
 .../rabbitmq-system/messaging-topology/kustomization.yaml   | 0
 .../rabbitmq-system/monitoring/kustomization.yaml           | 0
 .../monitoring/rabbitmq-cluster-operator-podmonitor.yml     | 0
 .../rabbitmq-system/monitoring/rabbitmq-servicemonitor.yml  | 0
 .../rabbitmq-cluster-operator/unavailable-replicas.yml      | 0
 .../rules/rabbitmq-per-object/queue-has-no-consumers.yml    | 0
 .../rules/rabbitmq-per-object/queue-is-growing.yml          | 0
 .../monitoring/rules/rabbitmq/cluster-alarms.yml            | 0
 .../monitoring/rules/rabbitmq/container-restarts.yml        | 0
 .../rules/rabbitmq/file-descriptors-near-limit.yml          | 0
 .../monitoring/rules/rabbitmq/high-connection-churn.yml     | 0
 .../insufficient-established-erlang-distribution-links.yml  | 0
 .../rules/rabbitmq/low-disk-watermark-predicted.yml         | 0
 .../rules/rabbitmq/no-majority-of-nodes-ready.yml           | 0
 .../monitoring/rules/rabbitmq/persistent-volume-missing.yml | 0
 .../monitoring/rules/rabbitmq/recording-rules.yml           | 0
 .../monitoring/rules/rabbitmq/unroutable-messages.yml       | 0
 {operators => components}/rook/values-cluster.yaml          | 0
 {operators => components}/rook/values-operator.yaml         | 0
 docs-layout-audit.md                                        | 4 ++--
 docs/component-overview.md                                  | 2 +-
 docs/deploy-guide/components/cnpg-system.md                 | 2 +-
 docs/deploy-guide/components/external-secrets.md            | 2 +-
 docs/deploy-guide/components/mariadb-operator.md            | 2 +-
 docs/deploy-guide/components/openebs.md                     | 2 +-
 .../components/openstack-resource-controller.md             | 2 +-
 docs/deploy-guide/components/opentelemetry-operator.md      | 2 +-
 docs/deploy-guide/components/rabbitmq-system.md             | 2 +-
 docs/deploy-guide/components/rook-ceph-cluster.md           | 2 +-
 docs/deploy-guide/components/rook-ceph-operator.md          | 2 +-
 docs/deploy-guide/components/rook.md                        | 2 +-
 docs/operator-guide/mariadb-upgrade-runbook.md              | 2 +-
 71 files changed, 33 insertions(+), 34 deletions(-)
 rename {operators => components}/cnpg-system/README.md (100%)
 rename {operators => components}/cnpg-system/kustomization.yaml (100%)
 rename {operators => components}/cnpg-system/namespace.yaml (100%)
 rename {operators => components}/cnpg-system/rule-backups-too-old.yaml (100%)
 rename {operators => components}/cnpg-system/rule-wal-archive-backlog-critical.yaml (100%)
 rename {operators => components}/cnpg-system/rule-wal-archive-backlog-warning.yaml (100%)
 rename {operators => components}/cnpg-system/rule-wal-archive-failure.yaml (100%)
 rename {operators => components}/cnpg-system/values.yaml (100%)
 rename {operators => components}/external-secrets/kustomization.yaml (100%)
 rename {operators => components}/external-secrets/values.yaml (100%)
 rename {operators => components}/mariadb-operator/kustomization.yaml (100%)
 rename {operators => components}/mariadb-operator/namespace.yaml (100%)
 rename {operators => components}/mariadb-operator/values.yaml (100%)
 rename {operators => components}/monitoring/README.md (100%)
 rename {operators => components}/monitoring/external-secret-grafana-sso.yaml (100%)
 rename {operators => components}/monitoring/values.tpl.yaml (100%)
 rename {operators => components}/monitoring/values.yaml (100%)
 rename {operators => components}/openebs/values.yaml (100%)
 rename {operators => components}/openstack-resource-controller/kustomization.yaml (100%)
 rename {operators => components}/openstack-resource-controller/secret-openstack-resource-controller.yaml (100%)
 rename {operators => components}/opentelemetry-operator/cert-manager-issuer.yaml (100%)
 rename {operators => components}/opentelemetry-operator/kustomization.yaml (100%)
 rename {operators => components}/opentelemetry-operator/values.yaml (100%)
 rename {operators => components}/rabbitmq-system/cluster-operator/kustomization.yaml (100%)
 rename {operators => components}/rabbitmq-system/kustomization.yaml (100%)
 rename {operators => components}/rabbitmq-system/messaging-topology/kustomization.yaml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/kustomization.yaml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rabbitmq-cluster-operator-podmonitor.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rabbitmq-servicemonitor.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq-cluster-operator/unavailable-replicas.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-has-no-consumers.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-is-growing.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/cluster-alarms.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/container-restarts.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/file-descriptors-near-limit.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/high-connection-churn.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/insufficient-established-erlang-distribution-links.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/low-disk-watermark-predicted.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/no-majority-of-nodes-ready.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/persistent-volume-missing.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/recording-rules.yml (100%)
 rename {operators => components}/rabbitmq-system/monitoring/rules/rabbitmq/unroutable-messages.yml (100%)
 rename {operators => components}/rook/values-cluster.yaml (100%)
 rename {operators => components}/rook/values-operator.yaml (100%)

diff --git a/.github/renovate/mariadb-operator.json b/.github/renovate/mariadb-operator.json
index 50d069006..3add348fe 100644
--- a/.github/renovate/mariadb-operator.json
+++ b/.github/renovate/mariadb-operator.json
@@ -6,7 +6,7 @@
   "enabledManagers": ["regex"],
   "regexManagers": [
     {
-      "fileMatch": ["^understack/operators/mariadb-operator/kustomization\\.yaml$"],
+      "fileMatch": ["^understack/components/mariadb-operator/kustomization\\.yaml$"],
       "matchStrings": [
         "(?m)^[ \\t]*- name:\\s*(?<depName>[^\\s]+)[\\s\\S]*?repo:\\s*(?<registryUrl>[^\\s]+)[\\s\\S]*?version:\\s*(?<currentValue>[^\\s]+)"
       ],
diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml
index 27635ca5a..d5b9e8e95 100644
--- a/.github/workflows/yamllint.yaml
+++ b/.github/workflows/yamllint.yaml
@@ -29,7 +29,6 @@ jobs:
           set -o errexit
           set -o pipefail
           items=$(find bootstrap -maxdepth 2 -name kustomization.yaml -exec dirname {} \;)
-          items+=($(find operators -maxdepth 2 -name kustomization.yaml -exec dirname {} \;))
           items+=($(find components -maxdepth 2 -name kustomization.yaml -exec dirname {} \;))
           items+=($(find apps -maxdepth 2 -name kustomization.yaml -exec dirname {} \;))
 
diff --git a/.typos.toml b/.typos.toml
index 517cfdbb5..887086c72 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -34,7 +34,7 @@ ist = "ist"
 retreive = "retreive"
 # Intentionally truncated process names in health probe (15 char limit)
 metadat = "metadat"
-# operators/rook/values-cluster.yaml mentions "ceph-blockpool-ecoded"
+# components/rook/values-cluster.yaml mentions "ceph-blockpool-ecoded"
 ecoded = "ecoded"
 # lazy option is not a typo
 selectin = "selectin"
diff --git a/charts/argocd-understack/templates/application-cnpg-system.yaml b/charts/argocd-understack/templates/application-cnpg-system.yaml
index 4f11ec014..95f24591c 100644
--- a/charts/argocd-understack/templates/application-cnpg-system.yaml
+++ b/charts/argocd-understack/templates/application-cnpg-system.yaml
@@ -15,7 +15,7 @@ spec:
     server: {{ $.Values.cluster_server }}
   project: understack-operators
   sources:
-  - path: operators/cnpg-system
+  - path: components/cnpg-system
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
   syncPolicy:
diff --git a/charts/argocd-understack/templates/application-external-secrets.yaml b/charts/argocd-understack/templates/application-external-secrets.yaml
index eff2d0b79..ec63cf541 100644
--- a/charts/argocd-understack/templates/application-external-secrets.yaml
+++ b/charts/argocd-understack/templates/application-external-secrets.yaml
@@ -18,7 +18,7 @@ spec:
   project: understack-operators
   sources:
   {{- if $installApp }}
-  - path: operators/external-secrets
+  - path: components/external-secrets
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
   {{- end }}
diff --git a/charts/argocd-understack/templates/application-mariadb-operator.yaml b/charts/argocd-understack/templates/application-mariadb-operator.yaml
index 104bbd5ef..2583be12b 100644
--- a/charts/argocd-understack/templates/application-mariadb-operator.yaml
+++ b/charts/argocd-understack/templates/application-mariadb-operator.yaml
@@ -15,7 +15,7 @@ spec:
     server: {{ $.Values.cluster_server }}
   project: understack-operators
   sources:
-  - path: operators/mariadb-operator
+  - path: components/mariadb-operator
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
   syncPolicy:
diff --git a/charts/argocd-understack/templates/application-monitoring.yaml b/charts/argocd-understack/templates/application-monitoring.yaml
index 3dae13af9..0af7c053f 100644
--- a/charts/argocd-understack/templates/application-monitoring.yaml
+++ b/charts/argocd-understack/templates/application-monitoring.yaml
@@ -18,7 +18,7 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: kube-prometheus-stack
       valueFiles:
-      - $understack/operators/monitoring/values.yaml
+      - $understack/components/monitoring/values.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/monitoring/values.yaml
     repoURL: https://prometheus-community.github.io/helm-charts
     targetRevision: 79.5.0
diff --git a/charts/argocd-understack/templates/application-openebs.yaml b/charts/argocd-understack/templates/application-openebs.yaml
index 47aaef3f9..7999b42ec 100644
--- a/charts/argocd-understack/templates/application-openebs.yaml
+++ b/charts/argocd-understack/templates/application-openebs.yaml
@@ -20,11 +20,11 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: openebs
       valueFiles:
-      - $understack/operators/openebs/values.yaml
+      - $understack/components/openebs/values.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/openebs/values.yaml
     repoURL: https://openebs.github.io/openebs
     targetRevision: 4.4.0
-  - path: operators/openebs
+  - path: components/openebs
     ref: understack
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
diff --git a/charts/argocd-understack/templates/application-openstack-resource-controller.yaml b/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
index b748bb34c..dd7262b29 100644
--- a/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
+++ b/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
@@ -15,7 +15,7 @@ spec:
     server: {{ $.Values.cluster_server }}
   project: understack-operators
   sources:
-  - path: operators/openstack-resource-controller
+  - path: components/openstack-resource-controller
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
   syncPolicy:
diff --git a/charts/argocd-understack/templates/application-opentelemetry-operator.yaml b/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
index 78e215d0f..139ce14b7 100644
--- a/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
+++ b/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
@@ -20,11 +20,11 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: opentelemetry-operator
       valueFiles:
-      - $understack/operators/opentelemetry-operator/values.yaml
+      - $understack/components/opentelemetry-operator/values.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/opentelemetry-operator/values.yaml
     repoURL: https://open-telemetry.github.io/opentelemetry-helm-charts
     targetRevision: 0.95.1
-  - path: operators/opentelemetry-operator
+  - path: components/opentelemetry-operator
     ref: understack
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
diff --git a/charts/argocd-understack/templates/application-rabbitmq-system.yaml b/charts/argocd-understack/templates/application-rabbitmq-system.yaml
index 6a749cd42..e4ef26060 100644
--- a/charts/argocd-understack/templates/application-rabbitmq-system.yaml
+++ b/charts/argocd-understack/templates/application-rabbitmq-system.yaml
@@ -15,7 +15,7 @@ spec:
     server: {{ $.Values.cluster_server }}
   project: understack-operators
   sources:
-  - path: operators/rabbitmq-system
+  - path: components/rabbitmq-system
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
   syncPolicy:
diff --git a/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml b/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml
index dc857b39a..fc7a47f00 100644
--- a/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml
+++ b/charts/argocd-understack/templates/application-rook-ceph-cluster.yaml
@@ -24,11 +24,11 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: rook-ceph-cluster
       valueFiles:
-      - $understack/operators/rook/values-cluster.yaml
+      - $understack/components/rook/values-cluster.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/rook-ceph-cluster/values.yaml
     repoURL: https://charts.rook.io/release
     targetRevision: v1.16.4
-  - path: operators/rook
+  - path: components/rook
     ref: understack
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
diff --git a/charts/argocd-understack/templates/application-rook-ceph-operator.yaml b/charts/argocd-understack/templates/application-rook-ceph-operator.yaml
index 1c4aac9b0..685ba4900 100644
--- a/charts/argocd-understack/templates/application-rook-ceph-operator.yaml
+++ b/charts/argocd-understack/templates/application-rook-ceph-operator.yaml
@@ -24,11 +24,11 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: rook-ceph
       valueFiles:
-      - $understack/operators/rook/values-operator.yaml
+      - $understack/components/rook/values-operator.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/rook-ceph-operator/values.yaml
     repoURL: https://charts.rook.io/release
     targetRevision: v1.16.4
-  - path: operators/rook
+  - path: components/rook
     ref: understack
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
diff --git a/charts/argocd-understack/templates/application-rook.yaml b/charts/argocd-understack/templates/application-rook.yaml
index e8efef5e3..d02bcf64b 100644
--- a/charts/argocd-understack/templates/application-rook.yaml
+++ b/charts/argocd-understack/templates/application-rook.yaml
@@ -20,7 +20,7 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: rook-ceph
       valueFiles:
-      - $understack/operators/rook/values-operator.yaml
+      - $understack/components/rook/values-operator.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/rook-operator/values.yaml
     repoURL: https://charts.rook.io/release
     targetRevision: v1.16.4
@@ -29,11 +29,11 @@ spec:
       ignoreMissingValueFiles: true
       releaseName: rook-ceph-cluster
       valueFiles:
-      - $understack/operators/rook/values-cluster.yaml
+      - $understack/components/rook/values-cluster.yaml
       - $deploy/{{ include "understack.deploy_path" $ }}/rook-cluster/values.yaml
     repoURL: https://charts.rook.io/release
     targetRevision: v1.16.4
-  - path: operators/rook
+  - path: components/rook
     ref: understack
     repoURL: {{ include "understack.understack_url" $ }}
     targetRevision: {{ include "understack.understack_ref" $ }}
diff --git a/operators/cnpg-system/README.md b/components/cnpg-system/README.md
similarity index 100%
rename from operators/cnpg-system/README.md
rename to components/cnpg-system/README.md
diff --git a/operators/cnpg-system/kustomization.yaml b/components/cnpg-system/kustomization.yaml
similarity index 100%
rename from operators/cnpg-system/kustomization.yaml
rename to components/cnpg-system/kustomization.yaml
diff --git a/operators/cnpg-system/namespace.yaml b/components/cnpg-system/namespace.yaml
similarity index 100%
rename from operators/cnpg-system/namespace.yaml
rename to components/cnpg-system/namespace.yaml
diff --git a/operators/cnpg-system/rule-backups-too-old.yaml b/components/cnpg-system/rule-backups-too-old.yaml
similarity index 100%
rename from operators/cnpg-system/rule-backups-too-old.yaml
rename to components/cnpg-system/rule-backups-too-old.yaml
diff --git a/operators/cnpg-system/rule-wal-archive-backlog-critical.yaml b/components/cnpg-system/rule-wal-archive-backlog-critical.yaml
similarity index 100%
rename from operators/cnpg-system/rule-wal-archive-backlog-critical.yaml
rename to components/cnpg-system/rule-wal-archive-backlog-critical.yaml
diff --git a/operators/cnpg-system/rule-wal-archive-backlog-warning.yaml b/components/cnpg-system/rule-wal-archive-backlog-warning.yaml
similarity index 100%
rename from operators/cnpg-system/rule-wal-archive-backlog-warning.yaml
rename to components/cnpg-system/rule-wal-archive-backlog-warning.yaml
diff --git a/operators/cnpg-system/rule-wal-archive-failure.yaml b/components/cnpg-system/rule-wal-archive-failure.yaml
similarity index 100%
rename from operators/cnpg-system/rule-wal-archive-failure.yaml
rename to components/cnpg-system/rule-wal-archive-failure.yaml
diff --git a/operators/cnpg-system/values.yaml b/components/cnpg-system/values.yaml
similarity index 100%
rename from operators/cnpg-system/values.yaml
rename to components/cnpg-system/values.yaml
diff --git a/operators/external-secrets/kustomization.yaml b/components/external-secrets/kustomization.yaml
similarity index 100%
rename from operators/external-secrets/kustomization.yaml
rename to components/external-secrets/kustomization.yaml
diff --git a/operators/external-secrets/values.yaml b/components/external-secrets/values.yaml
similarity index 100%
rename from operators/external-secrets/values.yaml
rename to components/external-secrets/values.yaml
diff --git a/operators/mariadb-operator/kustomization.yaml b/components/mariadb-operator/kustomization.yaml
similarity index 100%
rename from operators/mariadb-operator/kustomization.yaml
rename to components/mariadb-operator/kustomization.yaml
diff --git a/operators/mariadb-operator/namespace.yaml b/components/mariadb-operator/namespace.yaml
similarity index 100%
rename from operators/mariadb-operator/namespace.yaml
rename to components/mariadb-operator/namespace.yaml
diff --git a/operators/mariadb-operator/values.yaml b/components/mariadb-operator/values.yaml
similarity index 100%
rename from operators/mariadb-operator/values.yaml
rename to components/mariadb-operator/values.yaml
diff --git a/operators/monitoring/README.md b/components/monitoring/README.md
similarity index 100%
rename from operators/monitoring/README.md
rename to components/monitoring/README.md
diff --git a/operators/monitoring/external-secret-grafana-sso.yaml b/components/monitoring/external-secret-grafana-sso.yaml
similarity index 100%
rename from operators/monitoring/external-secret-grafana-sso.yaml
rename to components/monitoring/external-secret-grafana-sso.yaml
diff --git a/operators/monitoring/values.tpl.yaml b/components/monitoring/values.tpl.yaml
similarity index 100%
rename from operators/monitoring/values.tpl.yaml
rename to components/monitoring/values.tpl.yaml
diff --git a/operators/monitoring/values.yaml b/components/monitoring/values.yaml
similarity index 100%
rename from operators/monitoring/values.yaml
rename to components/monitoring/values.yaml
diff --git a/operators/openebs/values.yaml b/components/openebs/values.yaml
similarity index 100%
rename from operators/openebs/values.yaml
rename to components/openebs/values.yaml
diff --git a/operators/openstack-resource-controller/kustomization.yaml b/components/openstack-resource-controller/kustomization.yaml
similarity index 100%
rename from operators/openstack-resource-controller/kustomization.yaml
rename to components/openstack-resource-controller/kustomization.yaml
diff --git a/operators/openstack-resource-controller/secret-openstack-resource-controller.yaml b/components/openstack-resource-controller/secret-openstack-resource-controller.yaml
similarity index 100%
rename from operators/openstack-resource-controller/secret-openstack-resource-controller.yaml
rename to components/openstack-resource-controller/secret-openstack-resource-controller.yaml
diff --git a/operators/opentelemetry-operator/cert-manager-issuer.yaml b/components/opentelemetry-operator/cert-manager-issuer.yaml
similarity index 100%
rename from operators/opentelemetry-operator/cert-manager-issuer.yaml
rename to components/opentelemetry-operator/cert-manager-issuer.yaml
diff --git a/operators/opentelemetry-operator/kustomization.yaml b/components/opentelemetry-operator/kustomization.yaml
similarity index 100%
rename from operators/opentelemetry-operator/kustomization.yaml
rename to components/opentelemetry-operator/kustomization.yaml
diff --git a/operators/opentelemetry-operator/values.yaml b/components/opentelemetry-operator/values.yaml
similarity index 100%
rename from operators/opentelemetry-operator/values.yaml
rename to components/opentelemetry-operator/values.yaml
diff --git a/operators/rabbitmq-system/cluster-operator/kustomization.yaml b/components/rabbitmq-system/cluster-operator/kustomization.yaml
similarity index 100%
rename from operators/rabbitmq-system/cluster-operator/kustomization.yaml
rename to components/rabbitmq-system/cluster-operator/kustomization.yaml
diff --git a/operators/rabbitmq-system/kustomization.yaml b/components/rabbitmq-system/kustomization.yaml
similarity index 100%
rename from operators/rabbitmq-system/kustomization.yaml
rename to components/rabbitmq-system/kustomization.yaml
diff --git a/operators/rabbitmq-system/messaging-topology/kustomization.yaml b/components/rabbitmq-system/messaging-topology/kustomization.yaml
similarity index 100%
rename from operators/rabbitmq-system/messaging-topology/kustomization.yaml
rename to components/rabbitmq-system/messaging-topology/kustomization.yaml
diff --git a/operators/rabbitmq-system/monitoring/kustomization.yaml b/components/rabbitmq-system/monitoring/kustomization.yaml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/kustomization.yaml
rename to components/rabbitmq-system/monitoring/kustomization.yaml
diff --git a/operators/rabbitmq-system/monitoring/rabbitmq-cluster-operator-podmonitor.yml b/components/rabbitmq-system/monitoring/rabbitmq-cluster-operator-podmonitor.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rabbitmq-cluster-operator-podmonitor.yml
rename to components/rabbitmq-system/monitoring/rabbitmq-cluster-operator-podmonitor.yml
diff --git a/operators/rabbitmq-system/monitoring/rabbitmq-servicemonitor.yml b/components/rabbitmq-system/monitoring/rabbitmq-servicemonitor.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rabbitmq-servicemonitor.yml
rename to components/rabbitmq-system/monitoring/rabbitmq-servicemonitor.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq-cluster-operator/unavailable-replicas.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq-cluster-operator/unavailable-replicas.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq-cluster-operator/unavailable-replicas.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq-cluster-operator/unavailable-replicas.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-has-no-consumers.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-has-no-consumers.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-has-no-consumers.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-has-no-consumers.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-is-growing.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-is-growing.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-is-growing.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq-per-object/queue-is-growing.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/cluster-alarms.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/cluster-alarms.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/cluster-alarms.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/cluster-alarms.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/container-restarts.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/container-restarts.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/container-restarts.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/container-restarts.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/file-descriptors-near-limit.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/file-descriptors-near-limit.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/file-descriptors-near-limit.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/file-descriptors-near-limit.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/high-connection-churn.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/high-connection-churn.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/high-connection-churn.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/high-connection-churn.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/insufficient-established-erlang-distribution-links.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/insufficient-established-erlang-distribution-links.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/insufficient-established-erlang-distribution-links.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/insufficient-established-erlang-distribution-links.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/low-disk-watermark-predicted.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/low-disk-watermark-predicted.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/low-disk-watermark-predicted.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/low-disk-watermark-predicted.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/no-majority-of-nodes-ready.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/no-majority-of-nodes-ready.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/no-majority-of-nodes-ready.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/no-majority-of-nodes-ready.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/persistent-volume-missing.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/persistent-volume-missing.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/persistent-volume-missing.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/persistent-volume-missing.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/recording-rules.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/recording-rules.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/recording-rules.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/recording-rules.yml
diff --git a/operators/rabbitmq-system/monitoring/rules/rabbitmq/unroutable-messages.yml b/components/rabbitmq-system/monitoring/rules/rabbitmq/unroutable-messages.yml
similarity index 100%
rename from operators/rabbitmq-system/monitoring/rules/rabbitmq/unroutable-messages.yml
rename to components/rabbitmq-system/monitoring/rules/rabbitmq/unroutable-messages.yml
diff --git a/operators/rook/values-cluster.yaml b/components/rook/values-cluster.yaml
similarity index 100%
rename from operators/rook/values-cluster.yaml
rename to components/rook/values-cluster.yaml
diff --git a/operators/rook/values-operator.yaml b/components/rook/values-operator.yaml
similarity index 100%
rename from operators/rook/values-operator.yaml
rename to components/rook/values-operator.yaml
diff --git a/docs-layout-audit.md b/docs-layout-audit.md
index 16823f37d..0536b165b 100644
--- a/docs-layout-audit.md
+++ b/docs-layout-audit.md
@@ -320,7 +320,7 @@ Consequences:
   Renaming them to `deploy/` and `operations/` would break seven files outside
   `docs/` for zero content benefit — `charts/argocd-understack/values.yaml` (four
   places) and `README.md` for `deploy-guide/`; `scripts/README.md`,
-  `go/understackctl/README.md`, `operators/monitoring/README.md`,
+  `go/understackctl/README.md`, `components/monitoring/README.md`,
   `examples/openstack-notifications/README.md` and
   `ansible/roles/nova_flavors/README.md` for `operator-guide/`.
 
@@ -497,7 +497,7 @@ therefore cannot be required.
 5. `scripts/check-published-links.py` — assert every
    `rackerlabs.github.io/understack/<path>` reference in non-`docs/` files
    resolves inside the built `site/`. This is the check that would have caught
-   the `operators/monitoring/README.md` 404, and it is what makes future moves
+   the `components/monitoring/README.md` 404, and it is what makes future moves
    safe. It now matters more: `.github/workflows/release-notes.yaml` constructs
    such a URL and writes it into GitHub release bodies, where a 404 is permanent
    because the body is already published. That workflow's URL template belongs in
diff --git a/docs/component-overview.md b/docs/component-overview.md
index 705e5e118..1387656a6 100644
--- a/docs/component-overview.md
+++ b/docs/component-overview.md
@@ -11,7 +11,7 @@ To add an application, you must perform the following steps.
 1. Determine how its deployed. For example as a set of manifests or via [Helm][helm].
 
 1. Create a directory that matches the namespace that you want to
-   deploy to in either `components/` or `operators/`. Populating it with a
+   deploy to in `components/`. Populating it with a
    `kustomization.yaml` or a `values.yaml` or both depending on the proper
    deployment.
 
diff --git a/docs/deploy-guide/components/cnpg-system.md b/docs/deploy-guide/components/cnpg-system.md
index bbaf8405a..653c17d9c 100644
--- a/docs/deploy-guide/components/cnpg-system.md
+++ b/docs/deploy-guide/components/cnpg-system.md
@@ -1,6 +1,6 @@
 ---
 kustomize_paths:
-- operators/cnpg-system
+- components/cnpg-system
 deploy_overrides:
   helm:
     mode: none
diff --git a/docs/deploy-guide/components/external-secrets.md b/docs/deploy-guide/components/external-secrets.md
index b33c44d8f..75b080946 100644
--- a/docs/deploy-guide/components/external-secrets.md
+++ b/docs/deploy-guide/components/external-secrets.md
@@ -1,6 +1,6 @@
 ---
 kustomize_paths:
-- operators/external-secrets
+- components/external-secrets
 deploy_overrides:
   helm:
     mode: none
diff --git a/docs/deploy-guide/components/mariadb-operator.md b/docs/deploy-guide/components/mariadb-operator.md
index b488cca21..23d9b8615 100644
--- a/docs/deploy-guide/components/mariadb-operator.md
+++ b/docs/deploy-guide/components/mariadb-operator.md
@@ -1,6 +1,6 @@
 ---
 kustomize_paths:
-- operators/mariadb-operator
+- components/mariadb-operator
 deploy_overrides:
   helm:
     mode: none
diff --git a/docs/deploy-guide/components/openebs.md b/docs/deploy-guide/components/openebs.md
index 73b643cb9..295fd617d 100644
--- a/docs/deploy-guide/components/openebs.md
+++ b/docs/deploy-guide/components/openebs.md
@@ -2,7 +2,7 @@
 charts:
 - openebs
 kustomize_paths:
-- operators/openebs
+- components/openebs
 deploy_overrides:
   helm:
     mode: values
diff --git a/docs/deploy-guide/components/openstack-resource-controller.md b/docs/deploy-guide/components/openstack-resource-controller.md
index 2602be0da..46795336f 100644
--- a/docs/deploy-guide/components/openstack-resource-controller.md
+++ b/docs/deploy-guide/components/openstack-resource-controller.md
@@ -1,6 +1,6 @@
 ---
 kustomize_paths:
-- operators/openstack-resource-controller
+- components/openstack-resource-controller
 deploy_overrides:
   helm:
     mode: none
diff --git a/docs/deploy-guide/components/opentelemetry-operator.md b/docs/deploy-guide/components/opentelemetry-operator.md
index 1a4144594..0020afa49 100644
--- a/docs/deploy-guide/components/opentelemetry-operator.md
+++ b/docs/deploy-guide/components/opentelemetry-operator.md
@@ -2,7 +2,7 @@
 charts:
 - opentelemetry-operator
 kustomize_paths:
-- operators/opentelemetry-operator
+- components/opentelemetry-operator
 deploy_overrides:
   helm:
     mode: values
diff --git a/docs/deploy-guide/components/rabbitmq-system.md b/docs/deploy-guide/components/rabbitmq-system.md
index bb93952dd..a5373cc96 100644
--- a/docs/deploy-guide/components/rabbitmq-system.md
+++ b/docs/deploy-guide/components/rabbitmq-system.md
@@ -1,6 +1,6 @@
 ---
 kustomize_paths:
-- operators/rabbitmq-system
+- components/rabbitmq-system
 deploy_overrides:
   helm:
     mode: none
diff --git a/docs/deploy-guide/components/rook-ceph-cluster.md b/docs/deploy-guide/components/rook-ceph-cluster.md
index 5b5ada766..da3bc9999 100644
--- a/docs/deploy-guide/components/rook-ceph-cluster.md
+++ b/docs/deploy-guide/components/rook-ceph-cluster.md
@@ -2,7 +2,7 @@
 charts:
 - rook-ceph-cluster
 kustomize_paths:
-- operators/rook
+- components/rook
 deploy_overrides:
   helm:
     mode: values_files
diff --git a/docs/deploy-guide/components/rook-ceph-operator.md b/docs/deploy-guide/components/rook-ceph-operator.md
index 2539beaf5..227f77643 100644
--- a/docs/deploy-guide/components/rook-ceph-operator.md
+++ b/docs/deploy-guide/components/rook-ceph-operator.md
@@ -2,7 +2,7 @@
 charts:
 - rook-ceph
 kustomize_paths:
-- operators/rook
+- components/rook
 deploy_overrides:
   helm:
     mode: values_files
diff --git a/docs/deploy-guide/components/rook.md b/docs/deploy-guide/components/rook.md
index e6249307e..83f64840c 100644
--- a/docs/deploy-guide/components/rook.md
+++ b/docs/deploy-guide/components/rook.md
@@ -3,7 +3,7 @@ charts:
 - rook-ceph
 - rook-ceph-cluster
 kustomize_paths:
-- operators/rook
+- components/rook
 deploy_overrides:
   helm:
     mode: values_files
diff --git a/docs/operator-guide/mariadb-upgrade-runbook.md b/docs/operator-guide/mariadb-upgrade-runbook.md
index 47823e36b..62fe1f723 100644
--- a/docs/operator-guide/mariadb-upgrade-runbook.md
+++ b/docs/operator-guide/mariadb-upgrade-runbook.md
@@ -61,7 +61,7 @@ kubectl get storageclass
 ### 6. Update Mariadb Operator version
 
 - Edit operator reference in:
-   [kustomization.yaml](https://github.com/rackerlabs/understack/blob/main/operators/mariadb-operator/kustomization.yaml)
+   [kustomization.yaml](https://github.com/rackerlabs/understack/blob/main/components/mariadb-operator/kustomization.yaml)
 
 ### 7. Perform the release