diff --git a/Makefile b/Makefile index 59f91c74e..df2f5056d 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and .PHONY: hmc-chart-generate hmc-chart-generate: kustomize helmify ## Generate hmc helm chart - rm -rf charts/hmc/values.yaml charts/hmc/templates/*.yaml - $(KUSTOMIZE) build config/default | $(HELMIFY) charts/hmc + rm -rf templates/hmc/values.yaml templates/hmc/templates/*.yaml + $(KUSTOMIZE) build config/default | $(HELMIFY) templates/hmc .PHONY: generate-all generate-all: generate manifests hmc-chart-generate diff --git a/api/v1alpha1/template_types.go b/api/v1alpha1/template_types.go index 92cdac7bb..482999cdc 100644 --- a/api/v1alpha1/template_types.go +++ b/api/v1alpha1/template_types.go @@ -48,8 +48,8 @@ const ( TemplateTypeDeployment TemplateType = "deployment" // TemplateTypeProvider is the type used for adding CAPI providers in the HMC Management object. TemplateTypeProvider TemplateType = "provider" - // TemplateTypeManagement is the type used for HMC management components - TemplateTypeManagement TemplateType = "management" + // TemplateTypeCore is the type used for HMC and CAPI core components + TemplateTypeCore TemplateType = "core" ) // TemplateSpec defines the desired state of Template diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go index 404179300..b7877cd37 100644 --- a/internal/controller/template_controller.go +++ b/internal/controller/template_controller.go @@ -152,7 +152,7 @@ func (r *TemplateReconciler) parseChartMetadata(template *hmc.Template, chart *c } templateType := chart.Metadata.Annotations[hmc.ChartAnnotationType] switch hmc.TemplateType(templateType) { - case hmc.TemplateTypeDeployment, hmc.TemplateTypeProvider, hmc.TemplateTypeManagement: + case hmc.TemplateTypeDeployment, hmc.TemplateTypeProvider, hmc.TemplateTypeCore: default: return errNoProviderType } diff --git a/charts/cluster-api-provider-aws/.helmignore b/templates/cluster-api-provider-aws/.helmignore similarity index 100% rename from charts/cluster-api-provider-aws/.helmignore rename to templates/cluster-api-provider-aws/.helmignore diff --git a/charts/cluster-api-provider-aws/Chart.yaml b/templates/cluster-api-provider-aws/Chart.yaml similarity index 100% rename from charts/cluster-api-provider-aws/Chart.yaml rename to templates/cluster-api-provider-aws/Chart.yaml diff --git a/charts/cluster-api-provider-aws/templates/_helpers.tpl b/templates/cluster-api-provider-aws/templates/_helpers.tpl similarity index 100% rename from charts/cluster-api-provider-aws/templates/_helpers.tpl rename to templates/cluster-api-provider-aws/templates/_helpers.tpl diff --git a/charts/cluster-api-provider-aws/templates/crds/awscluster.yaml b/templates/cluster-api-provider-aws/templates/crds/awscluster.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awscluster.yaml rename to templates/cluster-api-provider-aws/templates/crds/awscluster.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsclustercontrolleridentity.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclustercontrolleridentity.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsclustercontrolleridentity.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsclustercontrolleridentity.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsclusterroleidentity.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclusterroleidentity.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsclusterroleidentity.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsclusterroleidentity.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsclusterstaticidentity.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclusterstaticidentity.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsclusterstaticidentity.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsclusterstaticidentity.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsclustertemplate.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclustertemplate.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsclustertemplate.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsclustertemplate.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsfargateprofile.yaml b/templates/cluster-api-provider-aws/templates/crds/awsfargateprofile.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsfargateprofile.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsfargateprofile.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsmachine.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmachine.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsmachine.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsmachine.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsmachinepool.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmachinepool.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsmachinepool.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsmachinepool.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsmachinetemplate.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmachinetemplate.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsmachinetemplate.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsmachinetemplate.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsmanagedcluster.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmanagedcluster.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsmanagedcluster.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsmanagedcluster.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsmanagedcontrolplane.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmanagedcontrolplane.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsmanagedcontrolplane.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsmanagedcontrolplane.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/awsmanagedmachinepool.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmanagedmachinepool.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/awsmanagedmachinepool.yaml rename to templates/cluster-api-provider-aws/templates/crds/awsmanagedmachinepool.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/eksconfig.yaml b/templates/cluster-api-provider-aws/templates/crds/eksconfig.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/eksconfig.yaml rename to templates/cluster-api-provider-aws/templates/crds/eksconfig.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/eksconfigtemplate.yaml b/templates/cluster-api-provider-aws/templates/crds/eksconfigtemplate.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/eksconfigtemplate.yaml rename to templates/cluster-api-provider-aws/templates/crds/eksconfigtemplate.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/rosacluster.yaml b/templates/cluster-api-provider-aws/templates/crds/rosacluster.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/rosacluster.yaml rename to templates/cluster-api-provider-aws/templates/crds/rosacluster.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/rosacontrolplane.yaml b/templates/cluster-api-provider-aws/templates/crds/rosacontrolplane.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/rosacontrolplane.yaml rename to templates/cluster-api-provider-aws/templates/crds/rosacontrolplane.yaml diff --git a/charts/cluster-api-provider-aws/templates/crds/rosamachinepool.yaml b/templates/cluster-api-provider-aws/templates/crds/rosamachinepool.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/crds/rosamachinepool.yaml rename to templates/cluster-api-provider-aws/templates/crds/rosamachinepool.yaml diff --git a/charts/cluster-api-provider-aws/templates/deployment.yaml b/templates/cluster-api-provider-aws/templates/deployment.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/deployment.yaml rename to templates/cluster-api-provider-aws/templates/deployment.yaml diff --git a/charts/cluster-api-provider-aws/templates/metrics-service.yaml b/templates/cluster-api-provider-aws/templates/metrics-service.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/metrics-service.yaml rename to templates/cluster-api-provider-aws/templates/metrics-service.yaml diff --git a/charts/cluster-api-provider-aws/templates/mutating-webhook-configuration.yaml b/templates/cluster-api-provider-aws/templates/mutating-webhook-configuration.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/mutating-webhook-configuration.yaml rename to templates/cluster-api-provider-aws/templates/mutating-webhook-configuration.yaml diff --git a/charts/cluster-api-provider-aws/templates/rbac/leader-elect.yaml b/templates/cluster-api-provider-aws/templates/rbac/leader-elect.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/rbac/leader-elect.yaml rename to templates/cluster-api-provider-aws/templates/rbac/leader-elect.yaml diff --git a/charts/cluster-api-provider-aws/templates/rbac/manager.yaml b/templates/cluster-api-provider-aws/templates/rbac/manager.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/rbac/manager.yaml rename to templates/cluster-api-provider-aws/templates/rbac/manager.yaml diff --git a/charts/cluster-api-provider-aws/templates/selfsigned-issuer.yaml b/templates/cluster-api-provider-aws/templates/selfsigned-issuer.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/selfsigned-issuer.yaml rename to templates/cluster-api-provider-aws/templates/selfsigned-issuer.yaml diff --git a/charts/cluster-api-provider-aws/templates/serviceaccount.yaml b/templates/cluster-api-provider-aws/templates/serviceaccount.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/serviceaccount.yaml rename to templates/cluster-api-provider-aws/templates/serviceaccount.yaml diff --git a/charts/cluster-api-provider-aws/templates/serving-cert.yaml b/templates/cluster-api-provider-aws/templates/serving-cert.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/serving-cert.yaml rename to templates/cluster-api-provider-aws/templates/serving-cert.yaml diff --git a/charts/cluster-api-provider-aws/templates/validating-webhook-configuration.yaml b/templates/cluster-api-provider-aws/templates/validating-webhook-configuration.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/validating-webhook-configuration.yaml rename to templates/cluster-api-provider-aws/templates/validating-webhook-configuration.yaml diff --git a/charts/cluster-api-provider-aws/templates/webhook-service.yaml b/templates/cluster-api-provider-aws/templates/webhook-service.yaml similarity index 100% rename from charts/cluster-api-provider-aws/templates/webhook-service.yaml rename to templates/cluster-api-provider-aws/templates/webhook-service.yaml diff --git a/charts/cluster-api-provider-aws/values.yaml b/templates/cluster-api-provider-aws/values.yaml similarity index 100% rename from charts/cluster-api-provider-aws/values.yaml rename to templates/cluster-api-provider-aws/values.yaml diff --git a/charts/cluster-api/.helmignore b/templates/cluster-api/.helmignore similarity index 100% rename from charts/cluster-api/.helmignore rename to templates/cluster-api/.helmignore diff --git a/charts/cluster-api/Chart.yaml b/templates/cluster-api/Chart.yaml similarity index 97% rename from charts/cluster-api/Chart.yaml rename to templates/cluster-api/Chart.yaml index fca1c82a3..41e7482e5 100644 --- a/charts/cluster-api/Chart.yaml +++ b/templates/cluster-api/Chart.yaml @@ -20,4 +20,4 @@ version: 0.1.0 # It is recommended to use it with quotes. appVersion: "0.1.0" annotations: - hmc.mirantis.com/type: management + hmc.mirantis.com/type: core diff --git a/charts/cluster-api/templates/_helpers.tpl b/templates/cluster-api/templates/_helpers.tpl similarity index 100% rename from charts/cluster-api/templates/_helpers.tpl rename to templates/cluster-api/templates/_helpers.tpl diff --git a/charts/cluster-api/templates/crds/clusterclasses.yaml b/templates/cluster-api/templates/crds/clusterclasses.yaml similarity index 100% rename from charts/cluster-api/templates/crds/clusterclasses.yaml rename to templates/cluster-api/templates/crds/clusterclasses.yaml diff --git a/charts/cluster-api/templates/crds/clusterresourcesetbindings.yaml b/templates/cluster-api/templates/crds/clusterresourcesetbindings.yaml similarity index 100% rename from charts/cluster-api/templates/crds/clusterresourcesetbindings.yaml rename to templates/cluster-api/templates/crds/clusterresourcesetbindings.yaml diff --git a/charts/cluster-api/templates/crds/clusterresourcesets.yaml b/templates/cluster-api/templates/crds/clusterresourcesets.yaml similarity index 100% rename from charts/cluster-api/templates/crds/clusterresourcesets.yaml rename to templates/cluster-api/templates/crds/clusterresourcesets.yaml diff --git a/charts/cluster-api/templates/crds/clusters.yaml b/templates/cluster-api/templates/crds/clusters.yaml similarity index 100% rename from charts/cluster-api/templates/crds/clusters.yaml rename to templates/cluster-api/templates/crds/clusters.yaml diff --git a/charts/cluster-api/templates/crds/extensionconfigs.yaml b/templates/cluster-api/templates/crds/extensionconfigs.yaml similarity index 100% rename from charts/cluster-api/templates/crds/extensionconfigs.yaml rename to templates/cluster-api/templates/crds/extensionconfigs.yaml diff --git a/charts/cluster-api/templates/crds/ipaddressclaims.yaml b/templates/cluster-api/templates/crds/ipaddressclaims.yaml similarity index 100% rename from charts/cluster-api/templates/crds/ipaddressclaims.yaml rename to templates/cluster-api/templates/crds/ipaddressclaims.yaml diff --git a/charts/cluster-api/templates/crds/ipaddresses.yaml b/templates/cluster-api/templates/crds/ipaddresses.yaml similarity index 100% rename from charts/cluster-api/templates/crds/ipaddresses.yaml rename to templates/cluster-api/templates/crds/ipaddresses.yaml diff --git a/charts/cluster-api/templates/crds/machinedeployments.yaml b/templates/cluster-api/templates/crds/machinedeployments.yaml similarity index 100% rename from charts/cluster-api/templates/crds/machinedeployments.yaml rename to templates/cluster-api/templates/crds/machinedeployments.yaml diff --git a/charts/cluster-api/templates/crds/machinehealthchecks.yaml b/templates/cluster-api/templates/crds/machinehealthchecks.yaml similarity index 100% rename from charts/cluster-api/templates/crds/machinehealthchecks.yaml rename to templates/cluster-api/templates/crds/machinehealthchecks.yaml diff --git a/charts/cluster-api/templates/crds/machinepools.yaml b/templates/cluster-api/templates/crds/machinepools.yaml similarity index 100% rename from charts/cluster-api/templates/crds/machinepools.yaml rename to templates/cluster-api/templates/crds/machinepools.yaml diff --git a/charts/cluster-api/templates/crds/machines.yaml b/templates/cluster-api/templates/crds/machines.yaml similarity index 100% rename from charts/cluster-api/templates/crds/machines.yaml rename to templates/cluster-api/templates/crds/machines.yaml diff --git a/charts/cluster-api/templates/crds/machinesets.yaml b/templates/cluster-api/templates/crds/machinesets.yaml similarity index 100% rename from charts/cluster-api/templates/crds/machinesets.yaml rename to templates/cluster-api/templates/crds/machinesets.yaml diff --git a/charts/cluster-api/templates/deployment.yaml b/templates/cluster-api/templates/deployment.yaml similarity index 100% rename from charts/cluster-api/templates/deployment.yaml rename to templates/cluster-api/templates/deployment.yaml diff --git a/charts/cluster-api/templates/mutating-webhook-configuration.yaml b/templates/cluster-api/templates/mutating-webhook-configuration.yaml similarity index 100% rename from charts/cluster-api/templates/mutating-webhook-configuration.yaml rename to templates/cluster-api/templates/mutating-webhook-configuration.yaml diff --git a/charts/cluster-api/templates/rbac/aggregated-manager.yaml b/templates/cluster-api/templates/rbac/aggregated-manager.yaml similarity index 100% rename from charts/cluster-api/templates/rbac/aggregated-manager.yaml rename to templates/cluster-api/templates/rbac/aggregated-manager.yaml diff --git a/charts/cluster-api/templates/rbac/leader-election.yaml b/templates/cluster-api/templates/rbac/leader-election.yaml similarity index 100% rename from charts/cluster-api/templates/rbac/leader-election.yaml rename to templates/cluster-api/templates/rbac/leader-election.yaml diff --git a/charts/cluster-api/templates/rbac/manager.yaml b/templates/cluster-api/templates/rbac/manager.yaml similarity index 100% rename from charts/cluster-api/templates/rbac/manager.yaml rename to templates/cluster-api/templates/rbac/manager.yaml diff --git a/charts/cluster-api/templates/selfsigned-issuer.yaml b/templates/cluster-api/templates/selfsigned-issuer.yaml similarity index 100% rename from charts/cluster-api/templates/selfsigned-issuer.yaml rename to templates/cluster-api/templates/selfsigned-issuer.yaml diff --git a/charts/cluster-api/templates/serviceaccount.yaml b/templates/cluster-api/templates/serviceaccount.yaml similarity index 100% rename from charts/cluster-api/templates/serviceaccount.yaml rename to templates/cluster-api/templates/serviceaccount.yaml diff --git a/charts/cluster-api/templates/serving-cert.yaml b/templates/cluster-api/templates/serving-cert.yaml similarity index 100% rename from charts/cluster-api/templates/serving-cert.yaml rename to templates/cluster-api/templates/serving-cert.yaml diff --git a/charts/cluster-api/templates/validating-webhook-configuration.yaml b/templates/cluster-api/templates/validating-webhook-configuration.yaml similarity index 100% rename from charts/cluster-api/templates/validating-webhook-configuration.yaml rename to templates/cluster-api/templates/validating-webhook-configuration.yaml diff --git a/charts/cluster-api/templates/webhook-service.yaml b/templates/cluster-api/templates/webhook-service.yaml similarity index 100% rename from charts/cluster-api/templates/webhook-service.yaml rename to templates/cluster-api/templates/webhook-service.yaml diff --git a/charts/cluster-api/values.yaml b/templates/cluster-api/values.yaml similarity index 100% rename from charts/cluster-api/values.yaml rename to templates/cluster-api/values.yaml diff --git a/charts/hmc/.helmignore b/templates/hmc/.helmignore similarity index 100% rename from charts/hmc/.helmignore rename to templates/hmc/.helmignore diff --git a/charts/hmc/Chart.yaml b/templates/hmc/Chart.yaml similarity index 96% rename from charts/hmc/Chart.yaml rename to templates/hmc/Chart.yaml index 2f1e7f753..6945d5330 100644 --- a/charts/hmc/Chart.yaml +++ b/templates/hmc/Chart.yaml @@ -20,4 +20,4 @@ version: 0.1.0 # It is recommended to use it with quotes. appVersion: "0.1.0" annotations: - hmc.mirantis.com/type: management + hmc.mirantis.com/type: core diff --git a/charts/hmc/templates/_helpers.tpl b/templates/hmc/templates/_helpers.tpl similarity index 100% rename from charts/hmc/templates/_helpers.tpl rename to templates/hmc/templates/_helpers.tpl diff --git a/charts/hmc/templates/awsprovider-crd.yaml b/templates/hmc/templates/awsprovider-crd.yaml similarity index 100% rename from charts/hmc/templates/awsprovider-crd.yaml rename to templates/hmc/templates/awsprovider-crd.yaml diff --git a/charts/hmc/templates/awsprovider-editor-rbac.yaml b/templates/hmc/templates/awsprovider-editor-rbac.yaml similarity index 100% rename from charts/hmc/templates/awsprovider-editor-rbac.yaml rename to templates/hmc/templates/awsprovider-editor-rbac.yaml diff --git a/charts/hmc/templates/awsprovider-viewer-rbac.yaml b/templates/hmc/templates/awsprovider-viewer-rbac.yaml similarity index 100% rename from charts/hmc/templates/awsprovider-viewer-rbac.yaml rename to templates/hmc/templates/awsprovider-viewer-rbac.yaml diff --git a/charts/hmc/templates/deployment-crd.yaml b/templates/hmc/templates/deployment-crd.yaml similarity index 100% rename from charts/hmc/templates/deployment-crd.yaml rename to templates/hmc/templates/deployment-crd.yaml diff --git a/charts/hmc/templates/deployment-editor-rbac.yaml b/templates/hmc/templates/deployment-editor-rbac.yaml similarity index 100% rename from charts/hmc/templates/deployment-editor-rbac.yaml rename to templates/hmc/templates/deployment-editor-rbac.yaml diff --git a/charts/hmc/templates/deployment-viewer-rbac.yaml b/templates/hmc/templates/deployment-viewer-rbac.yaml similarity index 100% rename from charts/hmc/templates/deployment-viewer-rbac.yaml rename to templates/hmc/templates/deployment-viewer-rbac.yaml diff --git a/charts/hmc/templates/deployment.yaml b/templates/hmc/templates/deployment.yaml similarity index 100% rename from charts/hmc/templates/deployment.yaml rename to templates/hmc/templates/deployment.yaml diff --git a/charts/hmc/templates/leader-election-rbac.yaml b/templates/hmc/templates/leader-election-rbac.yaml similarity index 100% rename from charts/hmc/templates/leader-election-rbac.yaml rename to templates/hmc/templates/leader-election-rbac.yaml diff --git a/charts/hmc/templates/management-crd.yaml b/templates/hmc/templates/management-crd.yaml similarity index 100% rename from charts/hmc/templates/management-crd.yaml rename to templates/hmc/templates/management-crd.yaml diff --git a/charts/hmc/templates/management-editor-rbac.yaml b/templates/hmc/templates/management-editor-rbac.yaml similarity index 100% rename from charts/hmc/templates/management-editor-rbac.yaml rename to templates/hmc/templates/management-editor-rbac.yaml diff --git a/charts/hmc/templates/management-viewer-rbac.yaml b/templates/hmc/templates/management-viewer-rbac.yaml similarity index 100% rename from charts/hmc/templates/management-viewer-rbac.yaml rename to templates/hmc/templates/management-viewer-rbac.yaml diff --git a/charts/hmc/templates/manager-rbac.yaml b/templates/hmc/templates/manager-rbac.yaml similarity index 100% rename from charts/hmc/templates/manager-rbac.yaml rename to templates/hmc/templates/manager-rbac.yaml diff --git a/charts/hmc/templates/metrics-service.yaml b/templates/hmc/templates/metrics-service.yaml similarity index 100% rename from charts/hmc/templates/metrics-service.yaml rename to templates/hmc/templates/metrics-service.yaml diff --git a/charts/hmc/templates/serviceaccount.yaml b/templates/hmc/templates/serviceaccount.yaml similarity index 100% rename from charts/hmc/templates/serviceaccount.yaml rename to templates/hmc/templates/serviceaccount.yaml diff --git a/charts/hmc/templates/template-crd.yaml b/templates/hmc/templates/template-crd.yaml similarity index 100% rename from charts/hmc/templates/template-crd.yaml rename to templates/hmc/templates/template-crd.yaml diff --git a/charts/hmc/templates/template-editor-rbac.yaml b/templates/hmc/templates/template-editor-rbac.yaml similarity index 100% rename from charts/hmc/templates/template-editor-rbac.yaml rename to templates/hmc/templates/template-editor-rbac.yaml diff --git a/charts/hmc/templates/template-viewer-rbac.yaml b/templates/hmc/templates/template-viewer-rbac.yaml similarity index 100% rename from charts/hmc/templates/template-viewer-rbac.yaml rename to templates/hmc/templates/template-viewer-rbac.yaml diff --git a/charts/hmc/values.yaml b/templates/hmc/values.yaml similarity index 100% rename from charts/hmc/values.yaml rename to templates/hmc/values.yaml diff --git a/charts/k0smotron/.helmignore b/templates/k0smotron/.helmignore similarity index 100% rename from charts/k0smotron/.helmignore rename to templates/k0smotron/.helmignore diff --git a/charts/k0smotron/Chart.yaml b/templates/k0smotron/Chart.yaml similarity index 100% rename from charts/k0smotron/Chart.yaml rename to templates/k0smotron/Chart.yaml diff --git a/charts/k0smotron/templates/_helpers.tpl b/templates/k0smotron/templates/_helpers.tpl similarity index 100% rename from charts/k0smotron/templates/_helpers.tpl rename to templates/k0smotron/templates/_helpers.tpl diff --git a/charts/k0smotron/templates/crds/cluster.yaml b/templates/k0smotron/templates/crds/cluster.yaml similarity index 100% rename from charts/k0smotron/templates/crds/cluster.yaml rename to templates/k0smotron/templates/crds/cluster.yaml diff --git a/charts/k0smotron/templates/crds/jointokenrequest.yaml b/templates/k0smotron/templates/crds/jointokenrequest.yaml similarity index 100% rename from charts/k0smotron/templates/crds/jointokenrequest.yaml rename to templates/k0smotron/templates/crds/jointokenrequest.yaml diff --git a/charts/k0smotron/templates/crds/k0scontrollerconfig.yaml b/templates/k0smotron/templates/crds/k0scontrollerconfig.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0scontrollerconfig.yaml rename to templates/k0smotron/templates/crds/k0scontrollerconfig.yaml diff --git a/charts/k0smotron/templates/crds/k0scontrolplane.yaml b/templates/k0smotron/templates/crds/k0scontrolplane.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0scontrolplane.yaml rename to templates/k0smotron/templates/crds/k0scontrolplane.yaml diff --git a/charts/k0smotron/templates/crds/k0scontrolplanetemplate.yaml b/templates/k0smotron/templates/crds/k0scontrolplanetemplate.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0scontrolplanetemplate.yaml rename to templates/k0smotron/templates/crds/k0scontrolplanetemplate.yaml diff --git a/charts/k0smotron/templates/crds/k0smotroncontrolplane.yaml b/templates/k0smotron/templates/crds/k0smotroncontrolplane.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0smotroncontrolplane.yaml rename to templates/k0smotron/templates/crds/k0smotroncontrolplane.yaml diff --git a/charts/k0smotron/templates/crds/k0smotroncontrolplanetemplate.yaml b/templates/k0smotron/templates/crds/k0smotroncontrolplanetemplate.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0smotroncontrolplanetemplate.yaml rename to templates/k0smotron/templates/crds/k0smotroncontrolplanetemplate.yaml diff --git a/charts/k0smotron/templates/crds/k0sworkerconfig.yaml b/templates/k0smotron/templates/crds/k0sworkerconfig.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0sworkerconfig.yaml rename to templates/k0smotron/templates/crds/k0sworkerconfig.yaml diff --git a/charts/k0smotron/templates/crds/k0sworkerconfigtemplate.yaml b/templates/k0smotron/templates/crds/k0sworkerconfigtemplate.yaml similarity index 100% rename from charts/k0smotron/templates/crds/k0sworkerconfigtemplate.yaml rename to templates/k0smotron/templates/crds/k0sworkerconfigtemplate.yaml diff --git a/charts/k0smotron/templates/crds/pooledremotemachine.yaml b/templates/k0smotron/templates/crds/pooledremotemachine.yaml similarity index 100% rename from charts/k0smotron/templates/crds/pooledremotemachine.yaml rename to templates/k0smotron/templates/crds/pooledremotemachine.yaml diff --git a/charts/k0smotron/templates/crds/remotecluster.yaml b/templates/k0smotron/templates/crds/remotecluster.yaml similarity index 100% rename from charts/k0smotron/templates/crds/remotecluster.yaml rename to templates/k0smotron/templates/crds/remotecluster.yaml diff --git a/charts/k0smotron/templates/crds/remotemachine.yaml b/templates/k0smotron/templates/crds/remotemachine.yaml similarity index 100% rename from charts/k0smotron/templates/crds/remotemachine.yaml rename to templates/k0smotron/templates/crds/remotemachine.yaml diff --git a/charts/k0smotron/templates/crds/remotemachinetemplate.yaml b/templates/k0smotron/templates/crds/remotemachinetemplate.yaml similarity index 100% rename from charts/k0smotron/templates/crds/remotemachinetemplate.yaml rename to templates/k0smotron/templates/crds/remotemachinetemplate.yaml diff --git a/charts/k0smotron/templates/deployment.yaml b/templates/k0smotron/templates/deployment.yaml similarity index 100% rename from charts/k0smotron/templates/deployment.yaml rename to templates/k0smotron/templates/deployment.yaml diff --git a/charts/k0smotron/templates/metrics-service.yaml b/templates/k0smotron/templates/metrics-service.yaml similarity index 100% rename from charts/k0smotron/templates/metrics-service.yaml rename to templates/k0smotron/templates/metrics-service.yaml diff --git a/charts/k0smotron/templates/rbac/leader-election.yaml b/templates/k0smotron/templates/rbac/leader-election.yaml similarity index 100% rename from charts/k0smotron/templates/rbac/leader-election.yaml rename to templates/k0smotron/templates/rbac/leader-election.yaml diff --git a/charts/k0smotron/templates/rbac/manager.yaml b/templates/k0smotron/templates/rbac/manager.yaml similarity index 100% rename from charts/k0smotron/templates/rbac/manager.yaml rename to templates/k0smotron/templates/rbac/manager.yaml diff --git a/charts/k0smotron/templates/rbac/metrics-reader.yaml b/templates/k0smotron/templates/rbac/metrics-reader.yaml similarity index 100% rename from charts/k0smotron/templates/rbac/metrics-reader.yaml rename to templates/k0smotron/templates/rbac/metrics-reader.yaml diff --git a/charts/k0smotron/templates/rbac/proxy.yaml b/templates/k0smotron/templates/rbac/proxy.yaml similarity index 100% rename from charts/k0smotron/templates/rbac/proxy.yaml rename to templates/k0smotron/templates/rbac/proxy.yaml diff --git a/charts/k0smotron/templates/serviceaccount.yaml b/templates/k0smotron/templates/serviceaccount.yaml similarity index 100% rename from charts/k0smotron/templates/serviceaccount.yaml rename to templates/k0smotron/templates/serviceaccount.yaml diff --git a/charts/k0smotron/values.yaml b/templates/k0smotron/values.yaml similarity index 100% rename from charts/k0smotron/values.yaml rename to templates/k0smotron/values.yaml