From 1841ccd743e4da4bce89e66f9e70d3655737bd16 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Thu, 26 Jun 2025 15:15:40 -0400 Subject: [PATCH] Move the e2e components into a subdirectory This makes it easier to manage the e2e components as a single unit. This is part of the feature-gated API functionality. Signed-off-by: Todd Short --- .../coverage/catalogd_manager_e2e_coverage_patch.yaml | 0 config/components/{ => e2e}/coverage/kustomization.yaml | 0 .../{ => e2e}/coverage/manager_e2e_coverage_copy_pod.yaml | 0 .../{ => e2e}/coverage/manager_e2e_coverage_pvc.yaml | 0 .../operator_controller_manager_e2e_coverage_patch.yaml | 0 config/components/e2e/kustomization.yaml | 5 +++++ .../components/{ => e2e}/registries-conf/kustomization.yaml | 0 .../registries-conf/manager_e2e_registries_conf_patch.yaml | 0 .../{ => e2e}/registries-conf/registries_conf_configmap.yaml | 0 config/overlays/standard-e2e/kustomization.yaml | 3 +-- 10 files changed, 6 insertions(+), 2 deletions(-) rename config/components/{ => e2e}/coverage/catalogd_manager_e2e_coverage_patch.yaml (100%) rename config/components/{ => e2e}/coverage/kustomization.yaml (100%) rename config/components/{ => e2e}/coverage/manager_e2e_coverage_copy_pod.yaml (100%) rename config/components/{ => e2e}/coverage/manager_e2e_coverage_pvc.yaml (100%) rename config/components/{ => e2e}/coverage/operator_controller_manager_e2e_coverage_patch.yaml (100%) create mode 100644 config/components/e2e/kustomization.yaml rename config/components/{ => e2e}/registries-conf/kustomization.yaml (100%) rename config/components/{ => e2e}/registries-conf/manager_e2e_registries_conf_patch.yaml (100%) rename config/components/{ => e2e}/registries-conf/registries_conf_configmap.yaml (100%) diff --git a/config/components/coverage/catalogd_manager_e2e_coverage_patch.yaml b/config/components/e2e/coverage/catalogd_manager_e2e_coverage_patch.yaml similarity index 100% rename from config/components/coverage/catalogd_manager_e2e_coverage_patch.yaml rename to config/components/e2e/coverage/catalogd_manager_e2e_coverage_patch.yaml diff --git a/config/components/coverage/kustomization.yaml b/config/components/e2e/coverage/kustomization.yaml similarity index 100% rename from config/components/coverage/kustomization.yaml rename to config/components/e2e/coverage/kustomization.yaml diff --git a/config/components/coverage/manager_e2e_coverage_copy_pod.yaml b/config/components/e2e/coverage/manager_e2e_coverage_copy_pod.yaml similarity index 100% rename from config/components/coverage/manager_e2e_coverage_copy_pod.yaml rename to config/components/e2e/coverage/manager_e2e_coverage_copy_pod.yaml diff --git a/config/components/coverage/manager_e2e_coverage_pvc.yaml b/config/components/e2e/coverage/manager_e2e_coverage_pvc.yaml similarity index 100% rename from config/components/coverage/manager_e2e_coverage_pvc.yaml rename to config/components/e2e/coverage/manager_e2e_coverage_pvc.yaml diff --git a/config/components/coverage/operator_controller_manager_e2e_coverage_patch.yaml b/config/components/e2e/coverage/operator_controller_manager_e2e_coverage_patch.yaml similarity index 100% rename from config/components/coverage/operator_controller_manager_e2e_coverage_patch.yaml rename to config/components/e2e/coverage/operator_controller_manager_e2e_coverage_patch.yaml diff --git a/config/components/e2e/kustomization.yaml b/config/components/e2e/kustomization.yaml new file mode 100644 index 0000000000..8809ed0f63 --- /dev/null +++ b/config/components/e2e/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +components: +- coverage +- registries-conf diff --git a/config/components/registries-conf/kustomization.yaml b/config/components/e2e/registries-conf/kustomization.yaml similarity index 100% rename from config/components/registries-conf/kustomization.yaml rename to config/components/e2e/registries-conf/kustomization.yaml diff --git a/config/components/registries-conf/manager_e2e_registries_conf_patch.yaml b/config/components/e2e/registries-conf/manager_e2e_registries_conf_patch.yaml similarity index 100% rename from config/components/registries-conf/manager_e2e_registries_conf_patch.yaml rename to config/components/e2e/registries-conf/manager_e2e_registries_conf_patch.yaml diff --git a/config/components/registries-conf/registries_conf_configmap.yaml b/config/components/e2e/registries-conf/registries_conf_configmap.yaml similarity index 100% rename from config/components/registries-conf/registries_conf_configmap.yaml rename to config/components/e2e/registries-conf/registries_conf_configmap.yaml diff --git a/config/overlays/standard-e2e/kustomization.yaml b/config/overlays/standard-e2e/kustomization.yaml index bc83e9fd3b..2bc5403500 100644 --- a/config/overlays/standard-e2e/kustomization.yaml +++ b/config/overlays/standard-e2e/kustomization.yaml @@ -9,7 +9,6 @@ resources: components: - ../../components/tls/catalogd - ../../components/tls/operator-controller -- ../../components/coverage -- ../../components/registries-conf +- ../../components/e2e # ca must be last or other components will overwrite the namespaces - ../../components/tls/ca