From 6821dd2c0a111ab5a6966d4b73679deb961b3026 Mon Sep 17 00:00:00 2001 From: Spencer Smith Date: Tue, 25 May 2021 13:54:07 -0400 Subject: [PATCH] feat: update paths of apps This PR updates the naming of the two apps that make up sidero for consistency. It also updates things like the Makefile, Dockerfile, and kustomize to make sure image names are the same as these app names. Signed-off-by: Spencer Smith --- Dockerfile | 66 +++++++++---------- Makefile | 10 +-- .../PROJECT | 2 +- .../api/v1alpha2/doc.go | 2 +- .../api/v1alpha2/groupversion_info.go | 0 .../api/v1alpha2/metalcluster_conversion.go | 2 +- .../api/v1alpha2/metalcluster_types.go | 0 .../api/v1alpha2/metalmachine_conversion.go | 2 +- .../api/v1alpha2/metalmachine_types.go | 0 .../metalmachinetemplate_conversion.go | 2 +- .../v1alpha2/metalmachinetemplate_types.go | 0 .../api/v1alpha2/v1alpha2_test.go | 0 .../api/v1alpha2/zz_generated.conversion.go | 2 +- .../api/v1alpha2/zz_generated.deepcopy.go | 0 .../api/v1alpha3/doc.go | 0 .../api/v1alpha3/groupversion_info.go | 0 .../api/v1alpha3/metalcluster_conversion.go | 0 .../api/v1alpha3/metalcluster_types.go | 0 .../api/v1alpha3/metalcluster_webhook.go | 0 .../api/v1alpha3/metalclusterlist_webhook.go | 0 .../api/v1alpha3/metalmachine_conversion.go | 0 .../api/v1alpha3/metalmachine_types.go | 0 .../api/v1alpha3/metalmachine_webhook.go | 0 .../api/v1alpha3/metalmachinelist_webhook.go | 0 .../metalmachinetemplate_conversion.go | 0 .../v1alpha3/metalmachinetemplate_types.go | 0 .../v1alpha3/metalmachinetemplate_webhook.go | 0 .../metalmachinetemplatelist_webhook.go | 0 .../api/v1alpha3/serverbinding_conversion.go | 0 .../api/v1alpha3/serverbinding_types.go | 0 .../api/v1alpha3/serverbinding_webhook.go | 0 .../api/v1alpha3/serverbindinglist_webhook.go | 0 .../api/v1alpha3/v1alpha3_test.go | 0 .../api/v1alpha3/zz_generated.deepcopy.go | 0 .../config/certmanager/certificate.yaml | 0 .../config/certmanager/kustomization.yaml | 0 .../config/certmanager/kustomizeconfig.yaml | 0 ...ucture.cluster.x-k8s.io_metalclusters.yaml | 0 ...ucture.cluster.x-k8s.io_metalmachines.yaml | 0 ...luster.x-k8s.io_metalmachinetemplates.yaml | 0 ...cture.cluster.x-k8s.io_serverbindings.yaml | 0 .../config/crd/kustomization.yaml | 0 .../config/crd/kustomizeconfig.yaml | 0 .../patches/cainjection_in_metalclusters.yaml | 0 .../patches/cainjection_in_metalmachines.yaml | 0 .../cainjection_in_metalmachinetemplates.yaml | 0 .../cainjection_in_serverbindings.yaml | 0 .../crd/patches/webhook_in_metalclusters.yaml | 0 .../crd/patches/webhook_in_metalmachines.yaml | 0 .../webhook_in_metalmachinetemplates.yaml | 0 .../patches/webhook_in_serverbindings.yaml | 0 .../config/default/kustomization.yaml | 0 .../config/kustomization.yaml | 0 .../config/manager/kustomization.yaml | 0 .../config/manager/manager.yaml | 0 .../config/patch_crd_webhook_namespace.yaml | 0 .../config/prometheus/kustomization.yaml | 0 .../config/prometheus/monitor.yaml | 0 .../config/rbac/auth_proxy_role.yaml | 0 .../config/rbac/auth_proxy_role_binding.yaml | 0 .../config/rbac/auth_proxy_service.yaml | 0 .../config/rbac/kustomization.yaml | 0 .../config/rbac/leader_election_role.yaml | 0 .../rbac/leader_election_role_binding.yaml | 0 .../config/rbac/metalcluster_editor_role.yaml | 0 .../config/rbac/metalcluster_viewer_role.yaml | 0 .../config/rbac/metalmachine_editor_role.yaml | 0 .../config/rbac/metalmachine_viewer_role.yaml | 0 .../metalmachinetemplate_editor_role.yaml | 0 .../metalmachinetemplate_viewer_role.yaml | 0 .../config/rbac/role.yaml | 0 .../config/rbac/role_binding.yaml | 0 .../config/webhook/kustomization.yaml | 0 .../config/webhook/kustomizeconfig.yaml | 0 .../config/webhook/manager_webhook_patch.yaml | 0 .../config/webhook/service.yaml | 0 .../webhook/webhookcainjection_patch.yaml | 0 .../controllers/metalcluster_controller.go | 4 +- .../controllers/metalmachine_controller.go | 6 +- .../controllers/serverbinding_controller.go | 4 +- .../controllers/suite_test.go | 2 +- .../main.go | 8 +-- .../pkg/constants/constants.go | 0 .../PROJECT | 2 +- .../api/v1alpha1/environment_types.go | 0 .../api/v1alpha1/groupversion_info.go | 0 .../api/v1alpha1/server_types.go | 0 .../api/v1alpha1/server_types_test.go | 2 +- .../api/v1alpha1/serverclass_filter.go | 0 .../api/v1alpha1/serverclass_filter_test.go | 2 +- .../api/v1alpha1/serverclass_types.go | 0 .../api/v1alpha1/types.go | 0 .../api/v1alpha1/zz_generated.deepcopy.go | 0 .../cmd/agent/main.go | 8 +-- .../config/certmanager/certificate.yaml | 0 .../config/certmanager/kustomization.yaml | 0 .../config/certmanager/kustomizeconfig.yaml | 0 .../bases/metal.sidero.dev_environments.yaml | 0 .../bases/metal.sidero.dev_serverclasses.yaml | 0 .../crd/bases/metal.sidero.dev_servers.yaml | 0 .../config/crd/kustomization.yaml | 0 .../config/crd/kustomizeconfig.yaml | 0 .../patches/cainjection_in_environments.yaml | 0 .../patches/cainjection_in_serverclasses.yaml | 0 .../crd/patches/cainjection_in_servers.yaml | 0 .../crd/patches/webhook_in_environments.yaml | 0 .../crd/patches/webhook_in_serverclasses.yaml | 0 .../crd/patches/webhook_in_servers.yaml | 0 .../config/kustomization.yaml | 0 .../config/manager/kustomization.yaml | 0 .../config/manager/manager.yaml | 10 +-- .../config/manager_webhook_patch.yaml | 0 .../config/prometheus/kustomization.yaml | 0 .../config/prometheus/monitor.yaml | 0 .../config/rbac/auth_proxy_role.yaml | 0 .../config/rbac/auth_proxy_role_binding.yaml | 0 .../config/rbac/auth_proxy_service.yaml | 0 .../config/rbac/environment_editor_role.yaml | 0 .../config/rbac/environment_viewer_role.yaml | 0 .../config/rbac/kustomization.yaml | 0 .../config/rbac/leader_election_role.yaml | 0 .../rbac/leader_election_role_binding.yaml | 0 .../config/rbac/role.yaml | 0 .../config/rbac/role_binding.yaml | 0 .../config/rbac/server_editor_role.yaml | 0 .../config/rbac/server_viewer_role.yaml | 0 .../config/rbac/serverclass_editor_role.yaml | 0 .../config/rbac/serverclass_viewer_role.yaml | 0 .../samples/metal_v1alpha1_environment.yaml | 0 .../config/samples/metal_v1alpha1_server.yaml | 0 .../samples/metal_v1alpha1_serverclass.yaml | 0 .../config/webhook/kustomization.yaml | 0 .../config/webhook/kustomizeconfig.yaml | 0 .../config/webhook/service.yaml | 0 .../config/webhookcainjection_patch.yaml | 0 .../controllers/environment_controller.go | 4 +- .../controllers/server_controller.go | 8 +-- .../controllers/serverclass_controller.go | 2 +- .../controllers/suite_test.go | 2 +- .../internal/api/api.pb.go | 10 +-- .../internal/api/api.proto | 2 +- .../internal/api/api_grpc.pb.go | 0 .../internal/ipxe/ipxe_server.go | 6 +- .../internal/ipxe/ipxe_test.go | 0 .../internal/ipxe/patch.go | 0 .../internal/metadata/metadata_server.go | 4 +- .../internal/power/api/api.go | 2 +- .../internal/power/api/api_test.go | 0 .../internal/power/api/dice.go | 0 .../internal/power/ipmi/ipmi.go | 2 +- .../internal/power/ipmi/ipmi_test.go | 0 .../internal/power/metal/fake.go | 0 .../internal/power/metal/metal.go | 6 +- .../internal/power/metal/metal_test.go | 0 .../internal/server/server.go | 4 +- .../internal/server/server_test.go | 0 .../internal/tftp/tftp_server.go | 0 .../internal/tftp/tftp_test.go | 0 .../main.go | 20 +++--- .../pkg/constants/constants.go | 0 config/kustomization.yaml | 4 +- hack/release.toml | 12 ++++ internal/client/client.go | 6 +- sfyra/pkg/capi/cluster.go | 4 +- sfyra/pkg/capi/metalclient.go | 4 +- sfyra/pkg/loadbalancer/loadbalancer.go | 4 +- sfyra/pkg/tests/environment.go | 2 +- sfyra/pkg/tests/match.go | 2 +- sfyra/pkg/tests/reconcile.go | 4 +- sfyra/pkg/tests/reset.go | 4 +- sfyra/pkg/tests/server.go | 2 +- sfyra/pkg/tests/server_class.go | 2 +- 172 files changed, 135 insertions(+), 123 deletions(-) rename app/{cluster-api-provider-sidero => caps-controller-manager}/PROJECT (86%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/doc.go (68%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/groupversion_info.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/metalcluster_conversion.go (97%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/metalcluster_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/metalmachine_conversion.go (97%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/metalmachine_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/metalmachinetemplate_conversion.go (95%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/metalmachinetemplate_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/v1alpha2_test.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/zz_generated.conversion.go (99%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha2/zz_generated.deepcopy.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/doc.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/groupversion_info.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalcluster_conversion.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalcluster_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalcluster_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalclusterlist_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachine_conversion.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachine_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachine_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachinelist_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachinetemplate_conversion.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachinetemplate_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachinetemplate_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/metalmachinetemplatelist_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/serverbinding_conversion.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/serverbinding_types.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/serverbinding_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/serverbindinglist_webhook.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/v1alpha3_test.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/api/v1alpha3/zz_generated.deepcopy.go (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/certmanager/certificate.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/certmanager/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/certmanager/kustomizeconfig.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/kustomizeconfig.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/cainjection_in_metalclusters.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/cainjection_in_metalmachines.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/cainjection_in_metalmachinetemplates.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/cainjection_in_serverbindings.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/webhook_in_metalclusters.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/webhook_in_metalmachines.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/webhook_in_metalmachinetemplates.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/crd/patches/webhook_in_serverbindings.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/default/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/manager/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/manager/manager.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/patch_crd_webhook_namespace.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/prometheus/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/prometheus/monitor.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/auth_proxy_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/auth_proxy_role_binding.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/auth_proxy_service.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/leader_election_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/leader_election_role_binding.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/metalcluster_editor_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/metalcluster_viewer_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/metalmachine_editor_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/metalmachine_viewer_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/metalmachinetemplate_editor_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/metalmachinetemplate_viewer_role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/role.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/rbac/role_binding.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/webhook/kustomization.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/webhook/kustomizeconfig.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/webhook/manager_webhook_patch.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/webhook/service.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/config/webhook/webhookcainjection_patch.yaml (100%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/controllers/metalcluster_controller.go (94%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/controllers/metalmachine_controller.go (97%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/controllers/serverbinding_controller.go (97%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/controllers/suite_test.go (95%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/main.go (93%) rename app/{cluster-api-provider-sidero => caps-controller-manager}/pkg/constants/constants.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/PROJECT (74%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/environment_types.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/groupversion_info.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/server_types.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/server_types_test.go (94%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/serverclass_filter.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/serverclass_filter_test.go (98%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/serverclass_types.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/types.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/api/v1alpha1/zz_generated.deepcopy.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/cmd/agent/main.go (97%) rename app/{metal-controller-manager => sidero-controller-manager}/config/certmanager/certificate.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/certmanager/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/certmanager/kustomizeconfig.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/bases/metal.sidero.dev_environments.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/bases/metal.sidero.dev_serverclasses.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/bases/metal.sidero.dev_servers.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/kustomizeconfig.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/patches/cainjection_in_environments.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/patches/cainjection_in_serverclasses.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/patches/cainjection_in_servers.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/patches/webhook_in_environments.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/patches/webhook_in_serverclasses.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/crd/patches/webhook_in_servers.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/manager/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/manager/manager.yaml (90%) rename app/{metal-controller-manager => sidero-controller-manager}/config/manager_webhook_patch.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/prometheus/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/prometheus/monitor.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/auth_proxy_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/auth_proxy_role_binding.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/auth_proxy_service.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/environment_editor_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/environment_viewer_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/leader_election_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/leader_election_role_binding.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/role_binding.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/server_editor_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/server_viewer_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/serverclass_editor_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/rbac/serverclass_viewer_role.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/samples/metal_v1alpha1_environment.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/samples/metal_v1alpha1_server.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/samples/metal_v1alpha1_serverclass.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/webhook/kustomization.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/webhook/kustomizeconfig.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/webhook/service.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/config/webhookcainjection_patch.yaml (100%) rename app/{metal-controller-manager => sidero-controller-manager}/controllers/environment_controller.go (97%) rename app/{metal-controller-manager => sidero-controller-manager}/controllers/server_controller.go (97%) rename app/{metal-controller-manager => sidero-controller-manager}/controllers/serverclass_controller.go (98%) rename app/{metal-controller-manager => sidero-controller-manager}/controllers/suite_test.go (95%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/api/api.pb.go (98%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/api/api.proto (94%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/api/api_grpc.pb.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/ipxe/ipxe_server.go (97%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/ipxe/ipxe_test.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/ipxe/patch.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/metadata/metadata_server.go (98%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/api/api.go (96%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/api/api_test.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/api/dice.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/ipmi/ipmi.go (98%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/ipmi/ipmi_test.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/metal/fake.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/metal/metal.go (84%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/power/metal/metal_test.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/server/server.go (98%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/server/server_test.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/tftp/tftp_server.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/internal/tftp/tftp_test.go (100%) rename app/{metal-controller-manager => sidero-controller-manager}/main.go (92%) rename app/{metal-controller-manager => sidero-controller-manager}/pkg/constants/constants.go (100%) diff --git a/Dockerfile b/Dockerfile index 5c8400bd6..0c4e5200e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,47 +53,47 @@ RUN --mount=type=cache,target=/.cache ! go mod tidy -v 2>&1 | grep . FROM base AS manifests-build RUN --mount=type=cache,target=/.cache controller-gen \ - crd:crdVersions=v1 paths="./app/cluster-api-provider-sidero/api/..." output:crd:dir="./app/cluster-api-provider-sidero/config/crd/bases" \ - rbac:roleName=manager-role paths="./app/cluster-api-provider-sidero/controllers/..." output:rbac:dir="./app/cluster-api-provider-sidero/config/rbac" \ - webhook output:webhook:dir="./app/cluster-api-provider-sidero/config/webhook" + crd:crdVersions=v1 paths="./app/caps-controller-manager/api/..." output:crd:dir="./app/caps-controller-manager/config/crd/bases" \ + rbac:roleName=manager-role paths="./app/caps-controller-manager/controllers/..." output:rbac:dir="./app/caps-controller-manager/config/rbac" \ + webhook output:webhook:dir="./app/caps-controller-manager/config/webhook" RUN --mount=type=cache,target=/.cache controller-gen \ - crd:crdVersions=v1 paths="./app/metal-controller-manager/api/..." output:crd:dir="./app/metal-controller-manager/config/crd/bases" \ - rbac:roleName=manager-role paths="./app/metal-controller-manager/controllers/..." output:rbac:dir="./app/metal-controller-manager/config/rbac" \ - webhook output:webhook:dir="./app/metal-controller-manager/config/webhook" + crd:crdVersions=v1 paths="./app/sidero-controller-manager/api/..." output:crd:dir="./app/sidero-controller-manager/config/crd/bases" \ + rbac:roleName=manager-role paths="./app/sidero-controller-manager/controllers/..." output:rbac:dir="./app/sidero-controller-manager/config/rbac" \ + webhook output:webhook:dir="./app/sidero-controller-manager/config/webhook" FROM scratch AS manifests -COPY --from=manifests-build /src/app/cluster-api-provider-sidero/config ./app/cluster-api-provider-sidero/config -COPY --from=manifests-build /src/app/metal-controller-manager/config ./app/metal-controller-manager/config +COPY --from=manifests-build /src/app/caps-controller-manager/config ./app/caps-controller-manager/config +COPY --from=manifests-build /src/app/sidero-controller-manager/config ./app/sidero-controller-manager/config FROM base AS generate-build -COPY ./app/metal-controller-manager/internal/api/api.proto \ - /src/app/metal-controller-manager/internal/api/api.proto -RUN protoc -I/src/app/metal-controller-manager/internal/api \ - --go_out=paths=source_relative:/src/app/metal-controller-manager/internal/api --go-grpc_out=paths=source_relative:/src/app/metal-controller-manager/internal/api \ +COPY ./app/sidero-controller-manager/internal/api/api.proto \ + /src/app/sidero-controller-manager/internal/api/api.proto +RUN protoc -I/src/app/sidero-controller-manager/internal/api \ + --go_out=paths=source_relative:/src/app/sidero-controller-manager/internal/api --go-grpc_out=paths=source_relative:/src/app/sidero-controller-manager/internal/api \ api.proto RUN --mount=type=cache,target=/.cache controller-gen object:headerFile="./hack/boilerplate.go.txt" paths="./..." -RUN --mount=type=cache,target=/.cache conversion-gen --input-dirs="./app/cluster-api-provider-sidero/api/v1alpha2" --output-base ./ --output-file-base="zz_generated.conversion" --go-header-file="./hack/boilerplate.go.txt" +RUN --mount=type=cache,target=/.cache conversion-gen --input-dirs="./app/caps-controller-manager/api/v1alpha2" --output-base ./ --output-file-base="zz_generated.conversion" --go-header-file="./hack/boilerplate.go.txt" ARG MODULE RUN --mount=type=cache,target=/.cache gofumports -w -local ${MODULE} . FROM scratch AS generate -COPY --from=generate-build /src/app/cluster-api-provider-sidero/api ./app/cluster-api-provider-sidero/api -COPY --from=generate-build /src/app/metal-controller-manager/api ./app/metal-controller-manager/api -COPY --from=generate-build /src/app/metal-controller-manager/internal/api ./app/metal-controller-manager/internal/api +COPY --from=generate-build /src/app/caps-controller-manager/api ./app/caps-controller-manager/api +COPY --from=generate-build /src/app/sidero-controller-manager/api ./app/sidero-controller-manager/api +COPY --from=generate-build /src/app/sidero-controller-manager/internal/api ./app/sidero-controller-manager/internal/api FROM --platform=${BUILDPLATFORM} alpine:3.13 AS release-build ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.1.0/kustomize_v4.1.0_linux_amd64.tar.gz . RUN tar -xf kustomize_v4.1.0_linux_amd64.tar.gz -C /usr/local/bin && rm kustomize_v4.1.0_linux_amd64.tar.gz COPY ./config ./config COPY ./templates ./templates -COPY ./app/cluster-api-provider-sidero/config ./app/cluster-api-provider-sidero/config -COPY ./app/metal-controller-manager/config ./app/metal-controller-manager/config +COPY ./app/caps-controller-manager/config ./app/caps-controller-manager/config +COPY ./app/sidero-controller-manager/config ./app/sidero-controller-manager/config ARG REGISTRY_AND_USERNAME ARG TAG -RUN cd ./app/cluster-api-provider-sidero/config/manager \ - && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/cluster-api-provider-sidero:${TAG} -RUN cd ./app/metal-controller-manager/config/manager \ - && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/metal-controller-manager:${TAG} +RUN cd ./app/caps-controller-manager/config/manager \ + && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/caps-controller-manager:${TAG} +RUN cd ./app/sidero-controller-manager/config/manager \ + && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/sidero-controller-manager:${TAG} RUN kustomize build config > /infrastructure-components.yaml \ && cp ./config/metadata/metadata.yaml /metadata.yaml \ && cp ./templates/cluster-template.yaml /cluster-template.yaml @@ -104,42 +104,42 @@ COPY --from=release-build /infrastructure-components.yaml /infrastructure-sidero COPY --from=release-build /metadata.yaml /infrastructure-sidero/${TAG}/metadata.yaml COPY --from=release-build /cluster-template.yaml /infrastructure-sidero/${TAG}/cluster-template.yaml -FROM base AS build-cluster-api-provider-sidero +FROM base AS build-caps-controller-manager ARG TARGETARCH ARG GO_BUILDFLAGS ARG GO_LDFLAGS -RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /manager ./app/cluster-api-provider-sidero +RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /manager ./app/caps-controller-manager RUN chmod +x /manager ## TODO(rsmitty): make bmc pkg and move to talos-systems image -FROM scratch AS cluster-api-provider-sidero +FROM scratch AS caps-controller-manager COPY --from=pkg-ca-certificates / / COPY --from=pkg-fhs / / COPY --from=pkg-musl / / COPY --from=pkg-libressl / / COPY --from=pkg-ipmitool / / -COPY --from=build-cluster-api-provider-sidero /manager /manager +COPY --from=build-caps-controller-manager /manager /manager LABEL org.opencontainers.image.source https://github.com/talos-systems/sidero ENTRYPOINT [ "/manager" ] -FROM base AS build-metal-controller-manager +FROM base AS build-sidero-controller-manager ARG TALOS_RELEASE ARG TARGETARCH ARG GO_BUILDFLAGS ARG GO_LDFLAGS -RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X main.TalosRelease=${TALOS_RELEASE}" -o /manager ./app/metal-controller-manager +RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X main.TalosRelease=${TALOS_RELEASE}" -o /manager ./app/sidero-controller-manager RUN chmod +x /manager FROM base AS agent-build-amd64 ARG GO_BUILDFLAGS ARG GO_LDFLAGS -RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/metal-controller-manager/cmd/agent +RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/sidero-controller-manager/cmd/agent RUN chmod +x /agent FROM base AS agent-build-arm64 ARG GO_BUILDFLAGS ARG GO_LDFLAGS -RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/metal-controller-manager/cmd/agent +RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/sidero-controller-manager/cmd/agent RUN chmod +x /agent FROM base AS initramfs-archive-amd64 @@ -164,7 +164,7 @@ COPY --from=pkg-linux-firmware-arm64 /lib/firmware/bnx2 ./lib/firmware/bnx2 COPY --from=pkg-linux-firmware-arm64 /lib/firmware/bnx2x ./lib/firmware/bnx2x RUN set -o pipefail && find . 2>/dev/null | cpio -H newc -o | xz -v -C crc32 -0 -e -T 0 -z >/initramfs.xz -FROM scratch AS metal-controller-manager-image +FROM scratch AS sidero-controller-manager-image COPY --from=pkg-ca-certificates / / COPY --from=pkg-fhs / / COPY --from=pkg-musl / / @@ -178,9 +178,9 @@ COPY --from=initramfs-archive-amd64 /initramfs.xz /var/lib/sidero/env/agent-amd6 COPY --from=initramfs-archive-arm64 /initramfs.xz /var/lib/sidero/env/agent-arm64/initramfs.xz COPY --from=pkg-kernel-amd64 /boot/vmlinuz /var/lib/sidero/env/agent-amd64/vmlinuz COPY --from=pkg-kernel-arm64 /boot/vmlinuz /var/lib/sidero/env/agent-arm64/vmlinuz -COPY --from=build-metal-controller-manager /manager /manager +COPY --from=build-sidero-controller-manager /manager /manager -FROM metal-controller-manager-image AS metal-controller-manager +FROM sidero-controller-manager-image AS sidero-controller-manager LABEL org.opencontainers.image.source https://github.com/talos-systems/sidero ENTRYPOINT [ "/manager" ] diff --git a/Makefile b/Makefile index 6f5f0b60a..61c23025a 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ COMMON_ARGS += --build-arg=CGO_ENABLED=$(CGO_ENABLED) COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)" COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)" -all: manifests generate cluster-api-provider-sidero metal-controller-manager sfyra +all: manifests generate caps-controller-manager sidero-controller-manager sfyra # Help Menu @@ -128,12 +128,12 @@ check-dirty: ## Verifies that source tree is not dirty release: manifests ## Create the release YAML. The build result will be ouput to the specified local destination. @$(MAKE) local-$@ DEST=./$(ARTIFACTS) -.PHONY: cluster-api-provider-sidero -cluster-api-provider-sidero: ## Build the CAPI provider container image. +.PHONY: caps-controller-manager +caps-controller-manager: ## Build the CAPI provider container image. @$(MAKE) docker-$@ TARGET_ARGS="--push=$(PUSH)" NAME="$@" -.PHONY: metal-controller-manager -metal-controller-manager: ## Build the CAPI provider container image. +.PHONY: sidero-controller-manager +sidero-controller-manager: ## Build the CAPI provider container image. @$(MAKE) docker-$@ TARGET_ARGS="--push=$(PUSH)" NAME="$@" .PHONY: release-notes diff --git a/app/cluster-api-provider-sidero/PROJECT b/app/caps-controller-manager/PROJECT similarity index 86% rename from app/cluster-api-provider-sidero/PROJECT rename to app/caps-controller-manager/PROJECT index 9b6196d09..39ce2cf1a 100644 --- a/app/cluster-api-provider-sidero/PROJECT +++ b/app/caps-controller-manager/PROJECT @@ -1,5 +1,5 @@ domain: cluster.x-k8s.io -repo: github.com/talos-systems/sidero/app/cluster-api-provider-sidero +repo: github.com/talos-systems/sidero/app/caps-controller-manager resources: - group: infrastructure kind: MetalCluster diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/doc.go b/app/caps-controller-manager/api/v1alpha2/doc.go similarity index 68% rename from app/cluster-api-provider-sidero/api/v1alpha2/doc.go rename to app/caps-controller-manager/api/v1alpha2/doc.go index 056070a9f..4ea24f8ea 100644 --- a/app/cluster-api-provider-sidero/api/v1alpha2/doc.go +++ b/app/caps-controller-manager/api/v1alpha2/doc.go @@ -4,4 +4,4 @@ package v1alpha2 -// +k8s:conversion-gen=github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3 +// +k8s:conversion-gen=github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3 diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/groupversion_info.go b/app/caps-controller-manager/api/v1alpha2/groupversion_info.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha2/groupversion_info.go rename to app/caps-controller-manager/api/v1alpha2/groupversion_info.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_conversion.go b/app/caps-controller-manager/api/v1alpha2/metalcluster_conversion.go similarity index 97% rename from app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_conversion.go rename to app/caps-controller-manager/api/v1alpha2/metalcluster_conversion.go index 823c4df33..334ea15ab 100644 --- a/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_conversion.go +++ b/app/caps-controller-manager/api/v1alpha2/metalcluster_conversion.go @@ -12,7 +12,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1alpha3 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" + infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" ) // ConvertTo converts this MetalCluster to the Hub version (v1alpha3). diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_types.go b/app/caps-controller-manager/api/v1alpha2/metalcluster_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_types.go rename to app/caps-controller-manager/api/v1alpha2/metalcluster_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_conversion.go b/app/caps-controller-manager/api/v1alpha2/metalmachine_conversion.go similarity index 97% rename from app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_conversion.go rename to app/caps-controller-manager/api/v1alpha2/metalmachine_conversion.go index 6d206a56f..56e2f2b7f 100644 --- a/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_conversion.go +++ b/app/caps-controller-manager/api/v1alpha2/metalmachine_conversion.go @@ -10,7 +10,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1alpha3 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" + infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" ) // ConvertTo converts this MetalMachine to the Hub version (v1alpha3). diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_types.go b/app/caps-controller-manager/api/v1alpha2/metalmachine_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_types.go rename to app/caps-controller-manager/api/v1alpha2/metalmachine_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_conversion.go b/app/caps-controller-manager/api/v1alpha2/metalmachinetemplate_conversion.go similarity index 95% rename from app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_conversion.go rename to app/caps-controller-manager/api/v1alpha2/metalmachinetemplate_conversion.go index 7d3aff191..19338b0cb 100644 --- a/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_conversion.go +++ b/app/caps-controller-manager/api/v1alpha2/metalmachinetemplate_conversion.go @@ -9,7 +9,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1alpha3 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" + infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" ) // ConvertTo converts this MetalMachineTemplate to the Hub version (v1alpha3). diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_types.go b/app/caps-controller-manager/api/v1alpha2/metalmachinetemplate_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_types.go rename to app/caps-controller-manager/api/v1alpha2/metalmachinetemplate_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/v1alpha2_test.go b/app/caps-controller-manager/api/v1alpha2/v1alpha2_test.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha2/v1alpha2_test.go rename to app/caps-controller-manager/api/v1alpha2/v1alpha2_test.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.conversion.go b/app/caps-controller-manager/api/v1alpha2/zz_generated.conversion.go similarity index 99% rename from app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.conversion.go rename to app/caps-controller-manager/api/v1alpha2/zz_generated.conversion.go index 18341e800..25a30aeb4 100644 --- a/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.conversion.go +++ b/app/caps-controller-manager/api/v1alpha2/zz_generated.conversion.go @@ -15,7 +15,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1alpha3 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" + v1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" ) func init() { diff --git a/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.deepcopy.go b/app/caps-controller-manager/api/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.deepcopy.go rename to app/caps-controller-manager/api/v1alpha2/zz_generated.deepcopy.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/doc.go b/app/caps-controller-manager/api/v1alpha3/doc.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/doc.go rename to app/caps-controller-manager/api/v1alpha3/doc.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/groupversion_info.go b/app/caps-controller-manager/api/v1alpha3/groupversion_info.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/groupversion_info.go rename to app/caps-controller-manager/api/v1alpha3/groupversion_info.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_conversion.go b/app/caps-controller-manager/api/v1alpha3/metalcluster_conversion.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_conversion.go rename to app/caps-controller-manager/api/v1alpha3/metalcluster_conversion.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_types.go b/app/caps-controller-manager/api/v1alpha3/metalcluster_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_types.go rename to app/caps-controller-manager/api/v1alpha3/metalcluster_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_webhook.go b/app/caps-controller-manager/api/v1alpha3/metalcluster_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_webhook.go rename to app/caps-controller-manager/api/v1alpha3/metalcluster_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalclusterlist_webhook.go b/app/caps-controller-manager/api/v1alpha3/metalclusterlist_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalclusterlist_webhook.go rename to app/caps-controller-manager/api/v1alpha3/metalclusterlist_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_conversion.go b/app/caps-controller-manager/api/v1alpha3/metalmachine_conversion.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_conversion.go rename to app/caps-controller-manager/api/v1alpha3/metalmachine_conversion.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_types.go b/app/caps-controller-manager/api/v1alpha3/metalmachine_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_types.go rename to app/caps-controller-manager/api/v1alpha3/metalmachine_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_webhook.go b/app/caps-controller-manager/api/v1alpha3/metalmachine_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_webhook.go rename to app/caps-controller-manager/api/v1alpha3/metalmachine_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinelist_webhook.go b/app/caps-controller-manager/api/v1alpha3/metalmachinelist_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachinelist_webhook.go rename to app/caps-controller-manager/api/v1alpha3/metalmachinelist_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_conversion.go b/app/caps-controller-manager/api/v1alpha3/metalmachinetemplate_conversion.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_conversion.go rename to app/caps-controller-manager/api/v1alpha3/metalmachinetemplate_conversion.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_types.go b/app/caps-controller-manager/api/v1alpha3/metalmachinetemplate_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_types.go rename to app/caps-controller-manager/api/v1alpha3/metalmachinetemplate_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_webhook.go b/app/caps-controller-manager/api/v1alpha3/metalmachinetemplate_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_webhook.go rename to app/caps-controller-manager/api/v1alpha3/metalmachinetemplate_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplatelist_webhook.go b/app/caps-controller-manager/api/v1alpha3/metalmachinetemplatelist_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplatelist_webhook.go rename to app/caps-controller-manager/api/v1alpha3/metalmachinetemplatelist_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/serverbinding_conversion.go b/app/caps-controller-manager/api/v1alpha3/serverbinding_conversion.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/serverbinding_conversion.go rename to app/caps-controller-manager/api/v1alpha3/serverbinding_conversion.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/serverbinding_types.go b/app/caps-controller-manager/api/v1alpha3/serverbinding_types.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/serverbinding_types.go rename to app/caps-controller-manager/api/v1alpha3/serverbinding_types.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/serverbinding_webhook.go b/app/caps-controller-manager/api/v1alpha3/serverbinding_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/serverbinding_webhook.go rename to app/caps-controller-manager/api/v1alpha3/serverbinding_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/serverbindinglist_webhook.go b/app/caps-controller-manager/api/v1alpha3/serverbindinglist_webhook.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/serverbindinglist_webhook.go rename to app/caps-controller-manager/api/v1alpha3/serverbindinglist_webhook.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/v1alpha3_test.go b/app/caps-controller-manager/api/v1alpha3/v1alpha3_test.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/v1alpha3_test.go rename to app/caps-controller-manager/api/v1alpha3/v1alpha3_test.go diff --git a/app/cluster-api-provider-sidero/api/v1alpha3/zz_generated.deepcopy.go b/app/caps-controller-manager/api/v1alpha3/zz_generated.deepcopy.go similarity index 100% rename from app/cluster-api-provider-sidero/api/v1alpha3/zz_generated.deepcopy.go rename to app/caps-controller-manager/api/v1alpha3/zz_generated.deepcopy.go diff --git a/app/cluster-api-provider-sidero/config/certmanager/certificate.yaml b/app/caps-controller-manager/config/certmanager/certificate.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/certmanager/certificate.yaml rename to app/caps-controller-manager/config/certmanager/certificate.yaml diff --git a/app/cluster-api-provider-sidero/config/certmanager/kustomization.yaml b/app/caps-controller-manager/config/certmanager/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/certmanager/kustomization.yaml rename to app/caps-controller-manager/config/certmanager/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/certmanager/kustomizeconfig.yaml b/app/caps-controller-manager/config/certmanager/kustomizeconfig.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/certmanager/kustomizeconfig.yaml rename to app/caps-controller-manager/config/certmanager/kustomizeconfig.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml rename to app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml rename to app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml rename to app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml b/app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml rename to app/caps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/kustomization.yaml b/app/caps-controller-manager/config/crd/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/kustomization.yaml rename to app/caps-controller-manager/config/crd/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/kustomizeconfig.yaml b/app/caps-controller-manager/config/crd/kustomizeconfig.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/kustomizeconfig.yaml rename to app/caps-controller-manager/config/crd/kustomizeconfig.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalclusters.yaml b/app/caps-controller-manager/config/crd/patches/cainjection_in_metalclusters.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalclusters.yaml rename to app/caps-controller-manager/config/crd/patches/cainjection_in_metalclusters.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachines.yaml b/app/caps-controller-manager/config/crd/patches/cainjection_in_metalmachines.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachines.yaml rename to app/caps-controller-manager/config/crd/patches/cainjection_in_metalmachines.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachinetemplates.yaml b/app/caps-controller-manager/config/crd/patches/cainjection_in_metalmachinetemplates.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachinetemplates.yaml rename to app/caps-controller-manager/config/crd/patches/cainjection_in_metalmachinetemplates.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_serverbindings.yaml b/app/caps-controller-manager/config/crd/patches/cainjection_in_serverbindings.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_serverbindings.yaml rename to app/caps-controller-manager/config/crd/patches/cainjection_in_serverbindings.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalclusters.yaml b/app/caps-controller-manager/config/crd/patches/webhook_in_metalclusters.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalclusters.yaml rename to app/caps-controller-manager/config/crd/patches/webhook_in_metalclusters.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachines.yaml b/app/caps-controller-manager/config/crd/patches/webhook_in_metalmachines.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachines.yaml rename to app/caps-controller-manager/config/crd/patches/webhook_in_metalmachines.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachinetemplates.yaml b/app/caps-controller-manager/config/crd/patches/webhook_in_metalmachinetemplates.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachinetemplates.yaml rename to app/caps-controller-manager/config/crd/patches/webhook_in_metalmachinetemplates.yaml diff --git a/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_serverbindings.yaml b/app/caps-controller-manager/config/crd/patches/webhook_in_serverbindings.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/crd/patches/webhook_in_serverbindings.yaml rename to app/caps-controller-manager/config/crd/patches/webhook_in_serverbindings.yaml diff --git a/app/cluster-api-provider-sidero/config/default/kustomization.yaml b/app/caps-controller-manager/config/default/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/default/kustomization.yaml rename to app/caps-controller-manager/config/default/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/kustomization.yaml b/app/caps-controller-manager/config/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/kustomization.yaml rename to app/caps-controller-manager/config/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/manager/kustomization.yaml b/app/caps-controller-manager/config/manager/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/manager/kustomization.yaml rename to app/caps-controller-manager/config/manager/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/manager/manager.yaml b/app/caps-controller-manager/config/manager/manager.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/manager/manager.yaml rename to app/caps-controller-manager/config/manager/manager.yaml diff --git a/app/cluster-api-provider-sidero/config/patch_crd_webhook_namespace.yaml b/app/caps-controller-manager/config/patch_crd_webhook_namespace.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/patch_crd_webhook_namespace.yaml rename to app/caps-controller-manager/config/patch_crd_webhook_namespace.yaml diff --git a/app/cluster-api-provider-sidero/config/prometheus/kustomization.yaml b/app/caps-controller-manager/config/prometheus/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/prometheus/kustomization.yaml rename to app/caps-controller-manager/config/prometheus/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/prometheus/monitor.yaml b/app/caps-controller-manager/config/prometheus/monitor.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/prometheus/monitor.yaml rename to app/caps-controller-manager/config/prometheus/monitor.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/auth_proxy_role.yaml b/app/caps-controller-manager/config/rbac/auth_proxy_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/auth_proxy_role.yaml rename to app/caps-controller-manager/config/rbac/auth_proxy_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/auth_proxy_role_binding.yaml b/app/caps-controller-manager/config/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/auth_proxy_role_binding.yaml rename to app/caps-controller-manager/config/rbac/auth_proxy_role_binding.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/auth_proxy_service.yaml b/app/caps-controller-manager/config/rbac/auth_proxy_service.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/auth_proxy_service.yaml rename to app/caps-controller-manager/config/rbac/auth_proxy_service.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/kustomization.yaml b/app/caps-controller-manager/config/rbac/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/kustomization.yaml rename to app/caps-controller-manager/config/rbac/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/leader_election_role.yaml b/app/caps-controller-manager/config/rbac/leader_election_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/leader_election_role.yaml rename to app/caps-controller-manager/config/rbac/leader_election_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/leader_election_role_binding.yaml b/app/caps-controller-manager/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/leader_election_role_binding.yaml rename to app/caps-controller-manager/config/rbac/leader_election_role_binding.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/metalcluster_editor_role.yaml b/app/caps-controller-manager/config/rbac/metalcluster_editor_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/metalcluster_editor_role.yaml rename to app/caps-controller-manager/config/rbac/metalcluster_editor_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/metalcluster_viewer_role.yaml b/app/caps-controller-manager/config/rbac/metalcluster_viewer_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/metalcluster_viewer_role.yaml rename to app/caps-controller-manager/config/rbac/metalcluster_viewer_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/metalmachine_editor_role.yaml b/app/caps-controller-manager/config/rbac/metalmachine_editor_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/metalmachine_editor_role.yaml rename to app/caps-controller-manager/config/rbac/metalmachine_editor_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/metalmachine_viewer_role.yaml b/app/caps-controller-manager/config/rbac/metalmachine_viewer_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/metalmachine_viewer_role.yaml rename to app/caps-controller-manager/config/rbac/metalmachine_viewer_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_editor_role.yaml b/app/caps-controller-manager/config/rbac/metalmachinetemplate_editor_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_editor_role.yaml rename to app/caps-controller-manager/config/rbac/metalmachinetemplate_editor_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_viewer_role.yaml b/app/caps-controller-manager/config/rbac/metalmachinetemplate_viewer_role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_viewer_role.yaml rename to app/caps-controller-manager/config/rbac/metalmachinetemplate_viewer_role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/role.yaml b/app/caps-controller-manager/config/rbac/role.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/role.yaml rename to app/caps-controller-manager/config/rbac/role.yaml diff --git a/app/cluster-api-provider-sidero/config/rbac/role_binding.yaml b/app/caps-controller-manager/config/rbac/role_binding.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/rbac/role_binding.yaml rename to app/caps-controller-manager/config/rbac/role_binding.yaml diff --git a/app/cluster-api-provider-sidero/config/webhook/kustomization.yaml b/app/caps-controller-manager/config/webhook/kustomization.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/webhook/kustomization.yaml rename to app/caps-controller-manager/config/webhook/kustomization.yaml diff --git a/app/cluster-api-provider-sidero/config/webhook/kustomizeconfig.yaml b/app/caps-controller-manager/config/webhook/kustomizeconfig.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/webhook/kustomizeconfig.yaml rename to app/caps-controller-manager/config/webhook/kustomizeconfig.yaml diff --git a/app/cluster-api-provider-sidero/config/webhook/manager_webhook_patch.yaml b/app/caps-controller-manager/config/webhook/manager_webhook_patch.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/webhook/manager_webhook_patch.yaml rename to app/caps-controller-manager/config/webhook/manager_webhook_patch.yaml diff --git a/app/cluster-api-provider-sidero/config/webhook/service.yaml b/app/caps-controller-manager/config/webhook/service.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/webhook/service.yaml rename to app/caps-controller-manager/config/webhook/service.yaml diff --git a/app/cluster-api-provider-sidero/config/webhook/webhookcainjection_patch.yaml b/app/caps-controller-manager/config/webhook/webhookcainjection_patch.yaml similarity index 100% rename from app/cluster-api-provider-sidero/config/webhook/webhookcainjection_patch.yaml rename to app/caps-controller-manager/config/webhook/webhookcainjection_patch.yaml diff --git a/app/cluster-api-provider-sidero/controllers/metalcluster_controller.go b/app/caps-controller-manager/controllers/metalcluster_controller.go similarity index 94% rename from app/cluster-api-provider-sidero/controllers/metalcluster_controller.go rename to app/caps-controller-manager/controllers/metalcluster_controller.go index 95e95022f..faf2f4b57 100644 --- a/app/cluster-api-provider-sidero/controllers/metalcluster_controller.go +++ b/app/caps-controller-manager/controllers/metalcluster_controller.go @@ -20,8 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/pkg/constants" + infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + "github.com/talos-systems/sidero/app/caps-controller-manager/pkg/constants" ) // MetalClusterReconciler reconciles a MetalCluster object. diff --git a/app/cluster-api-provider-sidero/controllers/metalmachine_controller.go b/app/caps-controller-manager/controllers/metalmachine_controller.go similarity index 97% rename from app/cluster-api-provider-sidero/controllers/metalmachine_controller.go rename to app/caps-controller-manager/controllers/metalmachine_controller.go index 125bf499f..039f07a73 100644 --- a/app/cluster-api-provider-sidero/controllers/metalmachine_controller.go +++ b/app/caps-controller-manager/controllers/metalmachine_controller.go @@ -29,9 +29,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/pkg/constants" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + "github.com/talos-systems/sidero/app/caps-controller-manager/pkg/constants" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) var ErrNoServersInServerClass = errors.New("no servers available in serverclass") diff --git a/app/cluster-api-provider-sidero/controllers/serverbinding_controller.go b/app/caps-controller-manager/controllers/serverbinding_controller.go similarity index 97% rename from app/cluster-api-provider-sidero/controllers/serverbinding_controller.go rename to app/caps-controller-manager/controllers/serverbinding_controller.go index 28698e678..79d9c4ca8 100644 --- a/app/cluster-api-provider-sidero/controllers/serverbinding_controller.go +++ b/app/caps-controller-manager/controllers/serverbinding_controller.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // ServerBindingReconciler reconciles a ServerBinding object. diff --git a/app/cluster-api-provider-sidero/controllers/suite_test.go b/app/caps-controller-manager/controllers/suite_test.go similarity index 95% rename from app/cluster-api-provider-sidero/controllers/suite_test.go rename to app/caps-controller-manager/controllers/suite_test.go index e76844737..b084053b0 100644 --- a/app/cluster-api-provider-sidero/controllers/suite_test.go +++ b/app/caps-controller-manager/controllers/suite_test.go @@ -19,7 +19,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - infrastructurev1alpha2 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha2" + infrastructurev1alpha2 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha2" // +kubebuilder:scaffold:imports ) diff --git a/app/cluster-api-provider-sidero/main.go b/app/caps-controller-manager/main.go similarity index 93% rename from app/cluster-api-provider-sidero/main.go rename to app/caps-controller-manager/main.go index ac7d07379..40862f06c 100644 --- a/app/cluster-api-provider-sidero/main.go +++ b/app/caps-controller-manager/main.go @@ -21,10 +21,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log/zap" - infrav1alpha2 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha2" - infrav1alpha3 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/controllers" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + infrav1alpha2 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha2" + infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + "github.com/talos-systems/sidero/app/caps-controller-manager/controllers" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/app/cluster-api-provider-sidero/pkg/constants/constants.go b/app/caps-controller-manager/pkg/constants/constants.go similarity index 100% rename from app/cluster-api-provider-sidero/pkg/constants/constants.go rename to app/caps-controller-manager/pkg/constants/constants.go diff --git a/app/metal-controller-manager/PROJECT b/app/sidero-controller-manager/PROJECT similarity index 74% rename from app/metal-controller-manager/PROJECT rename to app/sidero-controller-manager/PROJECT index 93a5def0e..6bf695d0a 100644 --- a/app/metal-controller-manager/PROJECT +++ b/app/sidero-controller-manager/PROJECT @@ -1,5 +1,5 @@ domain: sidero.dev -repo: github.com/talos-systems/sidero/app/metal-controller-manager +repo: github.com/talos-systems/sidero/app/sidero-controller-manager resources: - group: metal kind: Environment diff --git a/app/metal-controller-manager/api/v1alpha1/environment_types.go b/app/sidero-controller-manager/api/v1alpha1/environment_types.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/environment_types.go rename to app/sidero-controller-manager/api/v1alpha1/environment_types.go diff --git a/app/metal-controller-manager/api/v1alpha1/groupversion_info.go b/app/sidero-controller-manager/api/v1alpha1/groupversion_info.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/groupversion_info.go rename to app/sidero-controller-manager/api/v1alpha1/groupversion_info.go diff --git a/app/metal-controller-manager/api/v1alpha1/server_types.go b/app/sidero-controller-manager/api/v1alpha1/server_types.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/server_types.go rename to app/sidero-controller-manager/api/v1alpha1/server_types.go diff --git a/app/metal-controller-manager/api/v1alpha1/server_types_test.go b/app/sidero-controller-manager/api/v1alpha1/server_types_test.go similarity index 94% rename from app/metal-controller-manager/api/v1alpha1/server_types_test.go rename to app/sidero-controller-manager/api/v1alpha1/server_types_test.go index 55c5fa9dc..9872f62cb 100644 --- a/app/metal-controller-manager/api/v1alpha1/server_types_test.go +++ b/app/sidero-controller-manager/api/v1alpha1/server_types_test.go @@ -8,7 +8,7 @@ package v1alpha1_test import ( "testing" - "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) func Test_PartialEqual(t *testing.T) { diff --git a/app/metal-controller-manager/api/v1alpha1/serverclass_filter.go b/app/sidero-controller-manager/api/v1alpha1/serverclass_filter.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/serverclass_filter.go rename to app/sidero-controller-manager/api/v1alpha1/serverclass_filter.go diff --git a/app/metal-controller-manager/api/v1alpha1/serverclass_filter_test.go b/app/sidero-controller-manager/api/v1alpha1/serverclass_filter_test.go similarity index 98% rename from app/metal-controller-manager/api/v1alpha1/serverclass_filter_test.go rename to app/sidero-controller-manager/api/v1alpha1/serverclass_filter_test.go index e16744396..a96dbd900 100644 --- a/app/metal-controller-manager/api/v1alpha1/serverclass_filter_test.go +++ b/app/sidero-controller-manager/api/v1alpha1/serverclass_filter_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) func TestFilterAcceptedServers(t *testing.T) { diff --git a/app/metal-controller-manager/api/v1alpha1/serverclass_types.go b/app/sidero-controller-manager/api/v1alpha1/serverclass_types.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/serverclass_types.go rename to app/sidero-controller-manager/api/v1alpha1/serverclass_types.go diff --git a/app/metal-controller-manager/api/v1alpha1/types.go b/app/sidero-controller-manager/api/v1alpha1/types.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/types.go rename to app/sidero-controller-manager/api/v1alpha1/types.go diff --git a/app/metal-controller-manager/api/v1alpha1/zz_generated.deepcopy.go b/app/sidero-controller-manager/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from app/metal-controller-manager/api/v1alpha1/zz_generated.deepcopy.go rename to app/sidero-controller-manager/api/v1alpha1/zz_generated.deepcopy.go diff --git a/app/metal-controller-manager/cmd/agent/main.go b/app/sidero-controller-manager/cmd/agent/main.go similarity index 97% rename from app/metal-controller-manager/cmd/agent/main.go rename to app/sidero-controller-manager/cmd/agent/main.go index cf0b1ae17..8521aff4f 100644 --- a/app/metal-controller-manager/cmd/agent/main.go +++ b/app/sidero-controller-manager/cmd/agent/main.go @@ -28,10 +28,10 @@ import ( "golang.org/x/sys/unix" "google.golang.org/grpc" - "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/api" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/ipmi" - "github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants" + "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/api" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/ipmi" + "github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants" ) const ( diff --git a/app/metal-controller-manager/config/certmanager/certificate.yaml b/app/sidero-controller-manager/config/certmanager/certificate.yaml similarity index 100% rename from app/metal-controller-manager/config/certmanager/certificate.yaml rename to app/sidero-controller-manager/config/certmanager/certificate.yaml diff --git a/app/metal-controller-manager/config/certmanager/kustomization.yaml b/app/sidero-controller-manager/config/certmanager/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/certmanager/kustomization.yaml rename to app/sidero-controller-manager/config/certmanager/kustomization.yaml diff --git a/app/metal-controller-manager/config/certmanager/kustomizeconfig.yaml b/app/sidero-controller-manager/config/certmanager/kustomizeconfig.yaml similarity index 100% rename from app/metal-controller-manager/config/certmanager/kustomizeconfig.yaml rename to app/sidero-controller-manager/config/certmanager/kustomizeconfig.yaml diff --git a/app/metal-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml rename to app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml diff --git a/app/metal-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml rename to app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml diff --git a/app/metal-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml rename to app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml diff --git a/app/metal-controller-manager/config/crd/kustomization.yaml b/app/sidero-controller-manager/config/crd/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/kustomization.yaml rename to app/sidero-controller-manager/config/crd/kustomization.yaml diff --git a/app/metal-controller-manager/config/crd/kustomizeconfig.yaml b/app/sidero-controller-manager/config/crd/kustomizeconfig.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/kustomizeconfig.yaml rename to app/sidero-controller-manager/config/crd/kustomizeconfig.yaml diff --git a/app/metal-controller-manager/config/crd/patches/cainjection_in_environments.yaml b/app/sidero-controller-manager/config/crd/patches/cainjection_in_environments.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/patches/cainjection_in_environments.yaml rename to app/sidero-controller-manager/config/crd/patches/cainjection_in_environments.yaml diff --git a/app/metal-controller-manager/config/crd/patches/cainjection_in_serverclasses.yaml b/app/sidero-controller-manager/config/crd/patches/cainjection_in_serverclasses.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/patches/cainjection_in_serverclasses.yaml rename to app/sidero-controller-manager/config/crd/patches/cainjection_in_serverclasses.yaml diff --git a/app/metal-controller-manager/config/crd/patches/cainjection_in_servers.yaml b/app/sidero-controller-manager/config/crd/patches/cainjection_in_servers.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/patches/cainjection_in_servers.yaml rename to app/sidero-controller-manager/config/crd/patches/cainjection_in_servers.yaml diff --git a/app/metal-controller-manager/config/crd/patches/webhook_in_environments.yaml b/app/sidero-controller-manager/config/crd/patches/webhook_in_environments.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/patches/webhook_in_environments.yaml rename to app/sidero-controller-manager/config/crd/patches/webhook_in_environments.yaml diff --git a/app/metal-controller-manager/config/crd/patches/webhook_in_serverclasses.yaml b/app/sidero-controller-manager/config/crd/patches/webhook_in_serverclasses.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/patches/webhook_in_serverclasses.yaml rename to app/sidero-controller-manager/config/crd/patches/webhook_in_serverclasses.yaml diff --git a/app/metal-controller-manager/config/crd/patches/webhook_in_servers.yaml b/app/sidero-controller-manager/config/crd/patches/webhook_in_servers.yaml similarity index 100% rename from app/metal-controller-manager/config/crd/patches/webhook_in_servers.yaml rename to app/sidero-controller-manager/config/crd/patches/webhook_in_servers.yaml diff --git a/app/metal-controller-manager/config/kustomization.yaml b/app/sidero-controller-manager/config/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/kustomization.yaml rename to app/sidero-controller-manager/config/kustomization.yaml diff --git a/app/metal-controller-manager/config/manager/kustomization.yaml b/app/sidero-controller-manager/config/manager/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/manager/kustomization.yaml rename to app/sidero-controller-manager/config/manager/kustomization.yaml diff --git a/app/metal-controller-manager/config/manager/manager.yaml b/app/sidero-controller-manager/config/manager/manager.yaml similarity index 90% rename from app/metal-controller-manager/config/manager/manager.yaml rename to app/sidero-controller-manager/config/manager/manager.yaml index dbfc83328..5ffac713f 100644 --- a/app/metal-controller-manager/config/manager/manager.yaml +++ b/app/sidero-controller-manager/config/manager/manager.yaml @@ -9,7 +9,7 @@ spec: targetPort: tftp protocol: UDP selector: - control-plane: metal-controller-manager + control-plane: sidero-controller-manager --- apiVersion: v1 kind: Service @@ -22,7 +22,7 @@ spec: targetPort: http protocol: TCP selector: - control-plane: metal-controller-manager + control-plane: sidero-controller-manager --- apiVersion: apps/v1 kind: Deployment @@ -30,16 +30,16 @@ metadata: name: controller-manager namespace: system labels: - control-plane: metal-controller-manager + control-plane: sidero-controller-manager spec: selector: matchLabels: - control-plane: metal-controller-manager + control-plane: sidero-controller-manager replicas: 1 template: metadata: labels: - control-plane: metal-controller-manager + control-plane: sidero-controller-manager spec: hostNetwork: ${SIDERO_CONTROLLER_MANAGER_HOST_NETWORK:=false} containers: diff --git a/app/metal-controller-manager/config/manager_webhook_patch.yaml b/app/sidero-controller-manager/config/manager_webhook_patch.yaml similarity index 100% rename from app/metal-controller-manager/config/manager_webhook_patch.yaml rename to app/sidero-controller-manager/config/manager_webhook_patch.yaml diff --git a/app/metal-controller-manager/config/prometheus/kustomization.yaml b/app/sidero-controller-manager/config/prometheus/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/prometheus/kustomization.yaml rename to app/sidero-controller-manager/config/prometheus/kustomization.yaml diff --git a/app/metal-controller-manager/config/prometheus/monitor.yaml b/app/sidero-controller-manager/config/prometheus/monitor.yaml similarity index 100% rename from app/metal-controller-manager/config/prometheus/monitor.yaml rename to app/sidero-controller-manager/config/prometheus/monitor.yaml diff --git a/app/metal-controller-manager/config/rbac/auth_proxy_role.yaml b/app/sidero-controller-manager/config/rbac/auth_proxy_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/auth_proxy_role.yaml rename to app/sidero-controller-manager/config/rbac/auth_proxy_role.yaml diff --git a/app/metal-controller-manager/config/rbac/auth_proxy_role_binding.yaml b/app/sidero-controller-manager/config/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/auth_proxy_role_binding.yaml rename to app/sidero-controller-manager/config/rbac/auth_proxy_role_binding.yaml diff --git a/app/metal-controller-manager/config/rbac/auth_proxy_service.yaml b/app/sidero-controller-manager/config/rbac/auth_proxy_service.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/auth_proxy_service.yaml rename to app/sidero-controller-manager/config/rbac/auth_proxy_service.yaml diff --git a/app/metal-controller-manager/config/rbac/environment_editor_role.yaml b/app/sidero-controller-manager/config/rbac/environment_editor_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/environment_editor_role.yaml rename to app/sidero-controller-manager/config/rbac/environment_editor_role.yaml diff --git a/app/metal-controller-manager/config/rbac/environment_viewer_role.yaml b/app/sidero-controller-manager/config/rbac/environment_viewer_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/environment_viewer_role.yaml rename to app/sidero-controller-manager/config/rbac/environment_viewer_role.yaml diff --git a/app/metal-controller-manager/config/rbac/kustomization.yaml b/app/sidero-controller-manager/config/rbac/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/kustomization.yaml rename to app/sidero-controller-manager/config/rbac/kustomization.yaml diff --git a/app/metal-controller-manager/config/rbac/leader_election_role.yaml b/app/sidero-controller-manager/config/rbac/leader_election_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/leader_election_role.yaml rename to app/sidero-controller-manager/config/rbac/leader_election_role.yaml diff --git a/app/metal-controller-manager/config/rbac/leader_election_role_binding.yaml b/app/sidero-controller-manager/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/leader_election_role_binding.yaml rename to app/sidero-controller-manager/config/rbac/leader_election_role_binding.yaml diff --git a/app/metal-controller-manager/config/rbac/role.yaml b/app/sidero-controller-manager/config/rbac/role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/role.yaml rename to app/sidero-controller-manager/config/rbac/role.yaml diff --git a/app/metal-controller-manager/config/rbac/role_binding.yaml b/app/sidero-controller-manager/config/rbac/role_binding.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/role_binding.yaml rename to app/sidero-controller-manager/config/rbac/role_binding.yaml diff --git a/app/metal-controller-manager/config/rbac/server_editor_role.yaml b/app/sidero-controller-manager/config/rbac/server_editor_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/server_editor_role.yaml rename to app/sidero-controller-manager/config/rbac/server_editor_role.yaml diff --git a/app/metal-controller-manager/config/rbac/server_viewer_role.yaml b/app/sidero-controller-manager/config/rbac/server_viewer_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/server_viewer_role.yaml rename to app/sidero-controller-manager/config/rbac/server_viewer_role.yaml diff --git a/app/metal-controller-manager/config/rbac/serverclass_editor_role.yaml b/app/sidero-controller-manager/config/rbac/serverclass_editor_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/serverclass_editor_role.yaml rename to app/sidero-controller-manager/config/rbac/serverclass_editor_role.yaml diff --git a/app/metal-controller-manager/config/rbac/serverclass_viewer_role.yaml b/app/sidero-controller-manager/config/rbac/serverclass_viewer_role.yaml similarity index 100% rename from app/metal-controller-manager/config/rbac/serverclass_viewer_role.yaml rename to app/sidero-controller-manager/config/rbac/serverclass_viewer_role.yaml diff --git a/app/metal-controller-manager/config/samples/metal_v1alpha1_environment.yaml b/app/sidero-controller-manager/config/samples/metal_v1alpha1_environment.yaml similarity index 100% rename from app/metal-controller-manager/config/samples/metal_v1alpha1_environment.yaml rename to app/sidero-controller-manager/config/samples/metal_v1alpha1_environment.yaml diff --git a/app/metal-controller-manager/config/samples/metal_v1alpha1_server.yaml b/app/sidero-controller-manager/config/samples/metal_v1alpha1_server.yaml similarity index 100% rename from app/metal-controller-manager/config/samples/metal_v1alpha1_server.yaml rename to app/sidero-controller-manager/config/samples/metal_v1alpha1_server.yaml diff --git a/app/metal-controller-manager/config/samples/metal_v1alpha1_serverclass.yaml b/app/sidero-controller-manager/config/samples/metal_v1alpha1_serverclass.yaml similarity index 100% rename from app/metal-controller-manager/config/samples/metal_v1alpha1_serverclass.yaml rename to app/sidero-controller-manager/config/samples/metal_v1alpha1_serverclass.yaml diff --git a/app/metal-controller-manager/config/webhook/kustomization.yaml b/app/sidero-controller-manager/config/webhook/kustomization.yaml similarity index 100% rename from app/metal-controller-manager/config/webhook/kustomization.yaml rename to app/sidero-controller-manager/config/webhook/kustomization.yaml diff --git a/app/metal-controller-manager/config/webhook/kustomizeconfig.yaml b/app/sidero-controller-manager/config/webhook/kustomizeconfig.yaml similarity index 100% rename from app/metal-controller-manager/config/webhook/kustomizeconfig.yaml rename to app/sidero-controller-manager/config/webhook/kustomizeconfig.yaml diff --git a/app/metal-controller-manager/config/webhook/service.yaml b/app/sidero-controller-manager/config/webhook/service.yaml similarity index 100% rename from app/metal-controller-manager/config/webhook/service.yaml rename to app/sidero-controller-manager/config/webhook/service.yaml diff --git a/app/metal-controller-manager/config/webhookcainjection_patch.yaml b/app/sidero-controller-manager/config/webhookcainjection_patch.yaml similarity index 100% rename from app/metal-controller-manager/config/webhookcainjection_patch.yaml rename to app/sidero-controller-manager/config/webhookcainjection_patch.yaml diff --git a/app/metal-controller-manager/controllers/environment_controller.go b/app/sidero-controller-manager/controllers/environment_controller.go similarity index 97% rename from app/metal-controller-manager/controllers/environment_controller.go rename to app/sidero-controller-manager/controllers/environment_controller.go index e08880793..69d12bc36 100644 --- a/app/metal-controller-manager/controllers/environment_controller.go +++ b/app/sidero-controller-manager/controllers/environment_controller.go @@ -24,8 +24,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants" ) // EnvironmentReconciler reconciles a Environment object. diff --git a/app/metal-controller-manager/controllers/server_controller.go b/app/sidero-controller-manager/controllers/server_controller.go similarity index 97% rename from app/metal-controller-manager/controllers/server_controller.go rename to app/sidero-controller-manager/controllers/server_controller.go index e73cd4d21..21cb68b31 100644 --- a/app/metal-controller-manager/controllers/server_controller.go +++ b/app/sidero-controller-manager/controllers/server_controller.go @@ -30,10 +30,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/metal" - "github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants" + infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/metal" + "github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants" ) const ( diff --git a/app/metal-controller-manager/controllers/serverclass_controller.go b/app/sidero-controller-manager/controllers/serverclass_controller.go similarity index 98% rename from app/metal-controller-manager/controllers/serverclass_controller.go rename to app/sidero-controller-manager/controllers/serverclass_controller.go index 26793a882..be1ddac6d 100644 --- a/app/metal-controller-manager/controllers/serverclass_controller.go +++ b/app/sidero-controller-manager/controllers/serverclass_controller.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // ServerClassReconciler reconciles a ServerClass object. diff --git a/app/metal-controller-manager/controllers/suite_test.go b/app/sidero-controller-manager/controllers/suite_test.go similarity index 95% rename from app/metal-controller-manager/controllers/suite_test.go rename to app/sidero-controller-manager/controllers/suite_test.go index bc1012023..2a7f40d38 100644 --- a/app/metal-controller-manager/controllers/suite_test.go +++ b/app/sidero-controller-manager/controllers/suite_test.go @@ -18,7 +18,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/app/metal-controller-manager/internal/api/api.pb.go b/app/sidero-controller-manager/internal/api/api.pb.go similarity index 98% rename from app/metal-controller-manager/internal/api/api.pb.go rename to app/sidero-controller-manager/internal/api/api.pb.go index faac2f9f8..acdedb14a 100644 --- a/app/metal-controller-manager/internal/api/api.pb.go +++ b/app/sidero-controller-manager/internal/api/api.pb.go @@ -877,12 +877,12 @@ var file_api_proto_rawDesc = []byte{ 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x4d, 0x43, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x4d, 0x43, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, + 0x42, 0x4c, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x61, 0x6c, 0x6f, 0x73, 0x2d, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x73, 0x69, 0x64, - 0x65, 0x72, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x2d, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2d, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x73, 0x69, 0x64, 0x65, 0x72, 0x6f, 0x2d, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2d, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, + 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x70, 0x69, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/app/metal-controller-manager/internal/api/api.proto b/app/sidero-controller-manager/internal/api/api.proto similarity index 94% rename from app/metal-controller-manager/internal/api/api.proto rename to app/sidero-controller-manager/internal/api/api.proto index aff7e97f1..d9e4ab56d 100644 --- a/app/metal-controller-manager/internal/api/api.proto +++ b/app/sidero-controller-manager/internal/api/api.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package api; option go_package = - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/api"; + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/api"; service Agent { rpc CreateServer(CreateServerRequest) returns(CreateServerResponse); diff --git a/app/metal-controller-manager/internal/api/api_grpc.pb.go b/app/sidero-controller-manager/internal/api/api_grpc.pb.go similarity index 100% rename from app/metal-controller-manager/internal/api/api_grpc.pb.go rename to app/sidero-controller-manager/internal/api/api_grpc.pb.go diff --git a/app/metal-controller-manager/internal/ipxe/ipxe_server.go b/app/sidero-controller-manager/internal/ipxe/ipxe_server.go similarity index 97% rename from app/metal-controller-manager/internal/ipxe/ipxe_server.go rename to app/sidero-controller-manager/internal/ipxe/ipxe_server.go index 0061e861c..52f8c1fd0 100644 --- a/app/metal-controller-manager/internal/ipxe/ipxe_server.go +++ b/app/sidero-controller-manager/internal/ipxe/ipxe_server.go @@ -26,9 +26,9 @@ import ( "github.com/talos-systems/go-procfs/procfs" - infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants" + infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants" ) var ( diff --git a/app/metal-controller-manager/internal/ipxe/ipxe_test.go b/app/sidero-controller-manager/internal/ipxe/ipxe_test.go similarity index 100% rename from app/metal-controller-manager/internal/ipxe/ipxe_test.go rename to app/sidero-controller-manager/internal/ipxe/ipxe_test.go diff --git a/app/metal-controller-manager/internal/ipxe/patch.go b/app/sidero-controller-manager/internal/ipxe/patch.go similarity index 100% rename from app/metal-controller-manager/internal/ipxe/patch.go rename to app/sidero-controller-manager/internal/ipxe/patch.go diff --git a/app/metal-controller-manager/internal/metadata/metadata_server.go b/app/sidero-controller-manager/internal/metadata/metadata_server.go similarity index 98% rename from app/metal-controller-manager/internal/metadata/metadata_server.go rename to app/sidero-controller-manager/internal/metadata/metadata_server.go index 39f261340..96a4eab9b 100644 --- a/app/metal-controller-manager/internal/metadata/metadata_server.go +++ b/app/sidero-controller-manager/internal/metadata/metadata_server.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/cluster-api/util" runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) type errorWithCode struct { diff --git a/app/metal-controller-manager/internal/power/api/api.go b/app/sidero-controller-manager/internal/power/api/api.go similarity index 96% rename from app/metal-controller-manager/internal/power/api/api.go rename to app/sidero-controller-manager/internal/power/api/api.go index 12954c5eb..937e52b15 100644 --- a/app/metal-controller-manager/internal/power/api/api.go +++ b/app/sidero-controller-manager/internal/power/api/api.go @@ -14,7 +14,7 @@ import ( "net/http" "time" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // Client provides management over simple API. diff --git a/app/metal-controller-manager/internal/power/api/api_test.go b/app/sidero-controller-manager/internal/power/api/api_test.go similarity index 100% rename from app/metal-controller-manager/internal/power/api/api_test.go rename to app/sidero-controller-manager/internal/power/api/api_test.go diff --git a/app/metal-controller-manager/internal/power/api/dice.go b/app/sidero-controller-manager/internal/power/api/dice.go similarity index 100% rename from app/metal-controller-manager/internal/power/api/dice.go rename to app/sidero-controller-manager/internal/power/api/dice.go diff --git a/app/metal-controller-manager/internal/power/ipmi/ipmi.go b/app/sidero-controller-manager/internal/power/ipmi/ipmi.go similarity index 98% rename from app/metal-controller-manager/internal/power/ipmi/ipmi.go rename to app/sidero-controller-manager/internal/power/ipmi/ipmi.go index c36309c1b..120dca6e5 100644 --- a/app/metal-controller-manager/internal/power/ipmi/ipmi.go +++ b/app/sidero-controller-manager/internal/power/ipmi/ipmi.go @@ -7,7 +7,7 @@ package ipmi import ( goipmi "github.com/pensando/goipmi" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // Link to the IPMI spec: https://www.intel.com/content/dam/www/public/us/en/documents/product-briefs/ipmi-second-gen-interface-spec-v2-rev1-1.pdf diff --git a/app/metal-controller-manager/internal/power/ipmi/ipmi_test.go b/app/sidero-controller-manager/internal/power/ipmi/ipmi_test.go similarity index 100% rename from app/metal-controller-manager/internal/power/ipmi/ipmi_test.go rename to app/sidero-controller-manager/internal/power/ipmi/ipmi_test.go diff --git a/app/metal-controller-manager/internal/power/metal/fake.go b/app/sidero-controller-manager/internal/power/metal/fake.go similarity index 100% rename from app/metal-controller-manager/internal/power/metal/fake.go rename to app/sidero-controller-manager/internal/power/metal/fake.go diff --git a/app/metal-controller-manager/internal/power/metal/metal.go b/app/sidero-controller-manager/internal/power/metal/metal.go similarity index 84% rename from app/metal-controller-manager/internal/power/metal/metal.go rename to app/sidero-controller-manager/internal/power/metal/metal.go index 5942cd653..fc02d9ce1 100644 --- a/app/metal-controller-manager/internal/power/metal/metal.go +++ b/app/sidero-controller-manager/internal/power/metal/metal.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/api" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/ipmi" + "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/api" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/ipmi" ) // ManagementClient control power and boot order of metal machine. diff --git a/app/metal-controller-manager/internal/power/metal/metal_test.go b/app/sidero-controller-manager/internal/power/metal/metal_test.go similarity index 100% rename from app/metal-controller-manager/internal/power/metal/metal_test.go rename to app/sidero-controller-manager/internal/power/metal/metal_test.go diff --git a/app/metal-controller-manager/internal/server/server.go b/app/sidero-controller-manager/internal/server/server.go similarity index 98% rename from app/metal-controller-manager/internal/server/server.go rename to app/sidero-controller-manager/internal/server/server.go index 0aae7dd02..f5fb8f1b0 100644 --- a/app/metal-controller-manager/internal/server/server.go +++ b/app/sidero-controller-manager/internal/server/server.go @@ -23,8 +23,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/api" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/api" ) type server struct { diff --git a/app/metal-controller-manager/internal/server/server_test.go b/app/sidero-controller-manager/internal/server/server_test.go similarity index 100% rename from app/metal-controller-manager/internal/server/server_test.go rename to app/sidero-controller-manager/internal/server/server_test.go diff --git a/app/metal-controller-manager/internal/tftp/tftp_server.go b/app/sidero-controller-manager/internal/tftp/tftp_server.go similarity index 100% rename from app/metal-controller-manager/internal/tftp/tftp_server.go rename to app/sidero-controller-manager/internal/tftp/tftp_server.go diff --git a/app/metal-controller-manager/internal/tftp/tftp_test.go b/app/sidero-controller-manager/internal/tftp/tftp_test.go similarity index 100% rename from app/metal-controller-manager/internal/tftp/tftp_test.go rename to app/sidero-controller-manager/internal/tftp/tftp_test.go diff --git a/app/metal-controller-manager/main.go b/app/sidero-controller-manager/main.go similarity index 92% rename from app/metal-controller-manager/main.go rename to app/sidero-controller-manager/main.go index e33cb17dc..4ac474253 100644 --- a/app/metal-controller-manager/main.go +++ b/app/sidero-controller-manager/main.go @@ -29,15 +29,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log/zap" - infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" - "github.com/talos-systems/sidero/app/metal-controller-manager/controllers" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/ipxe" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/metadata" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/api" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/server" - "github.com/talos-systems/sidero/app/metal-controller-manager/internal/tftp" - "github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants" + infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/controllers" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/ipxe" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/metadata" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/api" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/server" + "github.com/talos-systems/sidero/app/sidero-controller-manager/internal/tftp" + "github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants" "github.com/talos-systems/sidero/internal/client" // +kubebuilder:scaffold:imports ) @@ -142,7 +142,7 @@ func main() { Scheme: scheme, MetricsBindAddress: metricsAddr, LeaderElection: enableLeaderElection, - LeaderElectionID: "controller-leader-election-metal-controller-manager", + LeaderElectionID: "controller-leader-election-sidero-controller-manager", Port: 9443, }) if err != nil { diff --git a/app/metal-controller-manager/pkg/constants/constants.go b/app/sidero-controller-manager/pkg/constants/constants.go similarity index 100% rename from app/metal-controller-manager/pkg/constants/constants.go rename to app/sidero-controller-manager/pkg/constants/constants.go diff --git a/config/kustomization.yaml b/config/kustomization.yaml index 7b94e1792..4d829888a 100644 --- a/config/kustomization.yaml +++ b/config/kustomization.yaml @@ -2,8 +2,8 @@ resources: - namespace.yaml bases: - - ../app/cluster-api-provider-sidero/config - - ../app/metal-controller-manager/config + - ../app/caps-controller-manager/config + - ../app/sidero-controller-manager/config commonLabels: app: sidero diff --git a/hack/release.toml b/hack/release.toml index 123e98d83..17a0a6feb 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -15,6 +15,18 @@ preface = """\ [notes] + [notes.app-rename] + title = "Application Renaming" + description = """\ +The layout of this repository, as well as the naming of the two apps that make up Sidero have changed. +In an effort to give better clarity to users, there are two apps: + +- caps-controller-manager: Responsible for all things related to the Cluster API infrastructur provider +- sidero-controller-manager: Responsible for all things related to Sidero's bare metal integrations. + +It should also be noted that container image names, as well as the kustomize code has been edited to match. +""" + [notes.ipxe-script] title = "iPXE script" description = """\ diff --git a/internal/client/client.go b/internal/client/client.go index 6e1e56df0..6f8abbe96 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -15,8 +15,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1alpha3" "sigs.k8s.io/controller-runtime/pkg/client" - caps "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metal "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + caps "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + scm "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // NewClient is responsible for creating a controller-runtime k8s client with all schemas. @@ -62,7 +62,7 @@ func NewClient(kubeconfig *string) (client.Client, error) { return nil, err } - if err = metal.AddToScheme(scheme); err != nil { + if err = scm.AddToScheme(scheme); err != nil { return nil, err } diff --git a/sfyra/pkg/capi/cluster.go b/sfyra/pkg/capi/cluster.go index 7384845fd..af0687677 100644 --- a/sfyra/pkg/capi/cluster.go +++ b/sfyra/pkg/capi/cluster.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/cluster-api/api/v1alpha3" runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" - sidero "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metal "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + sidero "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metal "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // Cluster attaches to the provisioned CAPI cluster and provides talos.Cluster. diff --git a/sfyra/pkg/capi/metalclient.go b/sfyra/pkg/capi/metalclient.go index 03065f648..4192df410 100644 --- a/sfyra/pkg/capi/metalclient.go +++ b/sfyra/pkg/capi/metalclient.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/cluster-api/api/v1alpha3" runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" - sidero "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metal "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + sidero "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metal "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // GetMetalClient builds k8s client with schemes required to access all the CAPI/Sidero/Talos components. diff --git a/sfyra/pkg/loadbalancer/loadbalancer.go b/sfyra/pkg/loadbalancer/loadbalancer.go index 67b64ca04..100eaf3e7 100644 --- a/sfyra/pkg/loadbalancer/loadbalancer.go +++ b/sfyra/pkg/loadbalancer/loadbalancer.go @@ -25,8 +25,8 @@ import ( "sigs.k8s.io/cluster-api/api/v1alpha3" "sigs.k8s.io/controller-runtime/pkg/client" - sidero "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metal "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + sidero "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metal "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // ControlPlane implements dynamic loadbalancer for the control plane. diff --git a/sfyra/pkg/tests/environment.go b/sfyra/pkg/tests/environment.go index ce9f0185d..eed303631 100644 --- a/sfyra/pkg/tests/environment.go +++ b/sfyra/pkg/tests/environment.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" "github.com/talos-systems/sidero/sfyra/pkg/constants" "github.com/talos-systems/sidero/sfyra/pkg/talos" ) diff --git a/sfyra/pkg/tests/match.go b/sfyra/pkg/tests/match.go index 126fae424..d6fdfa4b9 100644 --- a/sfyra/pkg/tests/match.go +++ b/sfyra/pkg/tests/match.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/cluster-api/api/v1alpha3" "sigs.k8s.io/controller-runtime/pkg/client" - metal "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metal "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // TestMatchServersMetalMachines verifies that number of metal machines and servers match. diff --git a/sfyra/pkg/tests/reconcile.go b/sfyra/pkg/tests/reconcile.go index 31bce9ea6..eef3dee35 100644 --- a/sfyra/pkg/tests/reconcile.go +++ b/sfyra/pkg/tests/reconcile.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - sidero "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - metal "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + sidero "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + metal "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // TestMachineDeploymentReconcile verifies that machine deployment can reconcile delete machines. diff --git a/sfyra/pkg/tests/reset.go b/sfyra/pkg/tests/reset.go index 0bb516300..68eeac88f 100644 --- a/sfyra/pkg/tests/reset.go +++ b/sfyra/pkg/tests/reset.go @@ -15,8 +15,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - metal "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3" - sidero "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + metal "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3" + sidero "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" ) // TestServerReset verifies that all the servers got reset. diff --git a/sfyra/pkg/tests/server.go b/sfyra/pkg/tests/server.go index 46b765221..ce4ab47c3 100644 --- a/sfyra/pkg/tests/server.go +++ b/sfyra/pkg/tests/server.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" "github.com/talos-systems/sidero/sfyra/pkg/constants" "github.com/talos-systems/sidero/sfyra/pkg/vm" ) diff --git a/sfyra/pkg/tests/server_class.go b/sfyra/pkg/tests/server_class.go index 9a832215a..6dccf29fb 100644 --- a/sfyra/pkg/tests/server_class.go +++ b/sfyra/pkg/tests/server_class.go @@ -31,7 +31,7 @@ import ( capiclient "sigs.k8s.io/cluster-api/cmd/clusterctl/client" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1" + "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1" "github.com/talos-systems/sidero/sfyra/pkg/capi" "github.com/talos-systems/sidero/sfyra/pkg/constants" "github.com/talos-systems/sidero/sfyra/pkg/talos"