From 5d77c44579e55f58734182be6ab2bfae2f9a8a7f Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Mon, 3 Feb 2025 07:41:33 -0600 Subject: [PATCH 1/7] Move catalogd/config directory a level up Signed-off-by: Edmund Ochieng --- .../base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml | 0 {catalogd/config => cata_config}/base/crd/kustomization.yaml | 0 .../base/default/clustercatalogs/default-catalogs.yaml | 0 {catalogd/config => cata_config}/base/default/kustomization.yaml | 0 .../config => cata_config}/base/manager/catalogd_service.yaml | 0 {catalogd/config => cata_config}/base/manager/kustomization.yaml | 0 {catalogd/config => cata_config}/base/manager/manager.yaml | 0 .../config => cata_config}/base/manager/webhook/manifests.yaml | 0 {catalogd/config => cata_config}/base/manager/webhook/patch.yaml | 0 .../config => cata_config}/base/nginx-ingress/kustomization.yaml | 0 .../base/nginx-ingress/resources/nginx_ingress.yaml | 0 .../base/rbac/auth_proxy_client_clusterrole.yaml | 0 {catalogd/config => cata_config}/base/rbac/auth_proxy_role.yaml | 0 .../config => cata_config}/base/rbac/auth_proxy_role_binding.yaml | 0 {catalogd/config => cata_config}/base/rbac/kustomization.yaml | 0 .../config => cata_config}/base/rbac/leader_election_role.yaml | 0 .../base/rbac/leader_election_role_binding.yaml | 0 {catalogd/config => cata_config}/base/rbac/role.yaml | 0 {catalogd/config => cata_config}/base/rbac/role_binding.yaml | 0 {catalogd/config => cata_config}/base/rbac/service_account.yaml | 0 {catalogd/config => cata_config}/components/ca/kustomization.yaml | 0 .../components/ca/patches/manager_deployment_cacerts.yaml | 0 .../config => cata_config}/components/ca/resources/issuers.yaml | 0 .../components/registries-conf/kustomization.yaml | 0 .../registries-conf/manager_e2e_registries_conf_patch.yaml | 0 .../components/registries-conf/registries_conf_configmap.yaml | 0 .../config => cata_config}/components/tls/kustomization.yaml | 0 .../components/tls/patches/catalogd_service_port.yaml | 0 .../components/tls/patches/catalogd_webhook.yaml | 0 .../components/tls/patches/manager_deployment_certs.yaml | 0 .../components/tls/resources/certificate.yaml | 0 .../overlays/cert-manager/kustomization.yaml | 0 {catalogd/config => cata_config}/overlays/e2e/kustomization.yaml | 0 {catalogd/config => cata_config}/rbac/role.yaml | 0 .../config => cata_config}/samples/core_v1_clustercatalog.yaml | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename {catalogd/config => cata_config}/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml (100%) rename {catalogd/config => cata_config}/base/crd/kustomization.yaml (100%) rename {catalogd/config => cata_config}/base/default/clustercatalogs/default-catalogs.yaml (100%) rename {catalogd/config => cata_config}/base/default/kustomization.yaml (100%) rename {catalogd/config => cata_config}/base/manager/catalogd_service.yaml (100%) rename {catalogd/config => cata_config}/base/manager/kustomization.yaml (100%) rename {catalogd/config => cata_config}/base/manager/manager.yaml (100%) rename {catalogd/config => cata_config}/base/manager/webhook/manifests.yaml (100%) rename {catalogd/config => cata_config}/base/manager/webhook/patch.yaml (100%) rename {catalogd/config => cata_config}/base/nginx-ingress/kustomization.yaml (100%) rename {catalogd/config => cata_config}/base/nginx-ingress/resources/nginx_ingress.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/auth_proxy_client_clusterrole.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/auth_proxy_role.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/auth_proxy_role_binding.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/kustomization.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/leader_election_role.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/leader_election_role_binding.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/role.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/role_binding.yaml (100%) rename {catalogd/config => cata_config}/base/rbac/service_account.yaml (100%) rename {catalogd/config => cata_config}/components/ca/kustomization.yaml (100%) rename {catalogd/config => cata_config}/components/ca/patches/manager_deployment_cacerts.yaml (100%) rename {catalogd/config => cata_config}/components/ca/resources/issuers.yaml (100%) rename {catalogd/config => cata_config}/components/registries-conf/kustomization.yaml (100%) rename {catalogd/config => cata_config}/components/registries-conf/manager_e2e_registries_conf_patch.yaml (100%) rename {catalogd/config => cata_config}/components/registries-conf/registries_conf_configmap.yaml (100%) rename {catalogd/config => cata_config}/components/tls/kustomization.yaml (100%) rename {catalogd/config => cata_config}/components/tls/patches/catalogd_service_port.yaml (100%) rename {catalogd/config => cata_config}/components/tls/patches/catalogd_webhook.yaml (100%) rename {catalogd/config => cata_config}/components/tls/patches/manager_deployment_certs.yaml (100%) rename {catalogd/config => cata_config}/components/tls/resources/certificate.yaml (100%) rename {catalogd/config => cata_config}/overlays/cert-manager/kustomization.yaml (100%) rename {catalogd/config => cata_config}/overlays/e2e/kustomization.yaml (100%) rename {catalogd/config => cata_config}/rbac/role.yaml (100%) rename {catalogd/config => cata_config}/samples/core_v1_clustercatalog.yaml (100%) diff --git a/catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml b/cata_config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml similarity index 100% rename from catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml rename to cata_config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml diff --git a/catalogd/config/base/crd/kustomization.yaml b/cata_config/base/crd/kustomization.yaml similarity index 100% rename from catalogd/config/base/crd/kustomization.yaml rename to cata_config/base/crd/kustomization.yaml diff --git a/catalogd/config/base/default/clustercatalogs/default-catalogs.yaml b/cata_config/base/default/clustercatalogs/default-catalogs.yaml similarity index 100% rename from catalogd/config/base/default/clustercatalogs/default-catalogs.yaml rename to cata_config/base/default/clustercatalogs/default-catalogs.yaml diff --git a/catalogd/config/base/default/kustomization.yaml b/cata_config/base/default/kustomization.yaml similarity index 100% rename from catalogd/config/base/default/kustomization.yaml rename to cata_config/base/default/kustomization.yaml diff --git a/catalogd/config/base/manager/catalogd_service.yaml b/cata_config/base/manager/catalogd_service.yaml similarity index 100% rename from catalogd/config/base/manager/catalogd_service.yaml rename to cata_config/base/manager/catalogd_service.yaml diff --git a/catalogd/config/base/manager/kustomization.yaml b/cata_config/base/manager/kustomization.yaml similarity index 100% rename from catalogd/config/base/manager/kustomization.yaml rename to cata_config/base/manager/kustomization.yaml diff --git a/catalogd/config/base/manager/manager.yaml b/cata_config/base/manager/manager.yaml similarity index 100% rename from catalogd/config/base/manager/manager.yaml rename to cata_config/base/manager/manager.yaml diff --git a/catalogd/config/base/manager/webhook/manifests.yaml b/cata_config/base/manager/webhook/manifests.yaml similarity index 100% rename from catalogd/config/base/manager/webhook/manifests.yaml rename to cata_config/base/manager/webhook/manifests.yaml diff --git a/catalogd/config/base/manager/webhook/patch.yaml b/cata_config/base/manager/webhook/patch.yaml similarity index 100% rename from catalogd/config/base/manager/webhook/patch.yaml rename to cata_config/base/manager/webhook/patch.yaml diff --git a/catalogd/config/base/nginx-ingress/kustomization.yaml b/cata_config/base/nginx-ingress/kustomization.yaml similarity index 100% rename from catalogd/config/base/nginx-ingress/kustomization.yaml rename to cata_config/base/nginx-ingress/kustomization.yaml diff --git a/catalogd/config/base/nginx-ingress/resources/nginx_ingress.yaml b/cata_config/base/nginx-ingress/resources/nginx_ingress.yaml similarity index 100% rename from catalogd/config/base/nginx-ingress/resources/nginx_ingress.yaml rename to cata_config/base/nginx-ingress/resources/nginx_ingress.yaml diff --git a/catalogd/config/base/rbac/auth_proxy_client_clusterrole.yaml b/cata_config/base/rbac/auth_proxy_client_clusterrole.yaml similarity index 100% rename from catalogd/config/base/rbac/auth_proxy_client_clusterrole.yaml rename to cata_config/base/rbac/auth_proxy_client_clusterrole.yaml diff --git a/catalogd/config/base/rbac/auth_proxy_role.yaml b/cata_config/base/rbac/auth_proxy_role.yaml similarity index 100% rename from catalogd/config/base/rbac/auth_proxy_role.yaml rename to cata_config/base/rbac/auth_proxy_role.yaml diff --git a/catalogd/config/base/rbac/auth_proxy_role_binding.yaml b/cata_config/base/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from catalogd/config/base/rbac/auth_proxy_role_binding.yaml rename to cata_config/base/rbac/auth_proxy_role_binding.yaml diff --git a/catalogd/config/base/rbac/kustomization.yaml b/cata_config/base/rbac/kustomization.yaml similarity index 100% rename from catalogd/config/base/rbac/kustomization.yaml rename to cata_config/base/rbac/kustomization.yaml diff --git a/catalogd/config/base/rbac/leader_election_role.yaml b/cata_config/base/rbac/leader_election_role.yaml similarity index 100% rename from catalogd/config/base/rbac/leader_election_role.yaml rename to cata_config/base/rbac/leader_election_role.yaml diff --git a/catalogd/config/base/rbac/leader_election_role_binding.yaml b/cata_config/base/rbac/leader_election_role_binding.yaml similarity index 100% rename from catalogd/config/base/rbac/leader_election_role_binding.yaml rename to cata_config/base/rbac/leader_election_role_binding.yaml diff --git a/catalogd/config/base/rbac/role.yaml b/cata_config/base/rbac/role.yaml similarity index 100% rename from catalogd/config/base/rbac/role.yaml rename to cata_config/base/rbac/role.yaml diff --git a/catalogd/config/base/rbac/role_binding.yaml b/cata_config/base/rbac/role_binding.yaml similarity index 100% rename from catalogd/config/base/rbac/role_binding.yaml rename to cata_config/base/rbac/role_binding.yaml diff --git a/catalogd/config/base/rbac/service_account.yaml b/cata_config/base/rbac/service_account.yaml similarity index 100% rename from catalogd/config/base/rbac/service_account.yaml rename to cata_config/base/rbac/service_account.yaml diff --git a/catalogd/config/components/ca/kustomization.yaml b/cata_config/components/ca/kustomization.yaml similarity index 100% rename from catalogd/config/components/ca/kustomization.yaml rename to cata_config/components/ca/kustomization.yaml diff --git a/catalogd/config/components/ca/patches/manager_deployment_cacerts.yaml b/cata_config/components/ca/patches/manager_deployment_cacerts.yaml similarity index 100% rename from catalogd/config/components/ca/patches/manager_deployment_cacerts.yaml rename to cata_config/components/ca/patches/manager_deployment_cacerts.yaml diff --git a/catalogd/config/components/ca/resources/issuers.yaml b/cata_config/components/ca/resources/issuers.yaml similarity index 100% rename from catalogd/config/components/ca/resources/issuers.yaml rename to cata_config/components/ca/resources/issuers.yaml diff --git a/catalogd/config/components/registries-conf/kustomization.yaml b/cata_config/components/registries-conf/kustomization.yaml similarity index 100% rename from catalogd/config/components/registries-conf/kustomization.yaml rename to cata_config/components/registries-conf/kustomization.yaml diff --git a/catalogd/config/components/registries-conf/manager_e2e_registries_conf_patch.yaml b/cata_config/components/registries-conf/manager_e2e_registries_conf_patch.yaml similarity index 100% rename from catalogd/config/components/registries-conf/manager_e2e_registries_conf_patch.yaml rename to cata_config/components/registries-conf/manager_e2e_registries_conf_patch.yaml diff --git a/catalogd/config/components/registries-conf/registries_conf_configmap.yaml b/cata_config/components/registries-conf/registries_conf_configmap.yaml similarity index 100% rename from catalogd/config/components/registries-conf/registries_conf_configmap.yaml rename to cata_config/components/registries-conf/registries_conf_configmap.yaml diff --git a/catalogd/config/components/tls/kustomization.yaml b/cata_config/components/tls/kustomization.yaml similarity index 100% rename from catalogd/config/components/tls/kustomization.yaml rename to cata_config/components/tls/kustomization.yaml diff --git a/catalogd/config/components/tls/patches/catalogd_service_port.yaml b/cata_config/components/tls/patches/catalogd_service_port.yaml similarity index 100% rename from catalogd/config/components/tls/patches/catalogd_service_port.yaml rename to cata_config/components/tls/patches/catalogd_service_port.yaml diff --git a/catalogd/config/components/tls/patches/catalogd_webhook.yaml b/cata_config/components/tls/patches/catalogd_webhook.yaml similarity index 100% rename from catalogd/config/components/tls/patches/catalogd_webhook.yaml rename to cata_config/components/tls/patches/catalogd_webhook.yaml diff --git a/catalogd/config/components/tls/patches/manager_deployment_certs.yaml b/cata_config/components/tls/patches/manager_deployment_certs.yaml similarity index 100% rename from catalogd/config/components/tls/patches/manager_deployment_certs.yaml rename to cata_config/components/tls/patches/manager_deployment_certs.yaml diff --git a/catalogd/config/components/tls/resources/certificate.yaml b/cata_config/components/tls/resources/certificate.yaml similarity index 100% rename from catalogd/config/components/tls/resources/certificate.yaml rename to cata_config/components/tls/resources/certificate.yaml diff --git a/catalogd/config/overlays/cert-manager/kustomization.yaml b/cata_config/overlays/cert-manager/kustomization.yaml similarity index 100% rename from catalogd/config/overlays/cert-manager/kustomization.yaml rename to cata_config/overlays/cert-manager/kustomization.yaml diff --git a/catalogd/config/overlays/e2e/kustomization.yaml b/cata_config/overlays/e2e/kustomization.yaml similarity index 100% rename from catalogd/config/overlays/e2e/kustomization.yaml rename to cata_config/overlays/e2e/kustomization.yaml diff --git a/catalogd/config/rbac/role.yaml b/cata_config/rbac/role.yaml similarity index 100% rename from catalogd/config/rbac/role.yaml rename to cata_config/rbac/role.yaml diff --git a/catalogd/config/samples/core_v1_clustercatalog.yaml b/cata_config/samples/core_v1_clustercatalog.yaml similarity index 100% rename from catalogd/config/samples/core_v1_clustercatalog.yaml rename to cata_config/samples/core_v1_clustercatalog.yaml From bee120b05283c72b3f54e5a24ace7a91c68bb8d0 Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Mon, 3 Feb 2025 10:24:28 -0600 Subject: [PATCH 2/7] move operator-controller/config and catalogd/config into config/{operator-controller, catalogd} respectively Signed-off-by: Edmund Ochieng --- .../base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml | 0 {cata_config => config/catalogd}/base/crd/kustomization.yaml | 0 .../catalogd}/base/default/clustercatalogs/default-catalogs.yaml | 0 {cata_config => config/catalogd}/base/default/kustomization.yaml | 0 .../catalogd}/base/manager/catalogd_service.yaml | 0 {cata_config => config/catalogd}/base/manager/kustomization.yaml | 0 {cata_config => config/catalogd}/base/manager/manager.yaml | 0 .../catalogd}/base/manager/webhook/manifests.yaml | 0 {cata_config => config/catalogd}/base/manager/webhook/patch.yaml | 0 .../catalogd}/base/nginx-ingress/kustomization.yaml | 0 .../catalogd}/base/nginx-ingress/resources/nginx_ingress.yaml | 0 .../catalogd}/base/rbac/auth_proxy_client_clusterrole.yaml | 0 {cata_config => config/catalogd}/base/rbac/auth_proxy_role.yaml | 0 .../catalogd}/base/rbac/auth_proxy_role_binding.yaml | 0 {cata_config => config/catalogd}/base/rbac/kustomization.yaml | 0 .../catalogd}/base/rbac/leader_election_role.yaml | 0 .../catalogd}/base/rbac/leader_election_role_binding.yaml | 0 {cata_config => config/catalogd}/base/rbac/role.yaml | 0 {cata_config => config/catalogd}/base/rbac/role_binding.yaml | 0 {cata_config => config/catalogd}/base/rbac/service_account.yaml | 0 {cata_config => config/catalogd}/components/ca/kustomization.yaml | 0 .../components/ca/patches/manager_deployment_cacerts.yaml | 0 .../catalogd}/components/ca/resources/issuers.yaml | 0 .../catalogd}/components/registries-conf/kustomization.yaml | 0 .../registries-conf/manager_e2e_registries_conf_patch.yaml | 0 .../components/registries-conf/registries_conf_configmap.yaml | 0 .../catalogd}/components/tls/kustomization.yaml | 0 .../catalogd}/components/tls/patches/catalogd_service_port.yaml | 0 .../catalogd}/components/tls/patches/catalogd_webhook.yaml | 0 .../components/tls/patches/manager_deployment_certs.yaml | 0 .../catalogd}/components/tls/resources/certificate.yaml | 0 .../catalogd}/overlays/cert-manager/kustomization.yaml | 0 {cata_config => config/catalogd}/overlays/e2e/kustomization.yaml | 0 {cata_config => config/catalogd}/rbac/role.yaml | 0 .../catalogd}/samples/core_v1_clustercatalog.yaml | 0 config/{ => operator-controller}/README.md | 0 .../crd/bases/olm.operatorframework.io_clusterextensions.yaml | 0 config/{ => operator-controller}/base/crd/kustomization.yaml | 0 config/{ => operator-controller}/base/crd/kustomizeconfig.yaml | 0 config/{ => operator-controller}/base/kustomization.yaml | 0 config/{ => operator-controller}/base/manager/kustomization.yaml | 0 config/{ => operator-controller}/base/manager/manager.yaml | 0 config/{ => operator-controller}/base/manager/service.yaml | 0 .../base/rbac/auth_proxy_client_clusterrole.yaml | 0 config/{ => operator-controller}/base/rbac/auth_proxy_role.yaml | 0 .../base/rbac/auth_proxy_role_binding.yaml | 0 .../base/rbac/clusterextension_editor_role.yaml | 0 .../base/rbac/clusterextension_viewer_role.yaml | 0 .../base/rbac/extension_editor_role.yaml | 0 .../base/rbac/extension_viewer_role.yaml | 0 config/{ => operator-controller}/base/rbac/kustomization.yaml | 0 .../{ => operator-controller}/base/rbac/leader_election_role.yaml | 0 .../base/rbac/leader_election_role_binding.yaml | 0 config/{ => operator-controller}/base/rbac/role.yaml | 0 config/{ => operator-controller}/base/rbac/role_binding.yaml | 0 config/{ => operator-controller}/base/rbac/service_account.yaml | 0 config/{ => operator-controller}/components/ca/issuers.yaml | 0 config/{ => operator-controller}/components/ca/kustomization.yaml | 0 .../components/coverage/kustomization.yaml | 0 .../components/coverage/manager_e2e_coverage_copy_pod.yaml | 0 .../components/coverage/manager_e2e_coverage_patch.yaml | 0 .../components/coverage/manager_e2e_coverage_pvc.yaml | 0 .../components/registries-conf/kustomization.yaml | 0 .../registries-conf/manager_e2e_registries_conf_patch.yaml | 0 .../components/registries-conf/registries_conf_configmap.yaml | 0 .../{ => operator-controller}/components/tls/kustomization.yaml | 0 .../components/tls/patches/manager_deployment_cert.yaml | 0 .../components/tls/resources/manager_cert.yaml | 0 .../overlays/cert-manager/kustomization.yaml | 0 config/{ => operator-controller}/overlays/e2e/kustomization.yaml | 0 .../samples/catalogd_operatorcatalog.yaml | 0 config/{ => operator-controller}/samples/kustomization.yaml | 0 .../samples/olm_v1_clusterextension.yaml | 0 config/{ => operator-controller}/webhook/manifests.yaml | 0 74 files changed, 0 insertions(+), 0 deletions(-) rename {cata_config => config/catalogd}/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml (100%) rename {cata_config => config/catalogd}/base/crd/kustomization.yaml (100%) rename {cata_config => config/catalogd}/base/default/clustercatalogs/default-catalogs.yaml (100%) rename {cata_config => config/catalogd}/base/default/kustomization.yaml (100%) rename {cata_config => config/catalogd}/base/manager/catalogd_service.yaml (100%) rename {cata_config => config/catalogd}/base/manager/kustomization.yaml (100%) rename {cata_config => config/catalogd}/base/manager/manager.yaml (100%) rename {cata_config => config/catalogd}/base/manager/webhook/manifests.yaml (100%) rename {cata_config => config/catalogd}/base/manager/webhook/patch.yaml (100%) rename {cata_config => config/catalogd}/base/nginx-ingress/kustomization.yaml (100%) rename {cata_config => config/catalogd}/base/nginx-ingress/resources/nginx_ingress.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/auth_proxy_client_clusterrole.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/auth_proxy_role.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/auth_proxy_role_binding.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/kustomization.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/leader_election_role.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/leader_election_role_binding.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/role.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/role_binding.yaml (100%) rename {cata_config => config/catalogd}/base/rbac/service_account.yaml (100%) rename {cata_config => config/catalogd}/components/ca/kustomization.yaml (100%) rename {cata_config => config/catalogd}/components/ca/patches/manager_deployment_cacerts.yaml (100%) rename {cata_config => config/catalogd}/components/ca/resources/issuers.yaml (100%) rename {cata_config => config/catalogd}/components/registries-conf/kustomization.yaml (100%) rename {cata_config => config/catalogd}/components/registries-conf/manager_e2e_registries_conf_patch.yaml (100%) rename {cata_config => config/catalogd}/components/registries-conf/registries_conf_configmap.yaml (100%) rename {cata_config => config/catalogd}/components/tls/kustomization.yaml (100%) rename {cata_config => config/catalogd}/components/tls/patches/catalogd_service_port.yaml (100%) rename {cata_config => config/catalogd}/components/tls/patches/catalogd_webhook.yaml (100%) rename {cata_config => config/catalogd}/components/tls/patches/manager_deployment_certs.yaml (100%) rename {cata_config => config/catalogd}/components/tls/resources/certificate.yaml (100%) rename {cata_config => config/catalogd}/overlays/cert-manager/kustomization.yaml (100%) rename {cata_config => config/catalogd}/overlays/e2e/kustomization.yaml (100%) rename {cata_config => config/catalogd}/rbac/role.yaml (100%) rename {cata_config => config/catalogd}/samples/core_v1_clustercatalog.yaml (100%) rename config/{ => operator-controller}/README.md (100%) rename config/{ => operator-controller}/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml (100%) rename config/{ => operator-controller}/base/crd/kustomization.yaml (100%) rename config/{ => operator-controller}/base/crd/kustomizeconfig.yaml (100%) rename config/{ => operator-controller}/base/kustomization.yaml (100%) rename config/{ => operator-controller}/base/manager/kustomization.yaml (100%) rename config/{ => operator-controller}/base/manager/manager.yaml (100%) rename config/{ => operator-controller}/base/manager/service.yaml (100%) rename config/{ => operator-controller}/base/rbac/auth_proxy_client_clusterrole.yaml (100%) rename config/{ => operator-controller}/base/rbac/auth_proxy_role.yaml (100%) rename config/{ => operator-controller}/base/rbac/auth_proxy_role_binding.yaml (100%) rename config/{ => operator-controller}/base/rbac/clusterextension_editor_role.yaml (100%) rename config/{ => operator-controller}/base/rbac/clusterextension_viewer_role.yaml (100%) rename config/{ => operator-controller}/base/rbac/extension_editor_role.yaml (100%) rename config/{ => operator-controller}/base/rbac/extension_viewer_role.yaml (100%) rename config/{ => operator-controller}/base/rbac/kustomization.yaml (100%) rename config/{ => operator-controller}/base/rbac/leader_election_role.yaml (100%) rename config/{ => operator-controller}/base/rbac/leader_election_role_binding.yaml (100%) rename config/{ => operator-controller}/base/rbac/role.yaml (100%) rename config/{ => operator-controller}/base/rbac/role_binding.yaml (100%) rename config/{ => operator-controller}/base/rbac/service_account.yaml (100%) rename config/{ => operator-controller}/components/ca/issuers.yaml (100%) rename config/{ => operator-controller}/components/ca/kustomization.yaml (100%) rename config/{ => operator-controller}/components/coverage/kustomization.yaml (100%) rename config/{ => operator-controller}/components/coverage/manager_e2e_coverage_copy_pod.yaml (100%) rename config/{ => operator-controller}/components/coverage/manager_e2e_coverage_patch.yaml (100%) rename config/{ => operator-controller}/components/coverage/manager_e2e_coverage_pvc.yaml (100%) rename config/{ => operator-controller}/components/registries-conf/kustomization.yaml (100%) rename config/{ => operator-controller}/components/registries-conf/manager_e2e_registries_conf_patch.yaml (100%) rename config/{ => operator-controller}/components/registries-conf/registries_conf_configmap.yaml (100%) rename config/{ => operator-controller}/components/tls/kustomization.yaml (100%) rename config/{ => operator-controller}/components/tls/patches/manager_deployment_cert.yaml (100%) rename config/{ => operator-controller}/components/tls/resources/manager_cert.yaml (100%) rename config/{ => operator-controller}/overlays/cert-manager/kustomization.yaml (100%) rename config/{ => operator-controller}/overlays/e2e/kustomization.yaml (100%) rename config/{ => operator-controller}/samples/catalogd_operatorcatalog.yaml (100%) rename config/{ => operator-controller}/samples/kustomization.yaml (100%) rename config/{ => operator-controller}/samples/olm_v1_clusterextension.yaml (100%) rename config/{ => operator-controller}/webhook/manifests.yaml (100%) diff --git a/cata_config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml b/config/catalogd/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml similarity index 100% rename from cata_config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml rename to config/catalogd/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml diff --git a/cata_config/base/crd/kustomization.yaml b/config/catalogd/base/crd/kustomization.yaml similarity index 100% rename from cata_config/base/crd/kustomization.yaml rename to config/catalogd/base/crd/kustomization.yaml diff --git a/cata_config/base/default/clustercatalogs/default-catalogs.yaml b/config/catalogd/base/default/clustercatalogs/default-catalogs.yaml similarity index 100% rename from cata_config/base/default/clustercatalogs/default-catalogs.yaml rename to config/catalogd/base/default/clustercatalogs/default-catalogs.yaml diff --git a/cata_config/base/default/kustomization.yaml b/config/catalogd/base/default/kustomization.yaml similarity index 100% rename from cata_config/base/default/kustomization.yaml rename to config/catalogd/base/default/kustomization.yaml diff --git a/cata_config/base/manager/catalogd_service.yaml b/config/catalogd/base/manager/catalogd_service.yaml similarity index 100% rename from cata_config/base/manager/catalogd_service.yaml rename to config/catalogd/base/manager/catalogd_service.yaml diff --git a/cata_config/base/manager/kustomization.yaml b/config/catalogd/base/manager/kustomization.yaml similarity index 100% rename from cata_config/base/manager/kustomization.yaml rename to config/catalogd/base/manager/kustomization.yaml diff --git a/cata_config/base/manager/manager.yaml b/config/catalogd/base/manager/manager.yaml similarity index 100% rename from cata_config/base/manager/manager.yaml rename to config/catalogd/base/manager/manager.yaml diff --git a/cata_config/base/manager/webhook/manifests.yaml b/config/catalogd/base/manager/webhook/manifests.yaml similarity index 100% rename from cata_config/base/manager/webhook/manifests.yaml rename to config/catalogd/base/manager/webhook/manifests.yaml diff --git a/cata_config/base/manager/webhook/patch.yaml b/config/catalogd/base/manager/webhook/patch.yaml similarity index 100% rename from cata_config/base/manager/webhook/patch.yaml rename to config/catalogd/base/manager/webhook/patch.yaml diff --git a/cata_config/base/nginx-ingress/kustomization.yaml b/config/catalogd/base/nginx-ingress/kustomization.yaml similarity index 100% rename from cata_config/base/nginx-ingress/kustomization.yaml rename to config/catalogd/base/nginx-ingress/kustomization.yaml diff --git a/cata_config/base/nginx-ingress/resources/nginx_ingress.yaml b/config/catalogd/base/nginx-ingress/resources/nginx_ingress.yaml similarity index 100% rename from cata_config/base/nginx-ingress/resources/nginx_ingress.yaml rename to config/catalogd/base/nginx-ingress/resources/nginx_ingress.yaml diff --git a/cata_config/base/rbac/auth_proxy_client_clusterrole.yaml b/config/catalogd/base/rbac/auth_proxy_client_clusterrole.yaml similarity index 100% rename from cata_config/base/rbac/auth_proxy_client_clusterrole.yaml rename to config/catalogd/base/rbac/auth_proxy_client_clusterrole.yaml diff --git a/cata_config/base/rbac/auth_proxy_role.yaml b/config/catalogd/base/rbac/auth_proxy_role.yaml similarity index 100% rename from cata_config/base/rbac/auth_proxy_role.yaml rename to config/catalogd/base/rbac/auth_proxy_role.yaml diff --git a/cata_config/base/rbac/auth_proxy_role_binding.yaml b/config/catalogd/base/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from cata_config/base/rbac/auth_proxy_role_binding.yaml rename to config/catalogd/base/rbac/auth_proxy_role_binding.yaml diff --git a/cata_config/base/rbac/kustomization.yaml b/config/catalogd/base/rbac/kustomization.yaml similarity index 100% rename from cata_config/base/rbac/kustomization.yaml rename to config/catalogd/base/rbac/kustomization.yaml diff --git a/cata_config/base/rbac/leader_election_role.yaml b/config/catalogd/base/rbac/leader_election_role.yaml similarity index 100% rename from cata_config/base/rbac/leader_election_role.yaml rename to config/catalogd/base/rbac/leader_election_role.yaml diff --git a/cata_config/base/rbac/leader_election_role_binding.yaml b/config/catalogd/base/rbac/leader_election_role_binding.yaml similarity index 100% rename from cata_config/base/rbac/leader_election_role_binding.yaml rename to config/catalogd/base/rbac/leader_election_role_binding.yaml diff --git a/cata_config/base/rbac/role.yaml b/config/catalogd/base/rbac/role.yaml similarity index 100% rename from cata_config/base/rbac/role.yaml rename to config/catalogd/base/rbac/role.yaml diff --git a/cata_config/base/rbac/role_binding.yaml b/config/catalogd/base/rbac/role_binding.yaml similarity index 100% rename from cata_config/base/rbac/role_binding.yaml rename to config/catalogd/base/rbac/role_binding.yaml diff --git a/cata_config/base/rbac/service_account.yaml b/config/catalogd/base/rbac/service_account.yaml similarity index 100% rename from cata_config/base/rbac/service_account.yaml rename to config/catalogd/base/rbac/service_account.yaml diff --git a/cata_config/components/ca/kustomization.yaml b/config/catalogd/components/ca/kustomization.yaml similarity index 100% rename from cata_config/components/ca/kustomization.yaml rename to config/catalogd/components/ca/kustomization.yaml diff --git a/cata_config/components/ca/patches/manager_deployment_cacerts.yaml b/config/catalogd/components/ca/patches/manager_deployment_cacerts.yaml similarity index 100% rename from cata_config/components/ca/patches/manager_deployment_cacerts.yaml rename to config/catalogd/components/ca/patches/manager_deployment_cacerts.yaml diff --git a/cata_config/components/ca/resources/issuers.yaml b/config/catalogd/components/ca/resources/issuers.yaml similarity index 100% rename from cata_config/components/ca/resources/issuers.yaml rename to config/catalogd/components/ca/resources/issuers.yaml diff --git a/cata_config/components/registries-conf/kustomization.yaml b/config/catalogd/components/registries-conf/kustomization.yaml similarity index 100% rename from cata_config/components/registries-conf/kustomization.yaml rename to config/catalogd/components/registries-conf/kustomization.yaml diff --git a/cata_config/components/registries-conf/manager_e2e_registries_conf_patch.yaml b/config/catalogd/components/registries-conf/manager_e2e_registries_conf_patch.yaml similarity index 100% rename from cata_config/components/registries-conf/manager_e2e_registries_conf_patch.yaml rename to config/catalogd/components/registries-conf/manager_e2e_registries_conf_patch.yaml diff --git a/cata_config/components/registries-conf/registries_conf_configmap.yaml b/config/catalogd/components/registries-conf/registries_conf_configmap.yaml similarity index 100% rename from cata_config/components/registries-conf/registries_conf_configmap.yaml rename to config/catalogd/components/registries-conf/registries_conf_configmap.yaml diff --git a/cata_config/components/tls/kustomization.yaml b/config/catalogd/components/tls/kustomization.yaml similarity index 100% rename from cata_config/components/tls/kustomization.yaml rename to config/catalogd/components/tls/kustomization.yaml diff --git a/cata_config/components/tls/patches/catalogd_service_port.yaml b/config/catalogd/components/tls/patches/catalogd_service_port.yaml similarity index 100% rename from cata_config/components/tls/patches/catalogd_service_port.yaml rename to config/catalogd/components/tls/patches/catalogd_service_port.yaml diff --git a/cata_config/components/tls/patches/catalogd_webhook.yaml b/config/catalogd/components/tls/patches/catalogd_webhook.yaml similarity index 100% rename from cata_config/components/tls/patches/catalogd_webhook.yaml rename to config/catalogd/components/tls/patches/catalogd_webhook.yaml diff --git a/cata_config/components/tls/patches/manager_deployment_certs.yaml b/config/catalogd/components/tls/patches/manager_deployment_certs.yaml similarity index 100% rename from cata_config/components/tls/patches/manager_deployment_certs.yaml rename to config/catalogd/components/tls/patches/manager_deployment_certs.yaml diff --git a/cata_config/components/tls/resources/certificate.yaml b/config/catalogd/components/tls/resources/certificate.yaml similarity index 100% rename from cata_config/components/tls/resources/certificate.yaml rename to config/catalogd/components/tls/resources/certificate.yaml diff --git a/cata_config/overlays/cert-manager/kustomization.yaml b/config/catalogd/overlays/cert-manager/kustomization.yaml similarity index 100% rename from cata_config/overlays/cert-manager/kustomization.yaml rename to config/catalogd/overlays/cert-manager/kustomization.yaml diff --git a/cata_config/overlays/e2e/kustomization.yaml b/config/catalogd/overlays/e2e/kustomization.yaml similarity index 100% rename from cata_config/overlays/e2e/kustomization.yaml rename to config/catalogd/overlays/e2e/kustomization.yaml diff --git a/cata_config/rbac/role.yaml b/config/catalogd/rbac/role.yaml similarity index 100% rename from cata_config/rbac/role.yaml rename to config/catalogd/rbac/role.yaml diff --git a/cata_config/samples/core_v1_clustercatalog.yaml b/config/catalogd/samples/core_v1_clustercatalog.yaml similarity index 100% rename from cata_config/samples/core_v1_clustercatalog.yaml rename to config/catalogd/samples/core_v1_clustercatalog.yaml diff --git a/config/README.md b/config/operator-controller/README.md similarity index 100% rename from config/README.md rename to config/operator-controller/README.md diff --git a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml b/config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml similarity index 100% rename from config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml rename to config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml diff --git a/config/base/crd/kustomization.yaml b/config/operator-controller/base/crd/kustomization.yaml similarity index 100% rename from config/base/crd/kustomization.yaml rename to config/operator-controller/base/crd/kustomization.yaml diff --git a/config/base/crd/kustomizeconfig.yaml b/config/operator-controller/base/crd/kustomizeconfig.yaml similarity index 100% rename from config/base/crd/kustomizeconfig.yaml rename to config/operator-controller/base/crd/kustomizeconfig.yaml diff --git a/config/base/kustomization.yaml b/config/operator-controller/base/kustomization.yaml similarity index 100% rename from config/base/kustomization.yaml rename to config/operator-controller/base/kustomization.yaml diff --git a/config/base/manager/kustomization.yaml b/config/operator-controller/base/manager/kustomization.yaml similarity index 100% rename from config/base/manager/kustomization.yaml rename to config/operator-controller/base/manager/kustomization.yaml diff --git a/config/base/manager/manager.yaml b/config/operator-controller/base/manager/manager.yaml similarity index 100% rename from config/base/manager/manager.yaml rename to config/operator-controller/base/manager/manager.yaml diff --git a/config/base/manager/service.yaml b/config/operator-controller/base/manager/service.yaml similarity index 100% rename from config/base/manager/service.yaml rename to config/operator-controller/base/manager/service.yaml diff --git a/config/base/rbac/auth_proxy_client_clusterrole.yaml b/config/operator-controller/base/rbac/auth_proxy_client_clusterrole.yaml similarity index 100% rename from config/base/rbac/auth_proxy_client_clusterrole.yaml rename to config/operator-controller/base/rbac/auth_proxy_client_clusterrole.yaml diff --git a/config/base/rbac/auth_proxy_role.yaml b/config/operator-controller/base/rbac/auth_proxy_role.yaml similarity index 100% rename from config/base/rbac/auth_proxy_role.yaml rename to config/operator-controller/base/rbac/auth_proxy_role.yaml diff --git a/config/base/rbac/auth_proxy_role_binding.yaml b/config/operator-controller/base/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from config/base/rbac/auth_proxy_role_binding.yaml rename to config/operator-controller/base/rbac/auth_proxy_role_binding.yaml diff --git a/config/base/rbac/clusterextension_editor_role.yaml b/config/operator-controller/base/rbac/clusterextension_editor_role.yaml similarity index 100% rename from config/base/rbac/clusterextension_editor_role.yaml rename to config/operator-controller/base/rbac/clusterextension_editor_role.yaml diff --git a/config/base/rbac/clusterextension_viewer_role.yaml b/config/operator-controller/base/rbac/clusterextension_viewer_role.yaml similarity index 100% rename from config/base/rbac/clusterextension_viewer_role.yaml rename to config/operator-controller/base/rbac/clusterextension_viewer_role.yaml diff --git a/config/base/rbac/extension_editor_role.yaml b/config/operator-controller/base/rbac/extension_editor_role.yaml similarity index 100% rename from config/base/rbac/extension_editor_role.yaml rename to config/operator-controller/base/rbac/extension_editor_role.yaml diff --git a/config/base/rbac/extension_viewer_role.yaml b/config/operator-controller/base/rbac/extension_viewer_role.yaml similarity index 100% rename from config/base/rbac/extension_viewer_role.yaml rename to config/operator-controller/base/rbac/extension_viewer_role.yaml diff --git a/config/base/rbac/kustomization.yaml b/config/operator-controller/base/rbac/kustomization.yaml similarity index 100% rename from config/base/rbac/kustomization.yaml rename to config/operator-controller/base/rbac/kustomization.yaml diff --git a/config/base/rbac/leader_election_role.yaml b/config/operator-controller/base/rbac/leader_election_role.yaml similarity index 100% rename from config/base/rbac/leader_election_role.yaml rename to config/operator-controller/base/rbac/leader_election_role.yaml diff --git a/config/base/rbac/leader_election_role_binding.yaml b/config/operator-controller/base/rbac/leader_election_role_binding.yaml similarity index 100% rename from config/base/rbac/leader_election_role_binding.yaml rename to config/operator-controller/base/rbac/leader_election_role_binding.yaml diff --git a/config/base/rbac/role.yaml b/config/operator-controller/base/rbac/role.yaml similarity index 100% rename from config/base/rbac/role.yaml rename to config/operator-controller/base/rbac/role.yaml diff --git a/config/base/rbac/role_binding.yaml b/config/operator-controller/base/rbac/role_binding.yaml similarity index 100% rename from config/base/rbac/role_binding.yaml rename to config/operator-controller/base/rbac/role_binding.yaml diff --git a/config/base/rbac/service_account.yaml b/config/operator-controller/base/rbac/service_account.yaml similarity index 100% rename from config/base/rbac/service_account.yaml rename to config/operator-controller/base/rbac/service_account.yaml diff --git a/config/components/ca/issuers.yaml b/config/operator-controller/components/ca/issuers.yaml similarity index 100% rename from config/components/ca/issuers.yaml rename to config/operator-controller/components/ca/issuers.yaml diff --git a/config/components/ca/kustomization.yaml b/config/operator-controller/components/ca/kustomization.yaml similarity index 100% rename from config/components/ca/kustomization.yaml rename to config/operator-controller/components/ca/kustomization.yaml diff --git a/config/components/coverage/kustomization.yaml b/config/operator-controller/components/coverage/kustomization.yaml similarity index 100% rename from config/components/coverage/kustomization.yaml rename to config/operator-controller/components/coverage/kustomization.yaml diff --git a/config/components/coverage/manager_e2e_coverage_copy_pod.yaml b/config/operator-controller/components/coverage/manager_e2e_coverage_copy_pod.yaml similarity index 100% rename from config/components/coverage/manager_e2e_coverage_copy_pod.yaml rename to config/operator-controller/components/coverage/manager_e2e_coverage_copy_pod.yaml diff --git a/config/components/coverage/manager_e2e_coverage_patch.yaml b/config/operator-controller/components/coverage/manager_e2e_coverage_patch.yaml similarity index 100% rename from config/components/coverage/manager_e2e_coverage_patch.yaml rename to config/operator-controller/components/coverage/manager_e2e_coverage_patch.yaml diff --git a/config/components/coverage/manager_e2e_coverage_pvc.yaml b/config/operator-controller/components/coverage/manager_e2e_coverage_pvc.yaml similarity index 100% rename from config/components/coverage/manager_e2e_coverage_pvc.yaml rename to config/operator-controller/components/coverage/manager_e2e_coverage_pvc.yaml diff --git a/config/components/registries-conf/kustomization.yaml b/config/operator-controller/components/registries-conf/kustomization.yaml similarity index 100% rename from config/components/registries-conf/kustomization.yaml rename to config/operator-controller/components/registries-conf/kustomization.yaml diff --git a/config/components/registries-conf/manager_e2e_registries_conf_patch.yaml b/config/operator-controller/components/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/operator-controller/components/registries-conf/manager_e2e_registries_conf_patch.yaml diff --git a/config/components/registries-conf/registries_conf_configmap.yaml b/config/operator-controller/components/registries-conf/registries_conf_configmap.yaml similarity index 100% rename from config/components/registries-conf/registries_conf_configmap.yaml rename to config/operator-controller/components/registries-conf/registries_conf_configmap.yaml diff --git a/config/components/tls/kustomization.yaml b/config/operator-controller/components/tls/kustomization.yaml similarity index 100% rename from config/components/tls/kustomization.yaml rename to config/operator-controller/components/tls/kustomization.yaml diff --git a/config/components/tls/patches/manager_deployment_cert.yaml b/config/operator-controller/components/tls/patches/manager_deployment_cert.yaml similarity index 100% rename from config/components/tls/patches/manager_deployment_cert.yaml rename to config/operator-controller/components/tls/patches/manager_deployment_cert.yaml diff --git a/config/components/tls/resources/manager_cert.yaml b/config/operator-controller/components/tls/resources/manager_cert.yaml similarity index 100% rename from config/components/tls/resources/manager_cert.yaml rename to config/operator-controller/components/tls/resources/manager_cert.yaml diff --git a/config/overlays/cert-manager/kustomization.yaml b/config/operator-controller/overlays/cert-manager/kustomization.yaml similarity index 100% rename from config/overlays/cert-manager/kustomization.yaml rename to config/operator-controller/overlays/cert-manager/kustomization.yaml diff --git a/config/overlays/e2e/kustomization.yaml b/config/operator-controller/overlays/e2e/kustomization.yaml similarity index 100% rename from config/overlays/e2e/kustomization.yaml rename to config/operator-controller/overlays/e2e/kustomization.yaml diff --git a/config/samples/catalogd_operatorcatalog.yaml b/config/operator-controller/samples/catalogd_operatorcatalog.yaml similarity index 100% rename from config/samples/catalogd_operatorcatalog.yaml rename to config/operator-controller/samples/catalogd_operatorcatalog.yaml diff --git a/config/samples/kustomization.yaml b/config/operator-controller/samples/kustomization.yaml similarity index 100% rename from config/samples/kustomization.yaml rename to config/operator-controller/samples/kustomization.yaml diff --git a/config/samples/olm_v1_clusterextension.yaml b/config/operator-controller/samples/olm_v1_clusterextension.yaml similarity index 100% rename from config/samples/olm_v1_clusterextension.yaml rename to config/operator-controller/samples/olm_v1_clusterextension.yaml diff --git a/config/webhook/manifests.yaml b/config/operator-controller/webhook/manifests.yaml similarity index 100% rename from config/webhook/manifests.yaml rename to config/operator-controller/webhook/manifests.yaml From 125ce9457aaf2bc0454de22a0f0cafaefc12b6ca Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Mon, 3 Feb 2025 10:25:02 -0600 Subject: [PATCH 3/7] Update config paths in Makefile Signed-off-by: Edmund Ochieng --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5625d8696..e81bf2520 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ else $(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!) endif -KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager +KUSTOMIZE_BUILD_DIR := config/operator-controller/overlays/cert-manager # Disable -j flag for make .NOTPARALLEL: @@ -107,8 +107,8 @@ tidy: #HELP Update dependencies. .PHONY: manifests manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole, and CustomResourceDefinition objects. # To generate the manifests used and do not use catalogd directory - $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/... output:rbac:artifacts:config=config/base/rbac - $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=config/base/crd/bases + $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/... output:rbac:artifacts:config=config/operator-controller/base/rbac + $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=config/operator-controller/base/crd/bases # To generate the manifests for catalogd $(MAKE) -C catalogd generate @@ -141,15 +141,14 @@ bingo-upgrade: $(BINGO) #EXHELP Upgrade tools .PHONY: verify-crd-compatibility CRD_DIFF_ORIGINAL_REF := main -CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml +CRD_DIFF_UPDATED_SOURCE := file://config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml CATALOGD_CRD_DIFF_UPDATED_SOURCE := file://catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml CRD_DIFF_CONFIG := crd-diff-config.yaml verify-crd-compatibility: $(CRD_DIFF) manifests - $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE} + $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE} $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CATALOGD_CRD_DIFF_UPDATED_SOURCE} - .PHONY: test test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests. @@ -209,12 +208,12 @@ image-registry: ## Build the testdata catalog used for e2e tests and push it to # for example: ARTIFACT_PATH=/tmp/artifacts make test-e2e .PHONY: test-e2e test-e2e: KIND_CLUSTER_NAME := operator-controller-e2e -test-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/e2e +test-e2e: KUSTOMIZE_BUILD_DIR := config/operator-controller/overlays/e2e test-e2e: GO_BUILD_FLAGS := -cover test-e2e: run image-registry e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster .PHONY: extension-developer-e2e -extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager +extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/operator-controller/overlays/cert-manager extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e #EXHELP Run extension-developer e2e on local kind cluster extension-developer-e2e: export INSTALL_DEFAULT_CATALOGS := false #EXHELP Run extension-developer e2e on local kind cluster extension-developer-e2e: run image-registry test-ext-dev-e2e kind-clean From cf345b5827c8404cc0c08cf1f69e3d3edc748a25 Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Tue, 4 Feb 2025 08:36:22 -0600 Subject: [PATCH 4/7] Move catalogd/Makefile to Makefile.catalogd Signed-off-by: Edmund Ochieng --- Makefile | 2 +- catalogd/Makefile => Makefile.catalogd | 34 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) rename catalogd/Makefile => Makefile.catalogd (86%) diff --git a/Makefile b/Makefile index e81bf2520..25792ec7c 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ bingo-upgrade: $(BINGO) #EXHELP Upgrade tools .PHONY: verify-crd-compatibility CRD_DIFF_ORIGINAL_REF := main CRD_DIFF_UPDATED_SOURCE := file://config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml -CATALOGD_CRD_DIFF_UPDATED_SOURCE := file://catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml +CATALOGD_CRD_DIFF_UPDATED_SOURCE := file://config/catalogd/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml CRD_DIFF_CONFIG := crd-diff-config.yaml verify-crd-compatibility: $(CRD_DIFF) manifests diff --git a/catalogd/Makefile b/Makefile.catalogd similarity index 86% rename from catalogd/Makefile rename to Makefile.catalogd index ce56ed52a..a1916fa47 100644 --- a/catalogd/Makefile +++ b/Makefile.catalogd @@ -24,10 +24,10 @@ $(warning Could not find docker or podman in path! This may result in targets re endif # For standard development and release flows, we use the config/overlays/cert-manager overlay. -KUSTOMIZE_OVERLAY := config/overlays/cert-manager +KUSTOMIZE_OVERLAY := config/catalogd/overlays/cert-manager # bingo manages consistent tooling versions for things like kind, kustomize, etc. -include ./../.bingo/Variables.mk +include ./.bingo/Variables.mk # Dependencies export CERT_MGR_VERSION := v1.15.3 @@ -67,24 +67,24 @@ help: ## Display this help. ##@ Development clean: ## Remove binaries and test artifacts - rm -rf bin + rm -rf catalogd/bin .PHONY: generate generate: $(CONTROLLER_GEN) ## Generate code and manifests. - $(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..." - $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/base/crd/bases output:rbac:artifacts:config=config/base/rbac output:webhook:artifacts:config=config/base/manager/webhook/ + $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./catalogd/..." + $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./catalogd/..." output:crd:artifacts:config=config/catalogd/base/crd/bases output:rbac:artifacts:config=config/catalogd/base/rbac output:webhook:artifacts:config=config/catalogd/base/manager/webhook/ FOCUS := $(if $(TEST),-v -focus "$(TEST)") ifeq ($(origin E2E_FLAGS), undefined) E2E_FLAGS := endif -test-e2e: ## Run the e2e tests on existing cluster - $(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/e2e +test-e2e: $(GINKGO) ## Run the e2e tests on existing cluster + $(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) catalogd/test/e2e e2e: KIND_CLUSTER_NAME := catalogd-e2e e2e: ISSUER_KIND := Issuer e2e: ISSUER_NAME := selfsigned-issuer -e2e: KUSTOMIZE_OVERLAY := config/overlays/e2e +e2e: KUSTOMIZE_OVERLAY := config/catalogd/overlays/e2e e2e: run image-registry test-e2e kind-cluster-cleanup ## Run e2e test suite on local kind cluster image-registry: ## Setup in-cluster image registry @@ -138,7 +138,7 @@ export GO_BUILD_LDFLAGS := -s -w \ export GO_BUILD_GCFLAGS := all=-trimpath=${PWD} export GO_BUILD_TAGS := containers_image_openpgp -BUILDCMD = go build -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$(notdir $@) ./cmd/$(notdir $@) +BUILDCMD = go build -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$(notdir $@) ./catalogd/cmd/$(notdir $@) .PHONY: build-deps build-deps: generate @@ -146,14 +146,14 @@ build-deps: generate .PHONY: build go-build-local $(BINARIES) build: build-deps go-build-local ## Build binaries for current GOOS and GOARCH. go-build-local: $(BINARIES) -$(BINARIES): BUILDBIN = bin +$(BINARIES): BUILDBIN = catalogd/bin $(BINARIES): $(BUILDCMD) .PHONY: build-linux go-build-linux $(LINUX_BINARIES) build-linux: build-deps go-build-linux ## Build binaries for GOOS=linux and local GOARCH. go-build-linux: $(LINUX_BINARIES) -$(LINUX_BINARIES): BUILDBIN = bin/linux +$(LINUX_BINARIES): BUILDBIN = catalogd/bin/linux $(LINUX_BINARIES): GOOS=linux $(BUILDCMD) @@ -163,7 +163,7 @@ run: generate kind-cluster install ## Create a kind cluster and install a local .PHONY: build-container build-container: build-linux ## Build docker image for catalogd. - $(CONTAINER_RUNTIME) build -f Dockerfile -t $(IMAGE) ./bin/linux + $(CONTAINER_RUNTIME) build -f catalogd/Dockerfile -t $(IMAGE) ./catalogd/bin/linux ##@ Deploy @@ -185,15 +185,15 @@ install: check-cluster build-container kind-load deploy wait ## Install local ca .PHONY: deploy deploy: export MANIFEST="./catalogd.yaml" -deploy: export DEFAULT_CATALOGS="./config/base/default/clustercatalogs/default-catalogs.yaml" +deploy: export DEFAULT_CATALOGS="./config/catalogd/base/default/clustercatalogs/default-catalogs.yaml" deploy: $(KUSTOMIZE) ## Deploy Catalogd to the K8s cluster specified in ~/.kube/config with cert-manager and default clustercatalogs - cd config/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE) && cd ../../.. + cd config/catalogd/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE) && cd ../../../../ $(KUSTOMIZE) build $(KUSTOMIZE_OVERLAY) | sed "s/cert-git-version/cert-$(GIT_VERSION)/g" > catalogd.yaml - envsubst '$$CERT_MGR_VERSION,$$MANIFEST,$$DEFAULT_CATALOGS' < scripts/install.tpl.sh | bash -s + envsubst '$$CERT_MGR_VERSION,$$MANIFEST,$$DEFAULT_CATALOGS' < catalogd/scripts/install.tpl.sh | bash -s .PHONY: only-deploy-manifest only-deploy-manifest: $(KUSTOMIZE) ## Deploy just the Catalogd manifest--used in e2e testing where cert-manager is installed in a separate step - cd config/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE) + cd config/catalogd/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE) $(KUSTOMIZE) build $(KUSTOMIZE_OVERLAY) | kubectl apply -f - wait: @@ -208,7 +208,7 @@ cert-manager: .PHONY: demo-update demo-update: - hack/scripts/generate-asciidemo.sh + catalogd/hack/scripts/generate-asciidemo.sh .PHONY: check-cluster check-cluster: From 027f1403df769ac706bcd7b24916a0465afd9e4d Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Tue, 4 Feb 2025 09:48:07 -0600 Subject: [PATCH 5/7] Update catalogd Makefile references Signed-off-by: Edmund Ochieng --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 25792ec7c..2c84cc69a 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole, $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/... output:rbac:artifacts:config=config/operator-controller/base/rbac $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=config/operator-controller/base/crd/bases # To generate the manifests for catalogd - $(MAKE) -C catalogd generate + $(MAKE) -f Makefile.catalogd generate .PHONY: generate generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. @@ -147,7 +147,7 @@ CRD_DIFF_CONFIG := crd-diff-config.yaml verify-crd-compatibility: $(CRD_DIFF) manifests $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE} - $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CATALOGD_CRD_DIFF_UPDATED_SOURCE} + $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/catalogd/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CATALOGD_CRD_DIFF_UPDATED_SOURCE} .PHONY: test test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests. @@ -243,7 +243,7 @@ e2e-coverage: .PHONY: kind-load kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND cluster. $(CONTAINER_RUNTIME) save $(IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME) - IMAGE_REPO=$(CATALOG_IMAGE_REPO) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) $(MAKE) -C catalogd kind-load + IMAGE_REPO=$(CATALOG_IMAGE_REPO) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) $(MAKE) -f Makefile.catalogd kind-load .PHONY: kind-deploy kind-deploy: export MANIFEST := ./operator-controller.yaml @@ -310,7 +310,7 @@ run: docker-build kind-cluster kind-load kind-deploy #HELP Build the operator-co .PHONY: docker-build docker-build: build-linux #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH. $(CONTAINER_RUNTIME) build -t $(IMG) -f Dockerfile ./bin/linux - IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(MAKE) -C catalogd build-container + IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(MAKE) -f Makefile.catalogd build-container #SECTION Release ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined) From e1cf250ee5fa2aa840f429140eee3680d948131a Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Tue, 4 Feb 2025 13:28:26 -0600 Subject: [PATCH 6/7] Update config path in .Tiltfile and workflows/crd-diff.yaml Signed-off-by: Edmund Ochieng --- .github/workflows/crd-diff.yaml | 4 ++-- Tiltfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/crd-diff.yaml b/.github/workflows/crd-diff.yaml index 8f34947a9..35ecfb2f6 100644 --- a/.github/workflows/crd-diff.yaml +++ b/.github/workflows/crd-diff.yaml @@ -17,5 +17,5 @@ jobs: run: | make verify-crd-compatibility \ CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} \ - CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" \ - CATALOGD_CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" \ No newline at end of file + CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" \ + CATALOGD_CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/catalogd/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" diff --git a/Tiltfile b/Tiltfile index 7aa07e811..f25445346 100644 --- a/Tiltfile +++ b/Tiltfile @@ -2,7 +2,7 @@ load('.tilt-support', 'deploy_repo') operator_controller = { 'image': 'quay.io/operator-framework/operator-controller', - 'yaml': 'config/overlays/cert-manager', + 'yaml': 'config/operator-controller/overlays/cert-manager', 'binaries': { './cmd/operator-controller': 'operator-controller-controller-manager', }, @@ -13,7 +13,7 @@ deploy_repo('operator-controller', operator_controller, '-tags containers_image_ catalogd = { 'image': 'quay.io/operator-framework/catalogd', - 'yaml': 'catalogd/config/overlays/cert-manager', + 'yaml': 'config/catalogd/overlays/cert-manager', 'binaries': { './catalogd/cmd/catalogd': 'catalogd-controller-manager', }, From b69b30387c6ed908548f67b200be2a2577a0d660 Mon Sep 17 00:00:00 2001 From: Edmund Ochieng Date: Tue, 4 Feb 2025 13:42:14 -0600 Subject: [PATCH 7/7] Update path to catalogd config directory in Makefile Signed-off-by: Edmund Ochieng --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2c84cc69a..5f3ed31d1 100644 --- a/Makefile +++ b/Makefile @@ -247,9 +247,9 @@ kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND .PHONY: kind-deploy kind-deploy: export MANIFEST := ./operator-controller.yaml -kind-deploy: export DEFAULT_CATALOG := ./catalogd/config/base/default/clustercatalogs/default-catalogs.yaml +kind-deploy: export DEFAULT_CATALOG := ./config/catalogd/base/default/clustercatalogs/default-catalogs.yaml kind-deploy: manifests $(KUSTOMIZE) - ($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build catalogd/config/overlays/cert-manager | sed "s/cert-git-version/cert-$(VERSION)/g") > $(MANIFEST) + ($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build config/catalogd/overlays/cert-manager | sed "s/cert-git-version/cert-$(VERSION)/g") > $(MANIFEST) envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh | bash -s @@ -331,7 +331,7 @@ release: $(GORELEASER) #EXHELP Runs goreleaser for the operator-controller. By d quickstart: export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml quickstart: export DEFAULT_CATALOG := "https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/default-catalogs.yaml" quickstart: $(KUSTOMIZE) manifests #EXHELP Generate the unified installation release manifests and scripts. - ($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build catalogd/config/overlays/cert-manager) | sed "s/cert-git-version/cert-$(VERSION)/g" | sed "s/:devel/:$(VERSION)/g" > operator-controller.yaml + ($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build config/catalogd/overlays/cert-manager) | sed "s/cert-git-version/cert-$(VERSION)/g" | sed "s/:devel/:$(VERSION)/g" > operator-controller.yaml envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh > install.sh ##@ Docs