From f173e657f6d6b933ac0d1c4216a6be1796e2c5b0 Mon Sep 17 00:00:00 2001 From: Vandana Pathak Date: Wed, 12 Oct 2022 02:18:43 -0700 Subject: [PATCH] Create a top-level directory for provider template Signed-off-by: Vandana Pathak --- .github/workflows/plugin_tests.yaml | 2 +- .github/workflows/providers.yaml | 24 ++-- .github/workflows/tkg_integration_tests.yaml | 2 +- .../tkg_integration_tests_clusterclass.yaml | 4 +- CODEOWNERS | 10 +- Makefile | 14 +- docs/cli/tkgctl/components.md | 6 +- docs/design/bringyourownhost-design.md | 4 +- hack/check-mdlint.sh | 4 +- hack/check/.yamllintconfig.yaml | 2 +- hack/clustergen/ci-validate-clustergen.sh | 2 +- hack/providers-sync-tools/README.md | 22 +-- hack/providers-sync-tools/move.sh | 2 +- hack/providers-sync-tools/render.sh | 2 +- hack/providers-sync-tools/validate.sh | 6 +- packages/tkg-clusterclass/hack/sync-cc.sh | 2 +- pkg/v1/providers/Makefile | 124 +---------------- {pkg/v1/providers => providers}/.yamllint | 0 providers/Makefile | 129 ++++++++++++++++++ .../v1.1.5/bootstrap-components.yaml | 0 .../bootstrap-kubeadm/v1.1.5/metadata.yaml | 0 .../cert-manager/v1.7.2/cert-manager.yaml | 0 .../providers => providers}/client/client.go | 2 +- .../client/manifest/providers_embeded.go | 0 .../client/manifest/providers_skipped.go | 0 .../cluster-api/v1.1.5/core-components.yaml | 0 .../cluster-api/v1.1.5/metadata.yaml | 0 {pkg/v1/providers => providers}/config.yaml | 0 .../config_default.yaml | 0 .../v1.1.5/control-plane-components.yaml | 0 .../v1.1.5/metadata.yaml | 0 .../hack/Dockerfile.templates | 0 .../v1.2.0/cconly/base.yaml | 0 .../v1.2.0/cconly/overlay.yaml | 0 .../cluster-template-definition-dev.yaml | 0 .../cluster-template-definition-devcc.yaml | 0 .../cluster-template-definition-prod.yaml | 0 .../cluster-template-definition-prodcc.yaml | 0 .../v1.2.0/clusterclass-tkg-aws-default.yaml | 0 .../v1.2.0/infrastructure-components.yaml | 0 .../infrastructure-aws/v1.2.0/metadata.yaml | 0 .../v1.2.0/ytt/base-template.yaml | 0 .../v1.2.0/ytt/overlay.yaml | 0 .../v1.2.0/yttcc/base-template.yaml | 0 .../v1.2.0/yttcc/overlay.yaml | 0 .../infrastructure-aws/ytt/aws-overlay.yaml | 0 .../infrastructure-aws/yttcc/aws-overlay.yaml | 0 .../v1.4.0/cconly/base.yaml | 0 .../v1.4.0/cconly/overlay.yaml | 0 .../cluster-template-definition-dev.yaml | 0 .../cluster-template-definition-devcc.yaml | 0 .../cluster-template-definition-prod.yaml | 0 .../cluster-template-definition-prodcc.yaml | 0 .../clusterclass-tkg-azure-default.yaml | 0 .../v1.4.0/infrastructure-components.yaml | 0 .../infrastructure-azure/v1.4.0/metadata.yaml | 0 .../v1.4.0/ytt/base-template.yaml | 0 .../v1.4.0/ytt/overlay.yaml | 0 .../v1.4.0/yttcc/base-template.yaml | 0 .../v1.4.0/yttcc/overlay.yaml | 0 .../ytt/azure-overlay.yaml | 0 .../yttcc/azure-overlay.yaml | 0 .../v1.1.5/cconly/base.yaml | 0 .../v1.1.5/cconly/overlay.yaml | 0 .../cluster-template-definition-dev.yaml | 0 .../cluster-template-definition-devcc.yaml | 0 .../cluster-template-definition-prod.yaml | 0 .../cluster-template-definition-prodcc.yaml | 0 .../clusterclass-tkg-docker-default.yaml | 0 .../v1.1.5/infrastructure-components.yaml | 0 .../v1.1.5/metadata.yaml | 0 .../v1.1.5/ytt/base-template.yaml | 0 .../v1.1.5/ytt/overlay.yaml | 0 .../v1.1.5/yttcc/base-template.yaml | 0 .../v1.1.5/yttcc/overlay.yaml | 0 .../ytt/docker-overlay.yaml | 0 .../yttcc/docker-overlay.yaml | 0 .../cluster-template-definition-dev.yaml | 0 .../cluster-template-definition-prod.yaml | 0 .../v1.1.0/ytt/base-template.yaml | 0 .../v1.1.0/ytt/overlay.yaml | 0 .../ytt/tkg-service-vsphere-overlay.yaml | 0 .../v1.3.1/cconly/base.yaml | 0 .../v1.3.1/cconly/overlay.yaml | 0 .../cluster-template-definition-dev.yaml | 0 .../cluster-template-definition-devcc.yaml | 0 .../cluster-template-definition-prod.yaml | 0 .../cluster-template-definition-prodcc.yaml | 0 .../clusterclass-tkg-vsphere-default.yaml | 0 .../infrastructure-components-supervisor.yaml | 0 .../v1.3.1/infrastructure-components.yaml | 0 .../v1.3.1/metadata.yaml | 0 .../v1.3.1/ytt/base-template.yaml | 0 .../v1.3.1/ytt/overlay-windows.yaml | 0 .../v1.3.1/ytt/overlay.yaml | 0 .../v1.3.1/yttcc/base-template.yaml | 0 .../v1.3.1/yttcc/overlay.yaml | 0 .../ytt/vsphere-overlay.yaml | 0 .../yttcc/vsphere-overlay.yaml | 0 .../kapp-controller-values/datavalues.yaml | 0 .../kapp-controller-values/helpers.star | 0 .../kapp-controller_data.lib.yaml | 0 .../kapp-controller-values/values.yaml | 0 .../providers.sha256sum | 0 .../providers => providers}/tests/README.md | 4 +- .../tests/clustergen/README.md | 0 .../tests/clustergen/README_ccgen.md | 0 .../bom/tkg-bom-v1.3.1-zlatest.yaml | 0 ...kr-bom-v1.20.5+vmware.1-tkg.1-zlatest.yaml | 0 .../clustergen/diffcluster/example/demo.sh | 0 .../tests/clustergen/diffcluster/example/dst | 0 .../diffcluster/example/generated.yaml | 0 .../diffcluster/example/original.yaml | 0 .../tests/clustergen/diffcluster/example/src | 0 .../tests/clustergen/diffcluster/helpers.sh | 0 .../clustergen/diffcluster/normalize.yaml | 0 .../clustergen/diffcluster/normalize_cc.yaml | 0 .../clustergen/gen_duplicate_bom_azure.py | 0 .../tests/clustergen/gen_testcases.sh | 0 .../tests/clustergen/gencluster_params.py | 0 .../clustergen/param_models/cluster_aws.model | 0 .../param_models/cluster_azure.model | 0 .../param_models/cluster_optional.model | 0 .../param_models/cluster_vsphere.model | 0 .../tests/clustergen/run_tests.sh | 0 .../tests/clustergen/summarize_diff_scores.py | 0 .../tests/clustergen/testdata/README.md | 0 {pkg/v1/providers => providers}/tests/go.mod | 4 +- {pkg/v1/providers => providers}/tests/go.sum | 0 .../tests/unit/avi_test.go | 0 .../tests/unit/custom_nameservers_test.go | 0 .../unit/fixtures/antrea_data_values.yaml | 0 .../tests/unit/fixtures/tkg-bom-v1.4.0.yaml | 0 .../tests/unit/fixtures/tkr-bom-v1.21.1.yaml | 0 .../unit/fixtures/vsphere_cpi_ip_family.yaml | 0 .../unit/fixtures/yttmocks/lib/helpers.star | 0 .../unit/fixtures/yttmocks/lib/validate.star | 0 .../tests/unit/ip_family_test.go | 0 .../tests/unit/pci_passthrough_test.go | 0 .../tests/unit/unit_suite_test.go | 0 .../tests/unit/windows_test.go | 0 .../providers => providers}/vendir.lock.yml | 0 {pkg/v1/providers => providers}/vendir.yml | 0 .../ytt/01_plans/dev.yaml | 0 .../ytt/01_plans/oidc.yaml | 0 .../ytt/01_plans/prod.yaml | 0 .../auth/pinniped_addon_secret.lib.yaml | 0 .../02_addons/auth/pinniped_addon_secret.yaml | 0 .../02_addons/avi/ako_operator_secret.yaml | 0 .../ytt/02_addons/cni/add_cni.yaml | 0 .../cni/antrea/antrea_addon_data.lib.yaml | 0 .../cni/antrea/antrea_overlay.lib.yaml | 0 .../cni/calico/calico_addon_data.lib.yaml | 0 .../cni/calico/calico_overlay.lib.yaml | 0 .../ytt/02_addons/cpi/cpi_addon_data.lib.yaml | 0 .../ytt/02_addons/cpi/cpi_app.lib.yaml | 0 .../ytt/02_addons/cpi/cpi_overlay.lib.yaml | 0 .../ytt/02_addons/cpi/cpi_secret.yaml | 0 .../ytt/02_addons/cpi/cpi_secret_crs.yaml | 0 .../ytt/02_addons/csi/csi_addon_data.lib.yaml | 0 .../ytt/02_addons/csi/csi_secret.yaml | 0 .../kapp-controller/add_kapp-controller.yaml | 0 .../kapp-controller_addon_data.lib.yaml | 0 .../kapp-controller_overlay.lib.yaml | 0 .../add_management_package_repo.yaml | 0 .../add_core_management_plugins_package.yaml | 0 .../add_default_featuregate_cr.yaml | 0 .../add_featuregates_package.yaml | 0 .../metadata/add_cluster_metadata.yaml | 0 .../metrics-server/metrics_server_secret.yaml | 0 .../package-repos/add_package-repos.yaml | 0 .../public-cloud-csi/add_aws_csi_driver.yaml | 0 .../add_azure_csi_driver.yaml | 0 .../disk/azuredisk-csi-driver_data.lib.yaml | 0 .../ebs/aws-ebs-csi-driver_data.lib.yaml | 0 .../add_secretgen-controller.yaml | 0 .../secretgen-controller_addon_data.lib.yaml | 0 .../standard-repo/add_standard_repo.yaml | 0 .../add_tanzu-addons-manager.yaml | 0 .../tanzu-addons-manager_addon_data.lib.yaml | 0 .../tanzu-addons-manager_overlay.lib.yaml | 0 .../tanzu-addons-manager_package.lib.yaml | 0 .../ytt/03_customizations/01_tkr/add_tkr.yaml | 0 .../ytt/03_customizations/01_tkr/tkr.lib.yaml | 0 .../01_tkr/tkr_overlay.lib.yaml | 0 .../ytt/03_customizations/02_avi/add-ako.yaml | 0 .../02_avi/add-avi-labels.yaml | 0 .../03_customizations/02_avi/add_akoo.yaml | 0 .../02_avi/ako-deployment.lib.yaml | 0 .../02_avi/ako-operator-deployment.lib.yaml | 0 .../03_customizations/02_avi/rbac.lib.yaml | 0 .../03_customizations/02_avi/static.lib.yaml | 0 .../03_windows/prevent_windows_updates.yaml | 0 .../03_windows/register_antrea_cleanup.yaml | 0 .../ytt/03_customizations/add_mhc.yaml | 0 .../ytt/03_customizations/add_sc.yaml | 0 .../03_customizations/annotate_os_info.yaml | 0 .../audit-logging/audit_logging.yaml | 0 .../autoscaler/autoscaler_overlay.yaml | 0 .../autoscaler/enable_autoscaler.yaml | 0 .../capabilities/add_capabilities.yaml | 0 .../ytt/03_customizations/http_proxy.lib.txt | 0 .../ytt/03_customizations/http_proxy.yaml | 0 .../03_customizations/http_proxy_ca_cert.yaml | 0 .../ytt/03_customizations/ip_family.yaml | 0 .../ytt/03_customizations/nameservers.yaml | 0 .../03_customizations/registry_ca_cert.yaml | 0 .../registry_skip_tls_verify.yaml | 0 .../ytt/04_user_customizations/README.md | 0 .../08_store_data_values.yaml | 0 .../ytt/09_miscellaneous/09_filter.yaml | 0 .../ytt/lib/config_variable_association.star | 0 .../ytt/lib/helpers.star | 0 .../ytt/lib/validate.star | 0 .../ytt/vendir/cni/_ytt_lib/LICENSE | 0 .../ytt/vendir/cni/_ytt_lib/NOTICE | 0 .../1.5.3/bundle/config/kapp-config.yaml | 0 .../bundle/config/overlay/antrea-overlay.yaml | 0 .../overlay/update-strategy-overlay.yaml | 0 .../antrea/1.5.3/bundle/config/schema.yaml | 0 .../1.5.3/bundle/config/upstream/antrea.yaml | 0 .../antrea/1.5.3/bundle/config/values.star | 0 .../antrea/1.5.3/bundle/config/values.yaml | 0 .../bundle/config/overlay/calico-overlay.yaml | 0 .../overlay/update-strategy-overlay.yaml | 0 .../calico/3.22.1/bundle/config/schema.yaml | 0 .../3.22.1/bundle/config/upstream/calico.yaml | 0 .../calico/3.22.1/bundle/config/values.star | 0 .../calico/3.22.1/bundle/config/values.yaml | 0 .../ytt/vendir/cni/cni.lib.yaml | 0 .../vendir/kapp-controller/_ytt_lib/LICENSE | 0 .../vendir/kapp-controller/_ytt_lib/NOTICE | 0 .../config/overlays/change-namespace.yaml | 0 .../config/overlays/update-configmap.yaml | 0 .../bundle/config/overlays/update-crds.yaml | 0 .../config/overlays/update-deployment.yaml | 0 .../overlays/update-strategy-overlay.yaml | 0 .../config/upstream/kapp-controller.yaml | 0 .../0.41.2/bundle/config/values.star | 0 .../0.41.2/bundle/config/values.yaml | 0 .../kapp-controller/kapp-controller.lib.yaml | 0 .../ytt/vendir/vsphere_cpi/_ytt_lib/LICENSE | 0 .../ytt/vendir/vsphere_cpi/_ytt_lib/NOTICE | 0 .../bundle/config/overlays/add-secret.yaml | 0 .../bundle/config/overlays/update-config.yaml | 0 .../config/overlays/update-daemonset.yaml | 0 .../bundle/config/overlays/update-secret.yaml | 0 .../1.22.5/bundle/config/schema.yaml | 0 .../config/upstream/vsphere-cpi/01-rbac.yaml | 0 .../upstream/vsphere-cpi/02-config.yaml | 0 .../upstream/vsphere-cpi/03-secret.yaml | 0 .../upstream/vsphere-cpi/04-daemonset.yaml | 0 .../1.22.5/bundle/config/values.star | 0 .../1.22.5/bundle/config/values.yaml | 0 .../1.22.5/bundle/config/vsphereconf.lib.txt | 0 .../vendir/vsphere_cpi/vsphere_cpi.lib.yaml | 0 .../yttcb/clusterbootstrap.yaml | 0 .../yttcc/01_plans/dev.yaml | 0 .../yttcc/01_plans/prod.yaml | 0 .../lib/config_variable_association.star | 0 .../yttcc/lib/helpers.star | 0 .../yttcc/lib/validate.star | 0 .../yttcc/vendir/cni/_ytt_lib/LICENSE | 0 .../yttcc/vendir/cni/_ytt_lib/NOTICE | 0 .../1.2.3/bundle/config/kapp-config.yaml | 0 .../bundle/config/overlay/antrea_overlay.yaml | 0 .../1.2.3/bundle/config/upstream/antrea.yaml | 0 .../antrea/1.2.3/bundle/config/values.star | 0 .../antrea/1.2.3/bundle/config/values.yaml | 0 .../bundle/config/overlay/calico_overlay.yaml | 0 .../3.19.1/bundle/config/upstream/calico.yaml | 0 .../calico/3.19.1/bundle/config/values.star | 0 .../calico/3.19.1/bundle/config/values.yaml | 0 .../yttcc/vendir/cni/cni.lib.yaml | 0 .../vendir/kapp-controller/_ytt_lib/LICENSE | 0 .../vendir/kapp-controller/_ytt_lib/NOTICE | 0 .../config/overlays/change-namespace.yaml | 0 .../config/overlays/update-configmap.yaml | 0 .../bundle/config/overlays/update-crds.yaml | 0 .../config/overlays/update-deployment.yaml | 0 .../config/upstream/kapp-controller.yaml | 0 .../0.30.1/bundle/config/values.star | 0 .../0.30.1/bundle/config/values.yaml | 0 .../kapp-controller/kapp-controller.lib.yaml | 0 .../yttcc/vendir/vsphere_cpi/_ytt_lib/LICENSE | 0 .../yttcc/vendir/vsphere_cpi/_ytt_lib/NOTICE | 0 .../bundle/config/overlays/add-secret.yaml | 0 .../bundle/config/overlays/update-config.yaml | 0 .../config/overlays/update-daemonset.yaml | 0 .../bundle/config/overlays/update-secret.yaml | 0 .../config/upstream/vsphere-cpi/01-rbac.yaml | 0 .../upstream/vsphere-cpi/02-config.yaml | 0 .../upstream/vsphere-cpi/03-secret.yaml | 0 .../upstream/vsphere-cpi/04-daemonset.yaml | 0 .../1.22.4/bundle/config/values.star | 0 .../1.22.4/bundle/config/values.yaml | 0 .../1.22.4/bundle/config/vsphereconf.lib.txt | 0 .../vendir/vsphere_cpi/vsphere_cpi.lib.yaml | 0 tkg/client/management_components_test.go | 2 +- tkg/tkgctl/client/client.go | 2 +- 300 files changed, 195 insertions(+), 180 deletions(-) rename {pkg/v1/providers => providers}/.yamllint (100%) create mode 100644 providers/Makefile rename {pkg/v1/providers => providers}/bootstrap-kubeadm/v1.1.5/bootstrap-components.yaml (100%) rename {pkg/v1/providers => providers}/bootstrap-kubeadm/v1.1.5/metadata.yaml (100%) rename {pkg/v1/providers => providers}/cert-manager/v1.7.2/cert-manager.yaml (100%) rename {pkg/v1/providers => providers}/client/client.go (87%) rename {pkg/v1/providers => providers}/client/manifest/providers_embeded.go (100%) rename {pkg/v1/providers => providers}/client/manifest/providers_skipped.go (100%) rename {pkg/v1/providers => providers}/cluster-api/v1.1.5/core-components.yaml (100%) rename {pkg/v1/providers => providers}/cluster-api/v1.1.5/metadata.yaml (100%) rename {pkg/v1/providers => providers}/config.yaml (100%) rename {pkg/v1/providers => providers}/config_default.yaml (100%) rename {pkg/v1/providers => providers}/control-plane-kubeadm/v1.1.5/control-plane-components.yaml (100%) rename {pkg/v1/providers => providers}/control-plane-kubeadm/v1.1.5/metadata.yaml (100%) rename {pkg/v1/providers => providers}/hack/Dockerfile.templates (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/cconly/base.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/cconly/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/cluster-template-definition-dev.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/cluster-template-definition-devcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/cluster-template-definition-prod.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/cluster-template-definition-prodcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/clusterclass-tkg-aws-default.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/infrastructure-components.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/metadata.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/ytt/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/ytt/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/yttcc/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/v1.2.0/yttcc/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/ytt/aws-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-aws/yttcc/aws-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/cconly/base.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/cconly/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/cluster-template-definition-dev.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/cluster-template-definition-devcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/cluster-template-definition-prod.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/cluster-template-definition-prodcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/clusterclass-tkg-azure-default.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/infrastructure-components.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/metadata.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/ytt/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/ytt/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/yttcc/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/v1.4.0/yttcc/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/ytt/azure-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-azure/yttcc/azure-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/cconly/base.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/cconly/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/cluster-template-definition-dev.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/cluster-template-definition-devcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/cluster-template-definition-prod.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/cluster-template-definition-prodcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/clusterclass-tkg-docker-default.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/infrastructure-components.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/metadata.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/ytt/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/ytt/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/yttcc/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/v1.1.5/yttcc/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/ytt/docker-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-docker/yttcc/docker-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-dev.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-prod.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-tkg-service-vsphere/v1.1.0/ytt/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-tkg-service-vsphere/v1.1.0/ytt/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-tkg-service-vsphere/ytt/tkg-service-vsphere-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/cconly/base.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/cconly/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/cluster-template-definition-dev.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/cluster-template-definition-devcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/cluster-template-definition-prod.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/cluster-template-definition-prodcc.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/clusterclass-tkg-vsphere-default.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/infrastructure-components-supervisor.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/infrastructure-components.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/metadata.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/ytt/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/ytt/overlay-windows.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/ytt/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/yttcc/base-template.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/ytt/vsphere-overlay.yaml (100%) rename {pkg/v1/providers => providers}/infrastructure-vsphere/yttcc/vsphere-overlay.yaml (100%) rename {pkg/v1/providers => providers}/kapp-controller-values/datavalues.yaml (100%) rename {pkg/v1/providers => providers}/kapp-controller-values/helpers.star (100%) rename {pkg/v1/providers => providers}/kapp-controller-values/kapp-controller_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/kapp-controller-values/values.yaml (100%) rename {pkg/v1/providers => providers}/providers.sha256sum (100%) rename {pkg/v1/providers => providers}/tests/README.md (96%) rename {pkg/v1/providers => providers}/tests/clustergen/README.md (100%) rename {pkg/v1/providers => providers}/tests/clustergen/README_ccgen.md (100%) rename {pkg/v1/providers => providers}/tests/clustergen/bom/tkg-bom-v1.3.1-zlatest.yaml (100%) rename {pkg/v1/providers => providers}/tests/clustergen/bom/tkr-bom-v1.20.5+vmware.1-tkg.1-zlatest.yaml (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/example/demo.sh (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/example/dst (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/example/generated.yaml (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/example/original.yaml (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/example/src (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/helpers.sh (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/normalize.yaml (100%) rename {pkg/v1/providers => providers}/tests/clustergen/diffcluster/normalize_cc.yaml (100%) rename {pkg/v1/providers => providers}/tests/clustergen/gen_duplicate_bom_azure.py (100%) rename {pkg/v1/providers => providers}/tests/clustergen/gen_testcases.sh (100%) rename {pkg/v1/providers => providers}/tests/clustergen/gencluster_params.py (100%) rename {pkg/v1/providers => providers}/tests/clustergen/param_models/cluster_aws.model (100%) rename {pkg/v1/providers => providers}/tests/clustergen/param_models/cluster_azure.model (100%) rename {pkg/v1/providers => providers}/tests/clustergen/param_models/cluster_optional.model (100%) rename {pkg/v1/providers => providers}/tests/clustergen/param_models/cluster_vsphere.model (100%) rename {pkg/v1/providers => providers}/tests/clustergen/run_tests.sh (100%) rename {pkg/v1/providers => providers}/tests/clustergen/summarize_diff_scores.py (100%) rename {pkg/v1/providers => providers}/tests/clustergen/testdata/README.md (100%) rename {pkg/v1/providers => providers}/tests/go.mod (97%) rename {pkg/v1/providers => providers}/tests/go.sum (100%) rename {pkg/v1/providers => providers}/tests/unit/avi_test.go (100%) rename {pkg/v1/providers => providers}/tests/unit/custom_nameservers_test.go (100%) rename {pkg/v1/providers => providers}/tests/unit/fixtures/antrea_data_values.yaml (100%) rename {pkg/v1/providers => providers}/tests/unit/fixtures/tkg-bom-v1.4.0.yaml (100%) rename {pkg/v1/providers => providers}/tests/unit/fixtures/tkr-bom-v1.21.1.yaml (100%) rename {pkg/v1/providers => providers}/tests/unit/fixtures/vsphere_cpi_ip_family.yaml (100%) rename {pkg/v1/providers => providers}/tests/unit/fixtures/yttmocks/lib/helpers.star (100%) rename {pkg/v1/providers => providers}/tests/unit/fixtures/yttmocks/lib/validate.star (100%) rename {pkg/v1/providers => providers}/tests/unit/ip_family_test.go (100%) rename {pkg/v1/providers => providers}/tests/unit/pci_passthrough_test.go (100%) rename {pkg/v1/providers => providers}/tests/unit/unit_suite_test.go (100%) rename {pkg/v1/providers => providers}/tests/unit/windows_test.go (100%) rename {pkg/v1/providers => providers}/vendir.lock.yml (100%) rename {pkg/v1/providers => providers}/vendir.yml (100%) rename {pkg/v1/providers => providers}/ytt/01_plans/dev.yaml (100%) rename {pkg/v1/providers => providers}/ytt/01_plans/oidc.yaml (100%) rename {pkg/v1/providers => providers}/ytt/01_plans/prod.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/auth/pinniped_addon_secret.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/auth/pinniped_addon_secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/avi/ako_operator_secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cni/add_cni.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cni/antrea/antrea_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cni/antrea/antrea_overlay.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cni/calico/calico_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cni/calico/calico_overlay.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cpi/cpi_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cpi/cpi_app.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cpi/cpi_overlay.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cpi/cpi_secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/cpi/cpi_secret_crs.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/csi/csi_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/csi/csi_secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/kapp-controller/add_kapp-controller.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/kapp-controller/kapp-controller_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/kapp-controller/kapp-controller_overlay.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/management-packages/add_management_package_repo.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/management-packages/core-management-plugins/add_core_management_plugins_package.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/management-packages/featuregates/add_default_featuregate_cr.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/management-packages/featuregates/add_featuregates_package.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/metadata/add_cluster_metadata.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/metrics-server/metrics_server_secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/package-repos/add_package-repos.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/public-cloud-csi/add_aws_csi_driver.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/public-cloud-csi/add_azure_csi_driver.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/public-cloud-csi/disk/azuredisk-csi-driver_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/public-cloud-csi/ebs/aws-ebs-csi-driver_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/secretgen-controller/add_secretgen-controller.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/secretgen-controller/secretgen-controller_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/standard-repo/add_standard_repo.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/tanzu-addons-manager/add_tanzu-addons-manager.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_addon_data.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_overlay.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_package.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/01_tkr/add_tkr.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/01_tkr/tkr.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/01_tkr/tkr_overlay.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/add-ako.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/add-avi-labels.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/add_akoo.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/ako-deployment.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/ako-operator-deployment.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/rbac.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/02_avi/static.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/03_windows/prevent_windows_updates.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/03_windows/register_antrea_cleanup.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/add_mhc.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/add_sc.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/annotate_os_info.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/audit-logging/audit_logging.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/autoscaler/autoscaler_overlay.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/autoscaler/enable_autoscaler.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/capabilities/add_capabilities.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/http_proxy.lib.txt (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/http_proxy.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/http_proxy_ca_cert.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/ip_family.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/nameservers.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/registry_ca_cert.yaml (100%) rename {pkg/v1/providers => providers}/ytt/03_customizations/registry_skip_tls_verify.yaml (100%) rename {pkg/v1/providers => providers}/ytt/04_user_customizations/README.md (100%) rename {pkg/v1/providers => providers}/ytt/09_miscellaneous/08_store_data_values.yaml (100%) rename {pkg/v1/providers => providers}/ytt/09_miscellaneous/09_filter.yaml (100%) rename {pkg/v1/providers => providers}/ytt/lib/config_variable_association.star (100%) rename {pkg/v1/providers => providers}/ytt/lib/helpers.star (100%) rename {pkg/v1/providers => providers}/ytt/lib/validate.star (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/LICENSE (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/NOTICE (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/kapp-config.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/antrea-overlay.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/update-strategy-overlay.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/schema.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/upstream/antrea.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/calico-overlay.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/update-strategy-overlay.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/schema.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/upstream/calico.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/cni/cni.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/LICENSE (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/NOTICE (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/change-namespace.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-configmap.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-crds.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-deployment.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-strategy-overlay.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/upstream/kapp-controller.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/kapp-controller/kapp-controller.lib.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/LICENSE (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/NOTICE (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/add-secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-config.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-daemonset.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/schema.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/01-rbac.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/02-config.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/03-secret.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/vsphereconf.lib.txt (100%) rename {pkg/v1/providers => providers}/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml (100%) rename {pkg/v1/providers => providers}/yttcb/clusterbootstrap.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/01_plans/dev.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/01_plans/prod.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/lib/config_variable_association.star (100%) rename {pkg/v1/providers => providers}/yttcc/lib/helpers.star (100%) rename {pkg/v1/providers => providers}/yttcc/lib/validate.star (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/LICENSE (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/NOTICE (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/kapp-config.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/overlay/antrea_overlay.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/upstream/antrea.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/overlay/calico_overlay.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/upstream/calico.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/cni/cni.lib.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/LICENSE (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/NOTICE (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/change-namespace.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-configmap.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-crds.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-deployment.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/upstream/kapp-controller.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/kapp-controller/kapp-controller.lib.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/LICENSE (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/NOTICE (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/add-secret.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-config.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-daemonset.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-secret.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/01-rbac.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/02-config.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/03-secret.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.star (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.yaml (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/vsphereconf.lib.txt (100%) rename {pkg/v1/providers => providers}/yttcc/vendir/vsphere_cpi/vsphere_cpi.lib.yaml (100%) diff --git a/.github/workflows/plugin_tests.yaml b/.github/workflows/plugin_tests.yaml index 79ab92be49..0cb719c3e3 100644 --- a/.github/workflows/plugin_tests.yaml +++ b/.github/workflows/plugin_tests.yaml @@ -7,7 +7,7 @@ on: - "cmd/cli/plugin/cluster/**" - "cmd/cli/plugin/managementcluster/**" - 'tkg/**' - - 'pkg/v1/providers/**' + - 'providers/**' - '.github/workflows/plugin_tests.yaml' concurrency: diff --git a/.github/workflows/providers.yaml b/.github/workflows/providers.yaml index 60e29a3db7..006081891f 100644 --- a/.github/workflows/providers.yaml +++ b/.github/workflows/providers.yaml @@ -8,7 +8,7 @@ on: branches: [ main, release-* ] paths: - 'tkg/**' - - 'pkg/v1/providers/**' + - 'providers/**' - '.github/workflows/providers.yaml' jobs: @@ -22,8 +22,8 @@ jobs: - name: yaml-lint uses: ibiqlik/action-yamllint@v3 with: - file_or_dir: pkg/v1/providers - config_file: pkg/v1/providers/.yamllint + file_or_dir: providers + config_file: providers/.yamllint - name: Set up Go 1.x uses: actions/setup-go@v3 @@ -68,11 +68,11 @@ jobs: echo PRNUM==${{ steps.extract_pr.outputs.prnum }} echo BASEBRANCH=${{ steps.extract_pr.outputs.basebranch }} env BASEBRANCH=${{ steps.extract_pr.outputs.basebranch }} - status=$(test -s ./pkg/v1/providers/tests/clustergen/testdata/clustergen.diff.txt; echo $?) + status=$(test -s ./providers/tests/clustergen/testdata/clustergen.diff.txt; echo $?) CLUSTERCTL=clusterctl CLI_REPO=$PWD ./hack/clustergen/ci-validate-clustergen.sh ${{ steps.extract_pr.outputs.branch }} ${{ steps.extract_pr.outputs.basebranch }} echo "##[set-output name=diffstatus;]$status" - echo $status > ./pkg/v1/providers/tests/clustergen/testdata/clustergen.status - echo ${{ steps.extract_pr.outputs.prnum }} > ./pkg/v1/providers/tests/clustergen/testdata/prnum + echo $status > ./providers/tests/clustergen/testdata/clustergen.status + echo ${{ steps.extract_pr.outputs.prnum }} > ./providers/tests/clustergen/testdata/prnum id: clustergen - id: publish-clustergen-results-as-artifacts @@ -80,9 +80,9 @@ jobs: with: name: clustergen-output path: | - ./pkg/v1/providers/tests/clustergen/testdata/prnum - ./pkg/v1/providers/tests/clustergen/testdata/clustergen.status - ./pkg/v1/providers/tests/clustergen/testdata/clustergen.diff.txt - ./pkg/v1/providers/tests/clustergen/testdata/clustergen_cc.diff.txt - ./pkg/v1/providers/tests/clustergen/testdata/clustergen_noncc_vs_cc.diff.txt - ./pkg/v1/providers/tests/clustergen/testdata/clustergen.html + ./providers/tests/clustergen/testdata/prnum + ./providers/tests/clustergen/testdata/clustergen.status + ./providers/tests/clustergen/testdata/clustergen.diff.txt + ./providers/tests/clustergen/testdata/clustergen_cc.diff.txt + ./providers/tests/clustergen/testdata/clustergen_noncc_vs_cc.diff.txt + ./providers/tests/clustergen/testdata/clustergen.html diff --git a/.github/workflows/tkg_integration_tests.yaml b/.github/workflows/tkg_integration_tests.yaml index 2dedd1cb87..9d3bfca826 100644 --- a/.github/workflows/tkg_integration_tests.yaml +++ b/.github/workflows/tkg_integration_tests.yaml @@ -7,7 +7,7 @@ on: - 'tkg/**' - '!packageclients/**' - '!cmd/cli/plugin/package/test/**' - - 'pkg/v1/providers/**' + - 'providers/**' - '.github/workflows/tkg_integration_tests.yaml' concurrency: diff --git a/.github/workflows/tkg_integration_tests_clusterclass.yaml b/.github/workflows/tkg_integration_tests_clusterclass.yaml index ed55febcb4..c49735a305 100644 --- a/.github/workflows/tkg_integration_tests_clusterclass.yaml +++ b/.github/workflows/tkg_integration_tests_clusterclass.yaml @@ -14,7 +14,7 @@ on: - 'packages/**' - '!packageclients/**' - '!cmd/cli/plugin/package/test/**' - - 'pkg/v1/providers/**' + - 'providers/**' - '.github/workflows/tkg_integration_tests*.yaml' push: @@ -30,7 +30,7 @@ on: - 'packages/**' - '!packageclients/**' - '!cmd/cli/plugin/package/test/**' - - 'pkg/v1/providers/**' + - 'providers/**' - '.github/workflows/tkg_integration_tests*.yaml' concurrency: diff --git a/CODEOWNERS b/CODEOWNERS index 2341f19608..a901c037f7 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -11,10 +11,10 @@ /docs @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tkg-iam-owners @vmware-tanzu/tkg-addons-owners @vmware-tanzu/tanzu-framework-lcm-reviewers @vmware-tanzu/tanzu-framework-docs /tkg/auth @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tkg-iam-owners /pkg/v1/cli @vmware-tanzu/tanzu-framework-reviewers -/pkg/v1/providers @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-lcm-reviewers @vmware-tanzu/tkg-infra-x -/pkg/v1/providers/ytt/02_addons/auth @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tkg-iam-owners -/pkg/v1/providers/ytt/02_addons/avi @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/ako-owners -/pkg/v1/providers/ytt/03_customizations/02_avi @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/ako-owners +/providers @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-lcm-reviewers @vmware-tanzu/tkg-infra-x +/providers/ytt/02_addons/auth @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tkg-iam-owners +/providers/ytt/02_addons/avi @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/ako-owners +/providers/ytt/03_customizations/02_avi @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/ako-owners /tkg @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-lcm-reviewers /packageclients/pkg/kappclient @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tkg-addons-owners /tkg/tkgconfigpaths @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-release-team @@ -30,7 +30,7 @@ /cmd/cli/plugin/feature @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners /cmd/cli/plugin-admin/codegen @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners /pkg/v1/codegen @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners -/pkg/v1/providers/ytt/02_addons/management-packages @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners +/providers/ytt/02_addons/management-packages @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners /hack/packages @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners /docs/api-machinery @vmware-tanzu/tanzu-framework-reviewers @vmware-tanzu/tanzu-framework-api-machinery-owners # Package owners. Add individual packages here if they need to be owned by a specific team. diff --git a/Makefile b/Makefile index 8279952208..9d1d01e349 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,11 @@ TOOLS_DIR := $(abspath hack/tools) TOOLS_BIN_DIR := $(TOOLS_DIR)/bin BIN_DIR := bin ADDONS_DIR := addons -YTT_TESTS_DIR := pkg/v1/providers/tests +YTT_TESTS_DIR := providers/tests PACKAGES_SCRIPTS_DIR := $(abspath hack/packages/scripts) UI_DIR := tkg/web GO_MODULES=$(shell find . -path "*/go.mod" | grep -v "^./pinniped/" | xargs -I _ dirname _) -PROVIDER_BUNDLE_ZIP = pkg/v1/providers/client/manifest/providers.zip +PROVIDER_BUNDLE_ZIP = providers/client/manifest/providers.zip TKG_PROVIDER_BUNDLE_ZIP = tkg/tkgctl/client/manifest/providers.zip PINNIPED_GIT_REPOSITORY = https://github.com/vmware-tanzu/pinniped.git @@ -204,7 +204,7 @@ prep-build-cli: ensure-pinniped-repo ## Prepare for building the CLI $(GO) mod tidy EMBED_PROVIDERS_TAG=embedproviders ifeq "${BUILD_TAGS}" "${EMBED_PROVIDERS_TAG}" - make -C pkg/v1/providers -f Makefile generate-provider-bundle-zip + make -C providers -f Makefile generate-provider-bundle-zip cp -f ${PROVIDER_BUNDLE_ZIP} $(TKG_PROVIDER_BUNDLE_ZIP) endif @@ -490,13 +490,13 @@ test: generate manifests build-cli-mocks ## Run tests ## Skip running TKG integration tests $(MAKE) ytt -C $(TOOLS_DIR) - echo "Verifying cluster-api packages and pkg/v1/providers are in sync..." + echo "Verifying cluster-api packages and providers are in sync..." make -C hack/providers-sync-tools validate echo "... cluster-api packages are in sync" ## Test the YTT cluster templates echo "Changing into the provider test directory to verify ytt cluster templates..." - cd ./pkg/v1/providers/tests/unit && PATH=$(abspath hack/tools/bin):"$(PATH)" $(GO) test -coverprofile coverage1.txt -v -timeout 120s ./ + cd ./providers/tests/unit && PATH=$(abspath hack/tools/bin):"$(PATH)" $(GO) test -coverprofile coverage1.txt -v -timeout 120s ./ echo "... ytt cluster template verification complete!" echo "Verifying package tests..." @@ -740,11 +740,11 @@ generate-package-secret: ## Generate the default package values secret. Usage: m .PHONY: clustergen clustergen: ## Generate diff between 'before' and 'after' of cluster configuration outputs using clustergen - CLUSTERGEN_BASE=${CLUSTERGEN_BASE} make -C pkg/v1/providers -f Makefile cluster-generation-diffs + CLUSTERGEN_BASE=${CLUSTERGEN_BASE} make -C providers -f Makefile cluster-generation-diffs .PHONY: generate-embedproviders generate-embedproviders: ## Generate provider bundle to be embedded for local testing - make -C pkg/v1/providers -f Makefile generate-provider-bundle-zip + make -C providers -f Makefile generate-provider-bundle-zip cp -f ${PROVIDER_BUNDLE_ZIP} $(TKG_PROVIDER_BUNDLE_ZIP) ## -------------------------------------- diff --git a/docs/cli/tkgctl/components.md b/docs/cli/tkgctl/components.md index da22c788b4..df6dccd438 100644 --- a/docs/cli/tkgctl/components.md +++ b/docs/cli/tkgctl/components.md @@ -1,6 +1,6 @@ # Library components in tkgctl - This library includes coresponding [providers](/pkg/v1/providers) to provide the templates and ytt overlays required to generate cluster configuration YAML documents. + This library includes coresponding [providers](/providers) to provide the templates and ytt overlays required to generate cluster configuration YAML documents. ## [tkgctl library](/tkg/tkgctl) @@ -89,8 +89,8 @@ reference: * This uses bundled go-bindata file which contains kick-start UI bits * API is developed using swagger specification which gets used by UI as well as backend -## [Providers](/pkg/v1/providers) +## [Providers](/providers) * This package maintains a set of CAPI provider CRDs, cluster templates, and ytt overlays required by the library. * This allows cluster configuration generation to be customizable potentially without modifying a single line of golang code. -* More information regarding providers are [here](/pkg/v1/providers) +* More information regarding providers are [here](/providers) diff --git a/docs/design/bringyourownhost-design.md b/docs/design/bringyourownhost-design.md index 8f2c8effad..adc179306a 100644 --- a/docs/design/bringyourownhost-design.md +++ b/docs/design/bringyourownhost-design.md @@ -136,10 +136,10 @@ The prod plan: three control plane nodes and three worker nodes. ## Detailed Design 1. Add the “**infrastructure-byoh**” folder which contains the YTT templates to generate the YAML files, so that CAPI can provision BYOH workload clusters using these YAML files. -Update "pkg/v1/providers/config.yaml" and create new YTT under folder " pkg/v1/providers/infrastructure-byoh/v0.1.0/" to support BYOH as a new type of provider. +Update "providers/config.yaml" and create new YTT under folder " providers/infrastructure-byoh/v0.1.0/" to support BYOH as a new type of provider. 2. Add the configuration item to let users define control plane endpoint for BYOH workload cluster. -Update "pkg/v1/providers/config_default.yaml" and tanzu-framework go code, so that new configurations can be read to create BYOH workload cluster. +Update "providers/config_default.yaml" and tanzu-framework go code, so that new configurations can be read to create BYOH workload cluster. 3. Configurations to provision BYOH workload clusters should be validated in case of invalid configuration input. diff --git a/hack/check-mdlint.sh b/hack/check-mdlint.sh index 55f0d70e31..78b08b15fd 100755 --- a/hack/check-mdlint.sh +++ b/hack/check-mdlint.sh @@ -21,6 +21,6 @@ docker run --rm -v "$(pwd)":/build \ -i tkg/web/node_modules \ -i docs/cli/commands \ -i test/cli/mock \ - -i pkg/v1/providers/ytt/vendir \ - -i pkg/v1/providers/provider-bundle/providers/ytt/vendir \ + -i providers/ytt/vendir \ + -i providers/provider-bundle/providers/ytt/vendir \ -i pinniped . diff --git a/hack/check/.yamllintconfig.yaml b/hack/check/.yamllintconfig.yaml index 529c950775..88bd4bb880 100644 --- a/hack/check/.yamllintconfig.yaml +++ b/hack/check/.yamllintconfig.yaml @@ -3,7 +3,7 @@ extends: relaxed ignore: | */tkg/web/node_modules/ - */pkg/v1/providers/provider-bundle + */providers/provider-bundle rules: line-length: disable diff --git a/hack/clustergen/ci-validate-clustergen.sh b/hack/clustergen/ci-validate-clustergen.sh index f5fba8ab4c..79d1ba1e8d 100755 --- a/hack/clustergen/ci-validate-clustergen.sh +++ b/hack/clustergen/ci-validate-clustergen.sh @@ -14,7 +14,7 @@ CLI_REPO=${CLI_REPO:-${PWD}/../..} GIT_BRANCH_PROVIDERS=$1 GIT_BRANCH_PROVIDERS_BASE=$2 -cd pkg/v1/providers +cd providers # TODO: As we are using providers as library, clustergen should not rely on building binary # each time with new providers, instead we should write some go testing tool which runs diff --git a/hack/providers-sync-tools/README.md b/hack/providers-sync-tools/README.md index b83c96dd14..3aa59580d9 100644 --- a/hack/providers-sync-tools/README.md +++ b/hack/providers-sync-tools/README.md @@ -4,11 +4,11 @@ Tanzu-framework is moving towards packaging cluster-api componentry. While this transition is happening, tanzu-framework will have cluster-api components in -two locations: `packages/cluster-api*` and `pkg/v1/providers`. +two locations: `packages/cluster-api*` and `providers`. These tools exist to ensure cluster-api related packages in the `packages` directory stay in sync with the content in -`pkg/v1/providers`. +`providers`. ## How it works @@ -24,32 +24,32 @@ overlays. 1. The first set of overlays come from the package's overlays. 1. The second set of overlays are specific to edits needed to - `pkg/v1/providers`, and exist in the `hack/provider-sync-tools//overlay`. An example of such an edit would be the controller image in the CRDs of the package. This tooling will prevent edits made directly to the cluster-api related -folders in `pkg/v1/providers`. Instead of directly editing those files, +folders in `providers`. Instead of directly editing those files, overlays should be created in `hack/provider-sync-tools//overlay`. Running the `make all` target in this folder will render the package contents along with the overlays, and then place the edited files in -`pkg/v1/providers`. +`providers`. The validate task will ensure that the rendered content from the package and -overlays have no diff with the content of `pkg/v1/providers`. +overlays have no diff with the content of `providers`. ## What to do in common scenarios -1. Making a tweak to `pkg/v1/providers/` +1. Making a tweak to `providers/` - add an overlay file to `hack/provider-sync-tools//overlays`. - NOTE: There are many files in `pkg/v1/providers//` and + NOTE: There are many files in `providers//` and only some of them are copied from upstream cluster-api, typically CRDs. These sync tools are intended to sync the files that come from upstream and the tweaks to files that come from upstream. Files in - `pkg/v1/providers/` that are not from upstream should + `providers/` that are not from upstream should be edited in place, i.e. cluster configuration files. - - run `make all` to and check to see that `pkg/v1/providers/` contents looks as desired. - commit the changes @@ -58,5 +58,5 @@ overlays have no diff with the content of `pkg/v1/providers`. vendir file to match the desired version - run the unit tests in the package(s), ensuring they're passing. - `cd hack/provider-sync-tools && make all` - - ensure the `pkg/v1/providers/` looks as desired. + - ensure the `providers/` looks as desired. - commit the changes diff --git a/hack/providers-sync-tools/move.sh b/hack/providers-sync-tools/move.sh index 381073934b..161f3ea998 100755 --- a/hack/providers-sync-tools/move.sh +++ b/hack/providers-sync-tools/move.sh @@ -13,7 +13,7 @@ function place_rendered_files() { local version=$(cat ../../packages/${source_package_name}/vendir.yml | grep tag | sed 's/^.*tag: //') - cp -r "${rendered_dir}/upstream/." "../../pkg/v1/providers/${provider_name}/${version}/" + cp -r "${rendered_dir}/upstream/." "../../providers/${provider_name}/${version}/" } place_rendered_files "cluster-api" "cluster-api" diff --git a/hack/providers-sync-tools/render.sh b/hack/providers-sync-tools/render.sh index bafbbde1e9..7d7d62674e 100755 --- a/hack/providers-sync-tools/render.sh +++ b/hack/providers-sync-tools/render.sh @@ -33,5 +33,5 @@ render_upstream_package_file "cluster-api-provider-vsphere" # infrastructure-docker: The infrastructure-components.yaml is named # infrastructure-components-development.yaml upstream. Renaming it to -# infrastructure-components.yaml here to match pkg/v1/providers naming. +# infrastructure-components.yaml here to match providers naming. mv cluster-api-provider-docker/build/rendered/upstream/infrastructure-components{-development,}.yaml diff --git a/hack/providers-sync-tools/validate.sh b/hack/providers-sync-tools/validate.sh index 604436a82c..f3160485a4 100755 --- a/hack/providers-sync-tools/validate.sh +++ b/hack/providers-sync-tools/validate.sh @@ -16,11 +16,11 @@ function validate_rendered_files() { local rendered_files="$(find "${rendered_dir}/upstream" -type f)" set +e for rendered_file in ${rendered_files}; do - diff -s "../../pkg/v1/providers/${provider_name}/${version}/$(basename ${rendered_file})" "${rendered_file}" + diff -s "../../providers/${provider_name}/${version}/$(basename ${rendered_file})" "${rendered_file}" local exit_code="${?}" if [[ ${exit_code} -ne 0 ]]; then - echo "[Error] Files ${rendered_file} and ../../pkg/v1/providers/${provider_name}/${version}/$(basename ${rendered_file}) are different." - echo "[Error] pkg/v1/providers is out of sync with packages/cluster-api*. See 'hack/providers-sync-tools/README.md'." + echo "[Error] Files ${rendered_file} and ../../providers/${provider_name}/${version}/$(basename ${rendered_file}) are different." + echo "[Error] providers is out of sync with packages/cluster-api*. See 'hack/providers-sync-tools/README.md'." exit ${exit_code} fi done diff --git a/packages/tkg-clusterclass/hack/sync-cc.sh b/packages/tkg-clusterclass/hack/sync-cc.sh index 60e8b7debb..09320a1c19 100755 --- a/packages/tkg-clusterclass/hack/sync-cc.sh +++ b/packages/tkg-clusterclass/hack/sync-cc.sh @@ -6,7 +6,7 @@ set -euo pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PROVIDERS_DIR=${SCRIPT_DIR}/../../../pkg/v1/providers +PROVIDERS_DIR=${SCRIPT_DIR}/../../../providers PKGS_DIR=${SCRIPT_DIR}/../.. BINNAME="$( basename "${BASH_SOURCE[0]}" )" diff --git a/pkg/v1/providers/Makefile b/pkg/v1/providers/Makefile index 8c4ae4b791..7906eda3f8 100644 --- a/pkg/v1/providers/Makefile +++ b/pkg/v1/providers/Makefile @@ -4,126 +4,12 @@ .DEFAULT_GOAL:=help # Set language for consistent sorting across operating systems -export LC_ALL := C - -GOOS ?= $(shell go env GOOS) -GOARCH ?= $(shell go env GOARCH) -PROJECT_ROOT = $(shell pwd) - -CLI_REPO ?= ${PROJECT_ROOT}/../../.. -TOOLS_DIR ?= ${PROJECT_ROOT}/../../../hack/tools -TOOLS_BIN_DIR ?= ${TOOLS_DIR}/bin -GOBINDATA := $(TOOLS_BIN_DIR)/gobindata -VENDIR := $(TOOLS_BIN_DIR)/vendir -VENDIR_VERSION = v0.17.0 -CLUSTERGEN_OUTPUT_DIR ?= generated -CLUSTERGEN_BASE ?= origin/main -PROVIDER_DIR_NAME = providers -PROVIDER_BUNDLE_DIR = provider-bundle/${PROVIDER_DIR_NAME} -PROVIDER_BUNDLE_ZIP = ${PROJECT_ROOT}/client/manifest/providers.zip -TKG_PROVIDER_BUNDLE_ZIP = ${PROJECT_ROOT}/tkg/tkgctl/client/manifest/providers.zip - -# Image URL to use building/pushing provider image -PROVIDER_TEMPLATE_IMG_NAME ?= provider-templates -IMAGE_REPO ?= vmware.io -PROVIDER_TEMPLATE_IMG_TAG ?= latest - - -FILES_TO_IGNORE?=.env .idea .git .github hack .yamllint .gitlab Makefile provider-bundle tests README.md client go.mod go.sum providers.sha256sum Dockerfile.templates -ifeq ($(EXCLUDE_CLUSTER_CLASS_FILES), true) -FILES_TO_IGNORE+=yttcc yttcb cconly cc.yaml -endif -FILES_TO_IGNORE_REGEX=$(subst $(space) ,\|,$(FILES_TO_IGNORE)) - - -help: ## Display this help - @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) - -verify-build: ## verify-build verifies the changes with generated files - -all: lint ## run all target - -.PHONY: build-cli ## build tkg cli with existing provider changes -build-cli: - CLI_REPO=${CLI_REPO} ${CLI_REPO}/hack/clustergen/rebuild-cli.sh ${PWD} - -## -------------------------------------- -## Linting -## -------------------------------------- - -.PHONY: lint -lint: ## Run YAML linter - yamllint ${CLI_REPO}/pkg/v1/providers -c .yamllint - -## -------------------------------------- -## Generate provider templates -## -------------------------------------- - -.PHONY: clean-providers -clean-providers: ## cleans provider-bundle - # cleanup old provider bundles - @rm -rf client/manifest/providers.zip - @rm -rf provider-bundle || true - @mkdir -p ${PROVIDER_BUNDLE_DIR} - -setup-provider-for-generation: clean-providers - # using temporary directory to extract all files which needs to bundle - find . -type f | grep -v "${FILES_TO_IGNORE_REGEX}" | xargs tar cf - -T - | tar -C ${PROVIDER_BUNDLE_DIR} -x - -.PHONY: generate-provider-bundle-zip -generate-provider-bundle-zip: setup-provider-for-generation ## generates provider zip bundle - cd ${PROVIDER_BUNDLE_DIR} && zip -r ${PROVIDER_BUNDLE_ZIP} . - -## -------------------------------------- -## build save and push Provider templates -## -------------------------------------- - -build-provider-template-image: setup-provider-for-generation ## Build provider template image - cd ${PROVIDER_BUNDLE_DIR} && docker build -t $(IMAGE_REPO)/${PROVIDER_TEMPLATE_IMG_NAME}:${PROVIDER_TEMPLATE_IMG_TAG} -f ../../hack/Dockerfile.templates . +build-provider-template-image: + make -C "../../../providers" build-provider-template-image save-provider-template-image: ## Save provider template image - mkdir -p "${PROJECT_ROOT}/artifacts" - docker save $(IMAGE_REPO)/${PROVIDER_TEMPLATE_IMG_NAME}:${PROVIDER_TEMPLATE_IMG_TAG} | gzip -c > "${PROJECT_ROOT}/artifacts/${PROVIDER_TEMPLATE_IMG_NAME}-${PROVIDER_TEMPLATE_IMG_TAG}.tar.gz" + make -C "../../../providers" save-provider-template-image + ln -fs ../../../providers/artifacts artifacts push-provider-template-image: ## Push provider template image - docker push $(IMAGE_REPO)/${PROVIDER_TEMPLATE_IMG_NAME}:${PROVIDER_TEMPLATE_IMG_TAG} - -## -------------------------------------- -## Cluster generation tests -## -------------------------------------- - -rename-test-outputs: ## show commands to rename the expected output files to match up with testcases renamed by generate-testcases - # Assumes that the topmost commit contains the testcases rename - git show --summary | grep '^ rename' | perl -pe 's@rename (.*){(\d+.case) => (\d+.case).*@git mv $$1/expected/$$2.output $$1/expected/$$3.output@' - -.PHONY: generate-testcases -generate-testcases: ## Regenerates test cases based on parameter model files. Requires PICT to be available. - cd tests/clustergen && ./gen_testcases.sh - -.PHONY: cluster-generation-tests -cluster-generation-tests: build-cli ## Run cluster compliance test against cluster generation dataset - cd tests/clustergen && TKG=${CLI_REPO}/bin/tkg-${GOOS}-${GOARCH} ./run_tests.sh ${CLUSTERGEN_OUTPUT_DIR} ${CLUSTERGEN_CC_OUTPUT_DIR} - -.PHONY: cluster-generation-diffs -cluster-generation-diffs: ## Run before/after cluster generation comparison tests - CLI_REPO=${CLI_REPO} ${CLI_REPO}/hack/clustergen/cluster-check.sh ${CLUSTERGEN_BASE} - -## -------------------------------------- -## Install tools -## -------------------------------------- - -vendir: $(VENDIR) ## Install vendir -$(VENDIR): - mkdir -p hack/tools/bin - curl -LO https://github.com/vmware-tanzu/carvel-vendir/releases/download/$(VENDIR_VERSION)/vendir-$(GOOS)-$(GOARCH) - mv vendir-$(GOOS)-$(GOARCH) $(@) - chmod a+x $(@) - -## -------------------------------------- -## Run vendir sync -## -------------------------------------- - -.PHONY: vendir-sync -vendir-sync: vendir ## Run vendir sync - ${TOOLS_BIN_DIR}/vendir sync -# end of Makefile + make -C "../../../providers" push-provider-template-image diff --git a/pkg/v1/providers/.yamllint b/providers/.yamllint similarity index 100% rename from pkg/v1/providers/.yamllint rename to providers/.yamllint diff --git a/providers/Makefile b/providers/Makefile new file mode 100644 index 0000000000..22120f0ffa --- /dev/null +++ b/providers/Makefile @@ -0,0 +1,129 @@ +# Copyright 2021 VMware, Inc. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 + +.DEFAULT_GOAL:=help + +# Set language for consistent sorting across operating systems +export LC_ALL := C + +GOOS ?= $(shell go env GOOS) +GOARCH ?= $(shell go env GOARCH) +PROJECT_ROOT = $(shell pwd) + +CLI_REPO ?= ${PROJECT_ROOT}/.. +TOOLS_DIR ?= ${PROJECT_ROOT}/../hack/tools +TOOLS_BIN_DIR ?= ${TOOLS_DIR}/bin +GOBINDATA := $(TOOLS_BIN_DIR)/gobindata +VENDIR := $(TOOLS_BIN_DIR)/vendir +VENDIR_VERSION = v0.17.0 +CLUSTERGEN_OUTPUT_DIR ?= generated +CLUSTERGEN_BASE ?= origin/main +PROVIDER_DIR_NAME = providers +PROVIDER_BUNDLE_DIR = provider-bundle/${PROVIDER_DIR_NAME} +PROVIDER_BUNDLE_ZIP = ${PROJECT_ROOT}/client/manifest/providers.zip +TKG_PROVIDER_BUNDLE_ZIP = ${PROJECT_ROOT}/tkg/tkgctl/client/manifest/providers.zip + +# Image URL to use building/pushing provider image +PROVIDER_TEMPLATE_IMG_NAME ?= provider-templates +IMAGE_REPO ?= vmware.io +PROVIDER_TEMPLATE_IMG_TAG ?= latest + + +FILES_TO_IGNORE?=.env .idea .git .github hack .yamllint .gitlab Makefile provider-bundle tests README.md client go.mod go.sum providers.sha256sum Dockerfile.templates +ifeq ($(EXCLUDE_CLUSTER_CLASS_FILES), true) +FILES_TO_IGNORE+=yttcc yttcb cconly cc.yaml +endif +FILES_TO_IGNORE_REGEX=$(subst $(space) ,\|,$(FILES_TO_IGNORE)) + + +help: ## Display this help + @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) + +verify-build: ## verify-build verifies the changes with generated files + +all: lint ## run all target + +.PHONY: build-cli ## build tkg cli with existing provider changes +build-cli: + CLI_REPO=${CLI_REPO} ${CLI_REPO}/hack/clustergen/rebuild-cli.sh ${PWD} + +## -------------------------------------- +## Linting +## -------------------------------------- + +.PHONY: lint +lint: ## Run YAML linter + yamllint ${CLI_REPO}/providers -c .yamllint + +## -------------------------------------- +## Generate provider templates +## -------------------------------------- + +.PHONY: clean-providers +clean-providers: ## cleans provider-bundle + # cleanup old provider bundles + @rm -rf client/manifest/providers.zip + @rm -rf provider-bundle || true + @mkdir -p ${PROVIDER_BUNDLE_DIR} + +setup-provider-for-generation: clean-providers + # using temporary directory to extract all files which needs to bundle + find . -type f | grep -v "${FILES_TO_IGNORE_REGEX}" | xargs tar cf - -T - | tar -C ${PROVIDER_BUNDLE_DIR} -x + +.PHONY: generate-provider-bundle-zip +generate-provider-bundle-zip: setup-provider-for-generation ## generates provider zip bundle + cd ${PROVIDER_BUNDLE_DIR} && zip -r ${PROVIDER_BUNDLE_ZIP} . + +## -------------------------------------- +## build save and push Provider templates +## -------------------------------------- + +build-provider-template-image: setup-provider-for-generation ## Build provider template image + cd ${PROVIDER_BUNDLE_DIR} && docker build -t $(IMAGE_REPO)/${PROVIDER_TEMPLATE_IMG_NAME}:${PROVIDER_TEMPLATE_IMG_TAG} -f ../../hack/Dockerfile.templates . + +save-provider-template-image: ## Save provider template image + mkdir -p "${PROJECT_ROOT}/artifacts" + docker save $(IMAGE_REPO)/${PROVIDER_TEMPLATE_IMG_NAME}:${PROVIDER_TEMPLATE_IMG_TAG} | gzip -c > "${PROJECT_ROOT}/artifacts/${PROVIDER_TEMPLATE_IMG_NAME}-${PROVIDER_TEMPLATE_IMG_TAG}.tar.gz" + +push-provider-template-image: ## Push provider template image + docker push $(IMAGE_REPO)/${PROVIDER_TEMPLATE_IMG_NAME}:${PROVIDER_TEMPLATE_IMG_TAG} + +## -------------------------------------- +## Cluster generation tests +## -------------------------------------- + +rename-test-outputs: ## show commands to rename the expected output files to match up with testcases renamed by generate-testcases + # Assumes that the topmost commit contains the testcases rename + git show --summary | grep '^ rename' | perl -pe 's@rename (.*){(\d+.case) => (\d+.case).*@git mv $$1/expected/$$2.output $$1/expected/$$3.output@' + +.PHONY: generate-testcases +generate-testcases: ## Regenerates test cases based on parameter model files. Requires PICT to be available. + cd tests/clustergen && ./gen_testcases.sh + +.PHONY: cluster-generation-tests +cluster-generation-tests: build-cli ## Run cluster compliance test against cluster generation dataset + cd tests/clustergen && TKG=${CLI_REPO}/bin/tkg-${GOOS}-${GOARCH} ./run_tests.sh ${CLUSTERGEN_OUTPUT_DIR} ${CLUSTERGEN_CC_OUTPUT_DIR} + +.PHONY: cluster-generation-diffs +cluster-generation-diffs: ## Run before/after cluster generation comparison tests + CLI_REPO=${CLI_REPO} ${CLI_REPO}/hack/clustergen/cluster-check.sh ${CLUSTERGEN_BASE} + +## -------------------------------------- +## Install tools +## -------------------------------------- + +vendir: $(VENDIR) ## Install vendir +$(VENDIR): + mkdir -p hack/tools/bin + curl -LO https://github.com/vmware-tanzu/carvel-vendir/releases/download/$(VENDIR_VERSION)/vendir-$(GOOS)-$(GOARCH) + mv vendir-$(GOOS)-$(GOARCH) $(@) + chmod a+x $(@) + +## -------------------------------------- +## Run vendir sync +## -------------------------------------- + +.PHONY: vendir-sync +vendir-sync: vendir ## Run vendir sync + ${TOOLS_BIN_DIR}/vendir sync +# end of Makefile diff --git a/pkg/v1/providers/bootstrap-kubeadm/v1.1.5/bootstrap-components.yaml b/providers/bootstrap-kubeadm/v1.1.5/bootstrap-components.yaml similarity index 100% rename from pkg/v1/providers/bootstrap-kubeadm/v1.1.5/bootstrap-components.yaml rename to providers/bootstrap-kubeadm/v1.1.5/bootstrap-components.yaml diff --git a/pkg/v1/providers/bootstrap-kubeadm/v1.1.5/metadata.yaml b/providers/bootstrap-kubeadm/v1.1.5/metadata.yaml similarity index 100% rename from pkg/v1/providers/bootstrap-kubeadm/v1.1.5/metadata.yaml rename to providers/bootstrap-kubeadm/v1.1.5/metadata.yaml diff --git a/pkg/v1/providers/cert-manager/v1.7.2/cert-manager.yaml b/providers/cert-manager/v1.7.2/cert-manager.yaml similarity index 100% rename from pkg/v1/providers/cert-manager/v1.7.2/cert-manager.yaml rename to providers/cert-manager/v1.7.2/cert-manager.yaml diff --git a/pkg/v1/providers/client/client.go b/providers/client/client.go similarity index 87% rename from pkg/v1/providers/client/client.go rename to providers/client/client.go index 98ebf7f875..1a0bac2808 100644 --- a/pkg/v1/providers/client/client.go +++ b/providers/client/client.go @@ -5,7 +5,7 @@ package client import ( - "github.com/vmware-tanzu/tanzu-framework/pkg/v1/providers/client/manifest" + "github.com/vmware-tanzu/tanzu-framework/providers/client/manifest" "github.com/vmware-tanzu/tanzu-framework/tkg/providerinterface" ) diff --git a/pkg/v1/providers/client/manifest/providers_embeded.go b/providers/client/manifest/providers_embeded.go similarity index 100% rename from pkg/v1/providers/client/manifest/providers_embeded.go rename to providers/client/manifest/providers_embeded.go diff --git a/pkg/v1/providers/client/manifest/providers_skipped.go b/providers/client/manifest/providers_skipped.go similarity index 100% rename from pkg/v1/providers/client/manifest/providers_skipped.go rename to providers/client/manifest/providers_skipped.go diff --git a/pkg/v1/providers/cluster-api/v1.1.5/core-components.yaml b/providers/cluster-api/v1.1.5/core-components.yaml similarity index 100% rename from pkg/v1/providers/cluster-api/v1.1.5/core-components.yaml rename to providers/cluster-api/v1.1.5/core-components.yaml diff --git a/pkg/v1/providers/cluster-api/v1.1.5/metadata.yaml b/providers/cluster-api/v1.1.5/metadata.yaml similarity index 100% rename from pkg/v1/providers/cluster-api/v1.1.5/metadata.yaml rename to providers/cluster-api/v1.1.5/metadata.yaml diff --git a/pkg/v1/providers/config.yaml b/providers/config.yaml similarity index 100% rename from pkg/v1/providers/config.yaml rename to providers/config.yaml diff --git a/pkg/v1/providers/config_default.yaml b/providers/config_default.yaml similarity index 100% rename from pkg/v1/providers/config_default.yaml rename to providers/config_default.yaml diff --git a/pkg/v1/providers/control-plane-kubeadm/v1.1.5/control-plane-components.yaml b/providers/control-plane-kubeadm/v1.1.5/control-plane-components.yaml similarity index 100% rename from pkg/v1/providers/control-plane-kubeadm/v1.1.5/control-plane-components.yaml rename to providers/control-plane-kubeadm/v1.1.5/control-plane-components.yaml diff --git a/pkg/v1/providers/control-plane-kubeadm/v1.1.5/metadata.yaml b/providers/control-plane-kubeadm/v1.1.5/metadata.yaml similarity index 100% rename from pkg/v1/providers/control-plane-kubeadm/v1.1.5/metadata.yaml rename to providers/control-plane-kubeadm/v1.1.5/metadata.yaml diff --git a/pkg/v1/providers/hack/Dockerfile.templates b/providers/hack/Dockerfile.templates similarity index 100% rename from pkg/v1/providers/hack/Dockerfile.templates rename to providers/hack/Dockerfile.templates diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/cconly/base.yaml b/providers/infrastructure-aws/v1.2.0/cconly/base.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/cconly/base.yaml rename to providers/infrastructure-aws/v1.2.0/cconly/base.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/cconly/overlay.yaml b/providers/infrastructure-aws/v1.2.0/cconly/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/cconly/overlay.yaml rename to providers/infrastructure-aws/v1.2.0/cconly/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-dev.yaml b/providers/infrastructure-aws/v1.2.0/cluster-template-definition-dev.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-dev.yaml rename to providers/infrastructure-aws/v1.2.0/cluster-template-definition-dev.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-devcc.yaml b/providers/infrastructure-aws/v1.2.0/cluster-template-definition-devcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-devcc.yaml rename to providers/infrastructure-aws/v1.2.0/cluster-template-definition-devcc.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-prod.yaml b/providers/infrastructure-aws/v1.2.0/cluster-template-definition-prod.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-prod.yaml rename to providers/infrastructure-aws/v1.2.0/cluster-template-definition-prod.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-prodcc.yaml b/providers/infrastructure-aws/v1.2.0/cluster-template-definition-prodcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/cluster-template-definition-prodcc.yaml rename to providers/infrastructure-aws/v1.2.0/cluster-template-definition-prodcc.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/clusterclass-tkg-aws-default.yaml b/providers/infrastructure-aws/v1.2.0/clusterclass-tkg-aws-default.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/clusterclass-tkg-aws-default.yaml rename to providers/infrastructure-aws/v1.2.0/clusterclass-tkg-aws-default.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/infrastructure-components.yaml b/providers/infrastructure-aws/v1.2.0/infrastructure-components.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/infrastructure-components.yaml rename to providers/infrastructure-aws/v1.2.0/infrastructure-components.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/metadata.yaml b/providers/infrastructure-aws/v1.2.0/metadata.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/metadata.yaml rename to providers/infrastructure-aws/v1.2.0/metadata.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/ytt/base-template.yaml b/providers/infrastructure-aws/v1.2.0/ytt/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/ytt/base-template.yaml rename to providers/infrastructure-aws/v1.2.0/ytt/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/ytt/overlay.yaml b/providers/infrastructure-aws/v1.2.0/ytt/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/ytt/overlay.yaml rename to providers/infrastructure-aws/v1.2.0/ytt/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/yttcc/base-template.yaml b/providers/infrastructure-aws/v1.2.0/yttcc/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/yttcc/base-template.yaml rename to providers/infrastructure-aws/v1.2.0/yttcc/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-aws/v1.2.0/yttcc/overlay.yaml b/providers/infrastructure-aws/v1.2.0/yttcc/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/v1.2.0/yttcc/overlay.yaml rename to providers/infrastructure-aws/v1.2.0/yttcc/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-aws/ytt/aws-overlay.yaml b/providers/infrastructure-aws/ytt/aws-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/ytt/aws-overlay.yaml rename to providers/infrastructure-aws/ytt/aws-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-aws/yttcc/aws-overlay.yaml b/providers/infrastructure-aws/yttcc/aws-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-aws/yttcc/aws-overlay.yaml rename to providers/infrastructure-aws/yttcc/aws-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/cconly/base.yaml b/providers/infrastructure-azure/v1.4.0/cconly/base.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/cconly/base.yaml rename to providers/infrastructure-azure/v1.4.0/cconly/base.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/cconly/overlay.yaml b/providers/infrastructure-azure/v1.4.0/cconly/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/cconly/overlay.yaml rename to providers/infrastructure-azure/v1.4.0/cconly/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-dev.yaml b/providers/infrastructure-azure/v1.4.0/cluster-template-definition-dev.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-dev.yaml rename to providers/infrastructure-azure/v1.4.0/cluster-template-definition-dev.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-devcc.yaml b/providers/infrastructure-azure/v1.4.0/cluster-template-definition-devcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-devcc.yaml rename to providers/infrastructure-azure/v1.4.0/cluster-template-definition-devcc.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-prod.yaml b/providers/infrastructure-azure/v1.4.0/cluster-template-definition-prod.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-prod.yaml rename to providers/infrastructure-azure/v1.4.0/cluster-template-definition-prod.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-prodcc.yaml b/providers/infrastructure-azure/v1.4.0/cluster-template-definition-prodcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/cluster-template-definition-prodcc.yaml rename to providers/infrastructure-azure/v1.4.0/cluster-template-definition-prodcc.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/clusterclass-tkg-azure-default.yaml b/providers/infrastructure-azure/v1.4.0/clusterclass-tkg-azure-default.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/clusterclass-tkg-azure-default.yaml rename to providers/infrastructure-azure/v1.4.0/clusterclass-tkg-azure-default.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/infrastructure-components.yaml b/providers/infrastructure-azure/v1.4.0/infrastructure-components.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/infrastructure-components.yaml rename to providers/infrastructure-azure/v1.4.0/infrastructure-components.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/metadata.yaml b/providers/infrastructure-azure/v1.4.0/metadata.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/metadata.yaml rename to providers/infrastructure-azure/v1.4.0/metadata.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/ytt/base-template.yaml b/providers/infrastructure-azure/v1.4.0/ytt/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/ytt/base-template.yaml rename to providers/infrastructure-azure/v1.4.0/ytt/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/ytt/overlay.yaml b/providers/infrastructure-azure/v1.4.0/ytt/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/ytt/overlay.yaml rename to providers/infrastructure-azure/v1.4.0/ytt/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/yttcc/base-template.yaml b/providers/infrastructure-azure/v1.4.0/yttcc/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/yttcc/base-template.yaml rename to providers/infrastructure-azure/v1.4.0/yttcc/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-azure/v1.4.0/yttcc/overlay.yaml b/providers/infrastructure-azure/v1.4.0/yttcc/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/v1.4.0/yttcc/overlay.yaml rename to providers/infrastructure-azure/v1.4.0/yttcc/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-azure/ytt/azure-overlay.yaml b/providers/infrastructure-azure/ytt/azure-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/ytt/azure-overlay.yaml rename to providers/infrastructure-azure/ytt/azure-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-azure/yttcc/azure-overlay.yaml b/providers/infrastructure-azure/yttcc/azure-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-azure/yttcc/azure-overlay.yaml rename to providers/infrastructure-azure/yttcc/azure-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/cconly/base.yaml b/providers/infrastructure-docker/v1.1.5/cconly/base.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/cconly/base.yaml rename to providers/infrastructure-docker/v1.1.5/cconly/base.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/cconly/overlay.yaml b/providers/infrastructure-docker/v1.1.5/cconly/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/cconly/overlay.yaml rename to providers/infrastructure-docker/v1.1.5/cconly/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-dev.yaml b/providers/infrastructure-docker/v1.1.5/cluster-template-definition-dev.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-dev.yaml rename to providers/infrastructure-docker/v1.1.5/cluster-template-definition-dev.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-devcc.yaml b/providers/infrastructure-docker/v1.1.5/cluster-template-definition-devcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-devcc.yaml rename to providers/infrastructure-docker/v1.1.5/cluster-template-definition-devcc.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-prod.yaml b/providers/infrastructure-docker/v1.1.5/cluster-template-definition-prod.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-prod.yaml rename to providers/infrastructure-docker/v1.1.5/cluster-template-definition-prod.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-prodcc.yaml b/providers/infrastructure-docker/v1.1.5/cluster-template-definition-prodcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/cluster-template-definition-prodcc.yaml rename to providers/infrastructure-docker/v1.1.5/cluster-template-definition-prodcc.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/clusterclass-tkg-docker-default.yaml b/providers/infrastructure-docker/v1.1.5/clusterclass-tkg-docker-default.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/clusterclass-tkg-docker-default.yaml rename to providers/infrastructure-docker/v1.1.5/clusterclass-tkg-docker-default.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/infrastructure-components.yaml b/providers/infrastructure-docker/v1.1.5/infrastructure-components.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/infrastructure-components.yaml rename to providers/infrastructure-docker/v1.1.5/infrastructure-components.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/metadata.yaml b/providers/infrastructure-docker/v1.1.5/metadata.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/metadata.yaml rename to providers/infrastructure-docker/v1.1.5/metadata.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/ytt/base-template.yaml b/providers/infrastructure-docker/v1.1.5/ytt/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/ytt/base-template.yaml rename to providers/infrastructure-docker/v1.1.5/ytt/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/ytt/overlay.yaml b/providers/infrastructure-docker/v1.1.5/ytt/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/ytt/overlay.yaml rename to providers/infrastructure-docker/v1.1.5/ytt/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/yttcc/base-template.yaml b/providers/infrastructure-docker/v1.1.5/yttcc/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/yttcc/base-template.yaml rename to providers/infrastructure-docker/v1.1.5/yttcc/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-docker/v1.1.5/yttcc/overlay.yaml b/providers/infrastructure-docker/v1.1.5/yttcc/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/v1.1.5/yttcc/overlay.yaml rename to providers/infrastructure-docker/v1.1.5/yttcc/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-docker/ytt/docker-overlay.yaml b/providers/infrastructure-docker/ytt/docker-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/ytt/docker-overlay.yaml rename to providers/infrastructure-docker/ytt/docker-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-docker/yttcc/docker-overlay.yaml b/providers/infrastructure-docker/yttcc/docker-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-docker/yttcc/docker-overlay.yaml rename to providers/infrastructure-docker/yttcc/docker-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-dev.yaml b/providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-dev.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-dev.yaml rename to providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-dev.yaml diff --git a/pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-prod.yaml b/providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-prod.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-prod.yaml rename to providers/infrastructure-tkg-service-vsphere/v1.1.0/cluster-template-definition-prod.yaml diff --git a/pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/base-template.yaml b/providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/base-template.yaml rename to providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/overlay.yaml b/providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/overlay.yaml rename to providers/infrastructure-tkg-service-vsphere/v1.1.0/ytt/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-tkg-service-vsphere/ytt/tkg-service-vsphere-overlay.yaml b/providers/infrastructure-tkg-service-vsphere/ytt/tkg-service-vsphere-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-tkg-service-vsphere/ytt/tkg-service-vsphere-overlay.yaml rename to providers/infrastructure-tkg-service-vsphere/ytt/tkg-service-vsphere-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/cconly/base.yaml b/providers/infrastructure-vsphere/v1.3.1/cconly/base.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/cconly/base.yaml rename to providers/infrastructure-vsphere/v1.3.1/cconly/base.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/cconly/overlay.yaml b/providers/infrastructure-vsphere/v1.3.1/cconly/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/cconly/overlay.yaml rename to providers/infrastructure-vsphere/v1.3.1/cconly/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-dev.yaml b/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-dev.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-dev.yaml rename to providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-dev.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-devcc.yaml b/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-devcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-devcc.yaml rename to providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-devcc.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prod.yaml b/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prod.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prod.yaml rename to providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prod.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prodcc.yaml b/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prodcc.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prodcc.yaml rename to providers/infrastructure-vsphere/v1.3.1/cluster-template-definition-prodcc.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/clusterclass-tkg-vsphere-default.yaml b/providers/infrastructure-vsphere/v1.3.1/clusterclass-tkg-vsphere-default.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/clusterclass-tkg-vsphere-default.yaml rename to providers/infrastructure-vsphere/v1.3.1/clusterclass-tkg-vsphere-default.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/infrastructure-components-supervisor.yaml b/providers/infrastructure-vsphere/v1.3.1/infrastructure-components-supervisor.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/infrastructure-components-supervisor.yaml rename to providers/infrastructure-vsphere/v1.3.1/infrastructure-components-supervisor.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/infrastructure-components.yaml b/providers/infrastructure-vsphere/v1.3.1/infrastructure-components.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/infrastructure-components.yaml rename to providers/infrastructure-vsphere/v1.3.1/infrastructure-components.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/metadata.yaml b/providers/infrastructure-vsphere/v1.3.1/metadata.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/metadata.yaml rename to providers/infrastructure-vsphere/v1.3.1/metadata.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/ytt/base-template.yaml b/providers/infrastructure-vsphere/v1.3.1/ytt/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/ytt/base-template.yaml rename to providers/infrastructure-vsphere/v1.3.1/ytt/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/ytt/overlay-windows.yaml b/providers/infrastructure-vsphere/v1.3.1/ytt/overlay-windows.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/ytt/overlay-windows.yaml rename to providers/infrastructure-vsphere/v1.3.1/ytt/overlay-windows.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/ytt/overlay.yaml b/providers/infrastructure-vsphere/v1.3.1/ytt/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/ytt/overlay.yaml rename to providers/infrastructure-vsphere/v1.3.1/ytt/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/yttcc/base-template.yaml b/providers/infrastructure-vsphere/v1.3.1/yttcc/base-template.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/yttcc/base-template.yaml rename to providers/infrastructure-vsphere/v1.3.1/yttcc/base-template.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml b/providers/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml rename to providers/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/ytt/vsphere-overlay.yaml b/providers/infrastructure-vsphere/ytt/vsphere-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/ytt/vsphere-overlay.yaml rename to providers/infrastructure-vsphere/ytt/vsphere-overlay.yaml diff --git a/pkg/v1/providers/infrastructure-vsphere/yttcc/vsphere-overlay.yaml b/providers/infrastructure-vsphere/yttcc/vsphere-overlay.yaml similarity index 100% rename from pkg/v1/providers/infrastructure-vsphere/yttcc/vsphere-overlay.yaml rename to providers/infrastructure-vsphere/yttcc/vsphere-overlay.yaml diff --git a/pkg/v1/providers/kapp-controller-values/datavalues.yaml b/providers/kapp-controller-values/datavalues.yaml similarity index 100% rename from pkg/v1/providers/kapp-controller-values/datavalues.yaml rename to providers/kapp-controller-values/datavalues.yaml diff --git a/pkg/v1/providers/kapp-controller-values/helpers.star b/providers/kapp-controller-values/helpers.star similarity index 100% rename from pkg/v1/providers/kapp-controller-values/helpers.star rename to providers/kapp-controller-values/helpers.star diff --git a/pkg/v1/providers/kapp-controller-values/kapp-controller_data.lib.yaml b/providers/kapp-controller-values/kapp-controller_data.lib.yaml similarity index 100% rename from pkg/v1/providers/kapp-controller-values/kapp-controller_data.lib.yaml rename to providers/kapp-controller-values/kapp-controller_data.lib.yaml diff --git a/pkg/v1/providers/kapp-controller-values/values.yaml b/providers/kapp-controller-values/values.yaml similarity index 100% rename from pkg/v1/providers/kapp-controller-values/values.yaml rename to providers/kapp-controller-values/values.yaml diff --git a/pkg/v1/providers/providers.sha256sum b/providers/providers.sha256sum similarity index 100% rename from pkg/v1/providers/providers.sha256sum rename to providers/providers.sha256sum diff --git a/pkg/v1/providers/tests/README.md b/providers/tests/README.md similarity index 96% rename from pkg/v1/providers/tests/README.md rename to providers/tests/README.md index 41a9542b40..a67646b971 100644 --- a/pkg/v1/providers/tests/README.md +++ b/providers/tests/README.md @@ -17,8 +17,8 @@ These tests run automatically for you in CI, changing many different types of pa The unit tests in this repository can be run like so: ```bash -cd pkg/v1/providers/tests/ -go test -timeout 30s -run ^TestUnit$ github.com/vmware-tanzu/tanzu-framework/pkg/v1/providers/tests/unit/matchers +cd providers/tests/ +go test -timeout 30s -run ^TestUnit$ github.com/vmware-tanzu/tanzu-framework/providers/tests/unit/matchers ``` You can write an end to end unit test by: diff --git a/pkg/v1/providers/tests/clustergen/README.md b/providers/tests/clustergen/README.md similarity index 100% rename from pkg/v1/providers/tests/clustergen/README.md rename to providers/tests/clustergen/README.md diff --git a/pkg/v1/providers/tests/clustergen/README_ccgen.md b/providers/tests/clustergen/README_ccgen.md similarity index 100% rename from pkg/v1/providers/tests/clustergen/README_ccgen.md rename to providers/tests/clustergen/README_ccgen.md diff --git a/pkg/v1/providers/tests/clustergen/bom/tkg-bom-v1.3.1-zlatest.yaml b/providers/tests/clustergen/bom/tkg-bom-v1.3.1-zlatest.yaml similarity index 100% rename from pkg/v1/providers/tests/clustergen/bom/tkg-bom-v1.3.1-zlatest.yaml rename to providers/tests/clustergen/bom/tkg-bom-v1.3.1-zlatest.yaml diff --git a/pkg/v1/providers/tests/clustergen/bom/tkr-bom-v1.20.5+vmware.1-tkg.1-zlatest.yaml b/providers/tests/clustergen/bom/tkr-bom-v1.20.5+vmware.1-tkg.1-zlatest.yaml similarity index 100% rename from pkg/v1/providers/tests/clustergen/bom/tkr-bom-v1.20.5+vmware.1-tkg.1-zlatest.yaml rename to providers/tests/clustergen/bom/tkr-bom-v1.20.5+vmware.1-tkg.1-zlatest.yaml diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/example/demo.sh b/providers/tests/clustergen/diffcluster/example/demo.sh similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/example/demo.sh rename to providers/tests/clustergen/diffcluster/example/demo.sh diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/example/dst b/providers/tests/clustergen/diffcluster/example/dst similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/example/dst rename to providers/tests/clustergen/diffcluster/example/dst diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/example/generated.yaml b/providers/tests/clustergen/diffcluster/example/generated.yaml similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/example/generated.yaml rename to providers/tests/clustergen/diffcluster/example/generated.yaml diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/example/original.yaml b/providers/tests/clustergen/diffcluster/example/original.yaml similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/example/original.yaml rename to providers/tests/clustergen/diffcluster/example/original.yaml diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/example/src b/providers/tests/clustergen/diffcluster/example/src similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/example/src rename to providers/tests/clustergen/diffcluster/example/src diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/helpers.sh b/providers/tests/clustergen/diffcluster/helpers.sh similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/helpers.sh rename to providers/tests/clustergen/diffcluster/helpers.sh diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/normalize.yaml b/providers/tests/clustergen/diffcluster/normalize.yaml similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/normalize.yaml rename to providers/tests/clustergen/diffcluster/normalize.yaml diff --git a/pkg/v1/providers/tests/clustergen/diffcluster/normalize_cc.yaml b/providers/tests/clustergen/diffcluster/normalize_cc.yaml similarity index 100% rename from pkg/v1/providers/tests/clustergen/diffcluster/normalize_cc.yaml rename to providers/tests/clustergen/diffcluster/normalize_cc.yaml diff --git a/pkg/v1/providers/tests/clustergen/gen_duplicate_bom_azure.py b/providers/tests/clustergen/gen_duplicate_bom_azure.py similarity index 100% rename from pkg/v1/providers/tests/clustergen/gen_duplicate_bom_azure.py rename to providers/tests/clustergen/gen_duplicate_bom_azure.py diff --git a/pkg/v1/providers/tests/clustergen/gen_testcases.sh b/providers/tests/clustergen/gen_testcases.sh similarity index 100% rename from pkg/v1/providers/tests/clustergen/gen_testcases.sh rename to providers/tests/clustergen/gen_testcases.sh diff --git a/pkg/v1/providers/tests/clustergen/gencluster_params.py b/providers/tests/clustergen/gencluster_params.py similarity index 100% rename from pkg/v1/providers/tests/clustergen/gencluster_params.py rename to providers/tests/clustergen/gencluster_params.py diff --git a/pkg/v1/providers/tests/clustergen/param_models/cluster_aws.model b/providers/tests/clustergen/param_models/cluster_aws.model similarity index 100% rename from pkg/v1/providers/tests/clustergen/param_models/cluster_aws.model rename to providers/tests/clustergen/param_models/cluster_aws.model diff --git a/pkg/v1/providers/tests/clustergen/param_models/cluster_azure.model b/providers/tests/clustergen/param_models/cluster_azure.model similarity index 100% rename from pkg/v1/providers/tests/clustergen/param_models/cluster_azure.model rename to providers/tests/clustergen/param_models/cluster_azure.model diff --git a/pkg/v1/providers/tests/clustergen/param_models/cluster_optional.model b/providers/tests/clustergen/param_models/cluster_optional.model similarity index 100% rename from pkg/v1/providers/tests/clustergen/param_models/cluster_optional.model rename to providers/tests/clustergen/param_models/cluster_optional.model diff --git a/pkg/v1/providers/tests/clustergen/param_models/cluster_vsphere.model b/providers/tests/clustergen/param_models/cluster_vsphere.model similarity index 100% rename from pkg/v1/providers/tests/clustergen/param_models/cluster_vsphere.model rename to providers/tests/clustergen/param_models/cluster_vsphere.model diff --git a/pkg/v1/providers/tests/clustergen/run_tests.sh b/providers/tests/clustergen/run_tests.sh similarity index 100% rename from pkg/v1/providers/tests/clustergen/run_tests.sh rename to providers/tests/clustergen/run_tests.sh diff --git a/pkg/v1/providers/tests/clustergen/summarize_diff_scores.py b/providers/tests/clustergen/summarize_diff_scores.py similarity index 100% rename from pkg/v1/providers/tests/clustergen/summarize_diff_scores.py rename to providers/tests/clustergen/summarize_diff_scores.py diff --git a/pkg/v1/providers/tests/clustergen/testdata/README.md b/providers/tests/clustergen/testdata/README.md similarity index 100% rename from pkg/v1/providers/tests/clustergen/testdata/README.md rename to providers/tests/clustergen/testdata/README.md diff --git a/pkg/v1/providers/tests/go.mod b/providers/tests/go.mod similarity index 97% rename from pkg/v1/providers/tests/go.mod rename to providers/tests/go.mod index a08f6edc2a..804b4a04e5 100644 --- a/pkg/v1/providers/tests/go.mod +++ b/providers/tests/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu/tanzu-framework/pkg/v1/providers/tests +module github.com/vmware-tanzu/tanzu-framework/providers/tests go 1.18 @@ -67,4 +67,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/vmware-tanzu/tanzu-framework/test/pkg => ../../../../test/pkg +replace github.com/vmware-tanzu/tanzu-framework/test/pkg => ../../test/pkg diff --git a/pkg/v1/providers/tests/go.sum b/providers/tests/go.sum similarity index 100% rename from pkg/v1/providers/tests/go.sum rename to providers/tests/go.sum diff --git a/pkg/v1/providers/tests/unit/avi_test.go b/providers/tests/unit/avi_test.go similarity index 100% rename from pkg/v1/providers/tests/unit/avi_test.go rename to providers/tests/unit/avi_test.go diff --git a/pkg/v1/providers/tests/unit/custom_nameservers_test.go b/providers/tests/unit/custom_nameservers_test.go similarity index 100% rename from pkg/v1/providers/tests/unit/custom_nameservers_test.go rename to providers/tests/unit/custom_nameservers_test.go diff --git a/pkg/v1/providers/tests/unit/fixtures/antrea_data_values.yaml b/providers/tests/unit/fixtures/antrea_data_values.yaml similarity index 100% rename from pkg/v1/providers/tests/unit/fixtures/antrea_data_values.yaml rename to providers/tests/unit/fixtures/antrea_data_values.yaml diff --git a/pkg/v1/providers/tests/unit/fixtures/tkg-bom-v1.4.0.yaml b/providers/tests/unit/fixtures/tkg-bom-v1.4.0.yaml similarity index 100% rename from pkg/v1/providers/tests/unit/fixtures/tkg-bom-v1.4.0.yaml rename to providers/tests/unit/fixtures/tkg-bom-v1.4.0.yaml diff --git a/pkg/v1/providers/tests/unit/fixtures/tkr-bom-v1.21.1.yaml b/providers/tests/unit/fixtures/tkr-bom-v1.21.1.yaml similarity index 100% rename from pkg/v1/providers/tests/unit/fixtures/tkr-bom-v1.21.1.yaml rename to providers/tests/unit/fixtures/tkr-bom-v1.21.1.yaml diff --git a/pkg/v1/providers/tests/unit/fixtures/vsphere_cpi_ip_family.yaml b/providers/tests/unit/fixtures/vsphere_cpi_ip_family.yaml similarity index 100% rename from pkg/v1/providers/tests/unit/fixtures/vsphere_cpi_ip_family.yaml rename to providers/tests/unit/fixtures/vsphere_cpi_ip_family.yaml diff --git a/pkg/v1/providers/tests/unit/fixtures/yttmocks/lib/helpers.star b/providers/tests/unit/fixtures/yttmocks/lib/helpers.star similarity index 100% rename from pkg/v1/providers/tests/unit/fixtures/yttmocks/lib/helpers.star rename to providers/tests/unit/fixtures/yttmocks/lib/helpers.star diff --git a/pkg/v1/providers/tests/unit/fixtures/yttmocks/lib/validate.star b/providers/tests/unit/fixtures/yttmocks/lib/validate.star similarity index 100% rename from pkg/v1/providers/tests/unit/fixtures/yttmocks/lib/validate.star rename to providers/tests/unit/fixtures/yttmocks/lib/validate.star diff --git a/pkg/v1/providers/tests/unit/ip_family_test.go b/providers/tests/unit/ip_family_test.go similarity index 100% rename from pkg/v1/providers/tests/unit/ip_family_test.go rename to providers/tests/unit/ip_family_test.go diff --git a/pkg/v1/providers/tests/unit/pci_passthrough_test.go b/providers/tests/unit/pci_passthrough_test.go similarity index 100% rename from pkg/v1/providers/tests/unit/pci_passthrough_test.go rename to providers/tests/unit/pci_passthrough_test.go diff --git a/pkg/v1/providers/tests/unit/unit_suite_test.go b/providers/tests/unit/unit_suite_test.go similarity index 100% rename from pkg/v1/providers/tests/unit/unit_suite_test.go rename to providers/tests/unit/unit_suite_test.go diff --git a/pkg/v1/providers/tests/unit/windows_test.go b/providers/tests/unit/windows_test.go similarity index 100% rename from pkg/v1/providers/tests/unit/windows_test.go rename to providers/tests/unit/windows_test.go diff --git a/pkg/v1/providers/vendir.lock.yml b/providers/vendir.lock.yml similarity index 100% rename from pkg/v1/providers/vendir.lock.yml rename to providers/vendir.lock.yml diff --git a/pkg/v1/providers/vendir.yml b/providers/vendir.yml similarity index 100% rename from pkg/v1/providers/vendir.yml rename to providers/vendir.yml diff --git a/pkg/v1/providers/ytt/01_plans/dev.yaml b/providers/ytt/01_plans/dev.yaml similarity index 100% rename from pkg/v1/providers/ytt/01_plans/dev.yaml rename to providers/ytt/01_plans/dev.yaml diff --git a/pkg/v1/providers/ytt/01_plans/oidc.yaml b/providers/ytt/01_plans/oidc.yaml similarity index 100% rename from pkg/v1/providers/ytt/01_plans/oidc.yaml rename to providers/ytt/01_plans/oidc.yaml diff --git a/pkg/v1/providers/ytt/01_plans/prod.yaml b/providers/ytt/01_plans/prod.yaml similarity index 100% rename from pkg/v1/providers/ytt/01_plans/prod.yaml rename to providers/ytt/01_plans/prod.yaml diff --git a/pkg/v1/providers/ytt/02_addons/auth/pinniped_addon_secret.lib.yaml b/providers/ytt/02_addons/auth/pinniped_addon_secret.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/auth/pinniped_addon_secret.lib.yaml rename to providers/ytt/02_addons/auth/pinniped_addon_secret.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/auth/pinniped_addon_secret.yaml b/providers/ytt/02_addons/auth/pinniped_addon_secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/auth/pinniped_addon_secret.yaml rename to providers/ytt/02_addons/auth/pinniped_addon_secret.yaml diff --git a/pkg/v1/providers/ytt/02_addons/avi/ako_operator_secret.yaml b/providers/ytt/02_addons/avi/ako_operator_secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/avi/ako_operator_secret.yaml rename to providers/ytt/02_addons/avi/ako_operator_secret.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cni/add_cni.yaml b/providers/ytt/02_addons/cni/add_cni.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cni/add_cni.yaml rename to providers/ytt/02_addons/cni/add_cni.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cni/antrea/antrea_addon_data.lib.yaml b/providers/ytt/02_addons/cni/antrea/antrea_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cni/antrea/antrea_addon_data.lib.yaml rename to providers/ytt/02_addons/cni/antrea/antrea_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cni/antrea/antrea_overlay.lib.yaml b/providers/ytt/02_addons/cni/antrea/antrea_overlay.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cni/antrea/antrea_overlay.lib.yaml rename to providers/ytt/02_addons/cni/antrea/antrea_overlay.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cni/calico/calico_addon_data.lib.yaml b/providers/ytt/02_addons/cni/calico/calico_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cni/calico/calico_addon_data.lib.yaml rename to providers/ytt/02_addons/cni/calico/calico_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cni/calico/calico_overlay.lib.yaml b/providers/ytt/02_addons/cni/calico/calico_overlay.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cni/calico/calico_overlay.lib.yaml rename to providers/ytt/02_addons/cni/calico/calico_overlay.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cpi/cpi_addon_data.lib.yaml b/providers/ytt/02_addons/cpi/cpi_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cpi/cpi_addon_data.lib.yaml rename to providers/ytt/02_addons/cpi/cpi_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cpi/cpi_app.lib.yaml b/providers/ytt/02_addons/cpi/cpi_app.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cpi/cpi_app.lib.yaml rename to providers/ytt/02_addons/cpi/cpi_app.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cpi/cpi_overlay.lib.yaml b/providers/ytt/02_addons/cpi/cpi_overlay.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cpi/cpi_overlay.lib.yaml rename to providers/ytt/02_addons/cpi/cpi_overlay.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cpi/cpi_secret.yaml b/providers/ytt/02_addons/cpi/cpi_secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cpi/cpi_secret.yaml rename to providers/ytt/02_addons/cpi/cpi_secret.yaml diff --git a/pkg/v1/providers/ytt/02_addons/cpi/cpi_secret_crs.yaml b/providers/ytt/02_addons/cpi/cpi_secret_crs.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/cpi/cpi_secret_crs.yaml rename to providers/ytt/02_addons/cpi/cpi_secret_crs.yaml diff --git a/pkg/v1/providers/ytt/02_addons/csi/csi_addon_data.lib.yaml b/providers/ytt/02_addons/csi/csi_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/csi/csi_addon_data.lib.yaml rename to providers/ytt/02_addons/csi/csi_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/csi/csi_secret.yaml b/providers/ytt/02_addons/csi/csi_secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/csi/csi_secret.yaml rename to providers/ytt/02_addons/csi/csi_secret.yaml diff --git a/pkg/v1/providers/ytt/02_addons/kapp-controller/add_kapp-controller.yaml b/providers/ytt/02_addons/kapp-controller/add_kapp-controller.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/kapp-controller/add_kapp-controller.yaml rename to providers/ytt/02_addons/kapp-controller/add_kapp-controller.yaml diff --git a/pkg/v1/providers/ytt/02_addons/kapp-controller/kapp-controller_addon_data.lib.yaml b/providers/ytt/02_addons/kapp-controller/kapp-controller_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/kapp-controller/kapp-controller_addon_data.lib.yaml rename to providers/ytt/02_addons/kapp-controller/kapp-controller_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/kapp-controller/kapp-controller_overlay.lib.yaml b/providers/ytt/02_addons/kapp-controller/kapp-controller_overlay.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/kapp-controller/kapp-controller_overlay.lib.yaml rename to providers/ytt/02_addons/kapp-controller/kapp-controller_overlay.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/management-packages/add_management_package_repo.yaml b/providers/ytt/02_addons/management-packages/add_management_package_repo.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/management-packages/add_management_package_repo.yaml rename to providers/ytt/02_addons/management-packages/add_management_package_repo.yaml diff --git a/pkg/v1/providers/ytt/02_addons/management-packages/core-management-plugins/add_core_management_plugins_package.yaml b/providers/ytt/02_addons/management-packages/core-management-plugins/add_core_management_plugins_package.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/management-packages/core-management-plugins/add_core_management_plugins_package.yaml rename to providers/ytt/02_addons/management-packages/core-management-plugins/add_core_management_plugins_package.yaml diff --git a/pkg/v1/providers/ytt/02_addons/management-packages/featuregates/add_default_featuregate_cr.yaml b/providers/ytt/02_addons/management-packages/featuregates/add_default_featuregate_cr.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/management-packages/featuregates/add_default_featuregate_cr.yaml rename to providers/ytt/02_addons/management-packages/featuregates/add_default_featuregate_cr.yaml diff --git a/pkg/v1/providers/ytt/02_addons/management-packages/featuregates/add_featuregates_package.yaml b/providers/ytt/02_addons/management-packages/featuregates/add_featuregates_package.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/management-packages/featuregates/add_featuregates_package.yaml rename to providers/ytt/02_addons/management-packages/featuregates/add_featuregates_package.yaml diff --git a/pkg/v1/providers/ytt/02_addons/metadata/add_cluster_metadata.yaml b/providers/ytt/02_addons/metadata/add_cluster_metadata.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/metadata/add_cluster_metadata.yaml rename to providers/ytt/02_addons/metadata/add_cluster_metadata.yaml diff --git a/pkg/v1/providers/ytt/02_addons/metrics-server/metrics_server_secret.yaml b/providers/ytt/02_addons/metrics-server/metrics_server_secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/metrics-server/metrics_server_secret.yaml rename to providers/ytt/02_addons/metrics-server/metrics_server_secret.yaml diff --git a/pkg/v1/providers/ytt/02_addons/package-repos/add_package-repos.yaml b/providers/ytt/02_addons/package-repos/add_package-repos.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/package-repos/add_package-repos.yaml rename to providers/ytt/02_addons/package-repos/add_package-repos.yaml diff --git a/pkg/v1/providers/ytt/02_addons/public-cloud-csi/add_aws_csi_driver.yaml b/providers/ytt/02_addons/public-cloud-csi/add_aws_csi_driver.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/public-cloud-csi/add_aws_csi_driver.yaml rename to providers/ytt/02_addons/public-cloud-csi/add_aws_csi_driver.yaml diff --git a/pkg/v1/providers/ytt/02_addons/public-cloud-csi/add_azure_csi_driver.yaml b/providers/ytt/02_addons/public-cloud-csi/add_azure_csi_driver.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/public-cloud-csi/add_azure_csi_driver.yaml rename to providers/ytt/02_addons/public-cloud-csi/add_azure_csi_driver.yaml diff --git a/pkg/v1/providers/ytt/02_addons/public-cloud-csi/disk/azuredisk-csi-driver_data.lib.yaml b/providers/ytt/02_addons/public-cloud-csi/disk/azuredisk-csi-driver_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/public-cloud-csi/disk/azuredisk-csi-driver_data.lib.yaml rename to providers/ytt/02_addons/public-cloud-csi/disk/azuredisk-csi-driver_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/public-cloud-csi/ebs/aws-ebs-csi-driver_data.lib.yaml b/providers/ytt/02_addons/public-cloud-csi/ebs/aws-ebs-csi-driver_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/public-cloud-csi/ebs/aws-ebs-csi-driver_data.lib.yaml rename to providers/ytt/02_addons/public-cloud-csi/ebs/aws-ebs-csi-driver_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/secretgen-controller/add_secretgen-controller.yaml b/providers/ytt/02_addons/secretgen-controller/add_secretgen-controller.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/secretgen-controller/add_secretgen-controller.yaml rename to providers/ytt/02_addons/secretgen-controller/add_secretgen-controller.yaml diff --git a/pkg/v1/providers/ytt/02_addons/secretgen-controller/secretgen-controller_addon_data.lib.yaml b/providers/ytt/02_addons/secretgen-controller/secretgen-controller_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/secretgen-controller/secretgen-controller_addon_data.lib.yaml rename to providers/ytt/02_addons/secretgen-controller/secretgen-controller_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/standard-repo/add_standard_repo.yaml b/providers/ytt/02_addons/standard-repo/add_standard_repo.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/standard-repo/add_standard_repo.yaml rename to providers/ytt/02_addons/standard-repo/add_standard_repo.yaml diff --git a/pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/add_tanzu-addons-manager.yaml b/providers/ytt/02_addons/tanzu-addons-manager/add_tanzu-addons-manager.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/add_tanzu-addons-manager.yaml rename to providers/ytt/02_addons/tanzu-addons-manager/add_tanzu-addons-manager.yaml diff --git a/pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_addon_data.lib.yaml b/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_addon_data.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_addon_data.lib.yaml rename to providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_addon_data.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_overlay.lib.yaml b/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_overlay.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_overlay.lib.yaml rename to providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_overlay.lib.yaml diff --git a/pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_package.lib.yaml b/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_package.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_package.lib.yaml rename to providers/ytt/02_addons/tanzu-addons-manager/tanzu-addons-manager_package.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/01_tkr/add_tkr.yaml b/providers/ytt/03_customizations/01_tkr/add_tkr.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/01_tkr/add_tkr.yaml rename to providers/ytt/03_customizations/01_tkr/add_tkr.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/01_tkr/tkr.lib.yaml b/providers/ytt/03_customizations/01_tkr/tkr.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/01_tkr/tkr.lib.yaml rename to providers/ytt/03_customizations/01_tkr/tkr.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/01_tkr/tkr_overlay.lib.yaml b/providers/ytt/03_customizations/01_tkr/tkr_overlay.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/01_tkr/tkr_overlay.lib.yaml rename to providers/ytt/03_customizations/01_tkr/tkr_overlay.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/add-ako.yaml b/providers/ytt/03_customizations/02_avi/add-ako.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/add-ako.yaml rename to providers/ytt/03_customizations/02_avi/add-ako.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/add-avi-labels.yaml b/providers/ytt/03_customizations/02_avi/add-avi-labels.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/add-avi-labels.yaml rename to providers/ytt/03_customizations/02_avi/add-avi-labels.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/add_akoo.yaml b/providers/ytt/03_customizations/02_avi/add_akoo.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/add_akoo.yaml rename to providers/ytt/03_customizations/02_avi/add_akoo.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/ako-deployment.lib.yaml b/providers/ytt/03_customizations/02_avi/ako-deployment.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/ako-deployment.lib.yaml rename to providers/ytt/03_customizations/02_avi/ako-deployment.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/ako-operator-deployment.lib.yaml b/providers/ytt/03_customizations/02_avi/ako-operator-deployment.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/ako-operator-deployment.lib.yaml rename to providers/ytt/03_customizations/02_avi/ako-operator-deployment.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/rbac.lib.yaml b/providers/ytt/03_customizations/02_avi/rbac.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/rbac.lib.yaml rename to providers/ytt/03_customizations/02_avi/rbac.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/02_avi/static.lib.yaml b/providers/ytt/03_customizations/02_avi/static.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/02_avi/static.lib.yaml rename to providers/ytt/03_customizations/02_avi/static.lib.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/03_windows/prevent_windows_updates.yaml b/providers/ytt/03_customizations/03_windows/prevent_windows_updates.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/03_windows/prevent_windows_updates.yaml rename to providers/ytt/03_customizations/03_windows/prevent_windows_updates.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/03_windows/register_antrea_cleanup.yaml b/providers/ytt/03_customizations/03_windows/register_antrea_cleanup.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/03_windows/register_antrea_cleanup.yaml rename to providers/ytt/03_customizations/03_windows/register_antrea_cleanup.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/add_mhc.yaml b/providers/ytt/03_customizations/add_mhc.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/add_mhc.yaml rename to providers/ytt/03_customizations/add_mhc.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/add_sc.yaml b/providers/ytt/03_customizations/add_sc.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/add_sc.yaml rename to providers/ytt/03_customizations/add_sc.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/annotate_os_info.yaml b/providers/ytt/03_customizations/annotate_os_info.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/annotate_os_info.yaml rename to providers/ytt/03_customizations/annotate_os_info.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/audit-logging/audit_logging.yaml b/providers/ytt/03_customizations/audit-logging/audit_logging.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/audit-logging/audit_logging.yaml rename to providers/ytt/03_customizations/audit-logging/audit_logging.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/autoscaler/autoscaler_overlay.yaml b/providers/ytt/03_customizations/autoscaler/autoscaler_overlay.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/autoscaler/autoscaler_overlay.yaml rename to providers/ytt/03_customizations/autoscaler/autoscaler_overlay.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/autoscaler/enable_autoscaler.yaml b/providers/ytt/03_customizations/autoscaler/enable_autoscaler.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/autoscaler/enable_autoscaler.yaml rename to providers/ytt/03_customizations/autoscaler/enable_autoscaler.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/capabilities/add_capabilities.yaml b/providers/ytt/03_customizations/capabilities/add_capabilities.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/capabilities/add_capabilities.yaml rename to providers/ytt/03_customizations/capabilities/add_capabilities.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/http_proxy.lib.txt b/providers/ytt/03_customizations/http_proxy.lib.txt similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/http_proxy.lib.txt rename to providers/ytt/03_customizations/http_proxy.lib.txt diff --git a/pkg/v1/providers/ytt/03_customizations/http_proxy.yaml b/providers/ytt/03_customizations/http_proxy.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/http_proxy.yaml rename to providers/ytt/03_customizations/http_proxy.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/http_proxy_ca_cert.yaml b/providers/ytt/03_customizations/http_proxy_ca_cert.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/http_proxy_ca_cert.yaml rename to providers/ytt/03_customizations/http_proxy_ca_cert.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/ip_family.yaml b/providers/ytt/03_customizations/ip_family.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/ip_family.yaml rename to providers/ytt/03_customizations/ip_family.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/nameservers.yaml b/providers/ytt/03_customizations/nameservers.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/nameservers.yaml rename to providers/ytt/03_customizations/nameservers.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/registry_ca_cert.yaml b/providers/ytt/03_customizations/registry_ca_cert.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/registry_ca_cert.yaml rename to providers/ytt/03_customizations/registry_ca_cert.yaml diff --git a/pkg/v1/providers/ytt/03_customizations/registry_skip_tls_verify.yaml b/providers/ytt/03_customizations/registry_skip_tls_verify.yaml similarity index 100% rename from pkg/v1/providers/ytt/03_customizations/registry_skip_tls_verify.yaml rename to providers/ytt/03_customizations/registry_skip_tls_verify.yaml diff --git a/pkg/v1/providers/ytt/04_user_customizations/README.md b/providers/ytt/04_user_customizations/README.md similarity index 100% rename from pkg/v1/providers/ytt/04_user_customizations/README.md rename to providers/ytt/04_user_customizations/README.md diff --git a/pkg/v1/providers/ytt/09_miscellaneous/08_store_data_values.yaml b/providers/ytt/09_miscellaneous/08_store_data_values.yaml similarity index 100% rename from pkg/v1/providers/ytt/09_miscellaneous/08_store_data_values.yaml rename to providers/ytt/09_miscellaneous/08_store_data_values.yaml diff --git a/pkg/v1/providers/ytt/09_miscellaneous/09_filter.yaml b/providers/ytt/09_miscellaneous/09_filter.yaml similarity index 100% rename from pkg/v1/providers/ytt/09_miscellaneous/09_filter.yaml rename to providers/ytt/09_miscellaneous/09_filter.yaml diff --git a/pkg/v1/providers/ytt/lib/config_variable_association.star b/providers/ytt/lib/config_variable_association.star similarity index 100% rename from pkg/v1/providers/ytt/lib/config_variable_association.star rename to providers/ytt/lib/config_variable_association.star diff --git a/pkg/v1/providers/ytt/lib/helpers.star b/providers/ytt/lib/helpers.star similarity index 100% rename from pkg/v1/providers/ytt/lib/helpers.star rename to providers/ytt/lib/helpers.star diff --git a/pkg/v1/providers/ytt/lib/validate.star b/providers/ytt/lib/validate.star similarity index 100% rename from pkg/v1/providers/ytt/lib/validate.star rename to providers/ytt/lib/validate.star diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/LICENSE b/providers/ytt/vendir/cni/_ytt_lib/LICENSE similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/LICENSE rename to providers/ytt/vendir/cni/_ytt_lib/LICENSE diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/NOTICE b/providers/ytt/vendir/cni/_ytt_lib/NOTICE similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/NOTICE rename to providers/ytt/vendir/cni/_ytt_lib/NOTICE diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/kapp-config.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/kapp-config.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/kapp-config.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/kapp-config.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/antrea-overlay.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/antrea-overlay.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/antrea-overlay.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/antrea-overlay.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/update-strategy-overlay.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/update-strategy-overlay.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/update-strategy-overlay.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/overlay/update-strategy-overlay.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/schema.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/schema.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/schema.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/schema.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/upstream/antrea.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/upstream/antrea.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/upstream/antrea.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/upstream/antrea.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.star b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.star rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.star diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/antrea/1.5.3/bundle/config/values.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/calico-overlay.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/calico-overlay.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/calico-overlay.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/calico-overlay.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/update-strategy-overlay.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/update-strategy-overlay.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/update-strategy-overlay.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/overlay/update-strategy-overlay.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/schema.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/schema.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/schema.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/schema.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/upstream/calico.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/upstream/calico.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/upstream/calico.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/upstream/calico.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.star b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.star rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.star diff --git a/pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.yaml b/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.yaml rename to providers/ytt/vendir/cni/_ytt_lib/addons/packages/calico/3.22.1/bundle/config/values.yaml diff --git a/pkg/v1/providers/ytt/vendir/cni/cni.lib.yaml b/providers/ytt/vendir/cni/cni.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/cni/cni.lib.yaml rename to providers/ytt/vendir/cni/cni.lib.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/LICENSE b/providers/ytt/vendir/kapp-controller/_ytt_lib/LICENSE similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/LICENSE rename to providers/ytt/vendir/kapp-controller/_ytt_lib/LICENSE diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/NOTICE b/providers/ytt/vendir/kapp-controller/_ytt_lib/NOTICE similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/NOTICE rename to providers/ytt/vendir/kapp-controller/_ytt_lib/NOTICE diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/change-namespace.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/change-namespace.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/change-namespace.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/change-namespace.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-configmap.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-configmap.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-configmap.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-configmap.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-crds.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-crds.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-crds.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-crds.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-deployment.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-deployment.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-deployment.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-deployment.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-strategy-overlay.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-strategy-overlay.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-strategy-overlay.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/overlays/update-strategy-overlay.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/upstream/kapp-controller.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/upstream/kapp-controller.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/upstream/kapp-controller.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/upstream/kapp-controller.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.star b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.star rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.star diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.yaml b/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.yaml rename to providers/ytt/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.41.2/bundle/config/values.yaml diff --git a/pkg/v1/providers/ytt/vendir/kapp-controller/kapp-controller.lib.yaml b/providers/ytt/vendir/kapp-controller/kapp-controller.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/kapp-controller/kapp-controller.lib.yaml rename to providers/ytt/vendir/kapp-controller/kapp-controller.lib.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/LICENSE b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/LICENSE similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/LICENSE rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/LICENSE diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/NOTICE b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/NOTICE similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/NOTICE rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/NOTICE diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/add-secret.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/add-secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/add-secret.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/add-secret.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-config.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-config.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-config.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-config.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-daemonset.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-daemonset.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-daemonset.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-daemonset.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-secret.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-secret.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/overlays/update-secret.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/schema.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/schema.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/schema.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/schema.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/01-rbac.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/01-rbac.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/01-rbac.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/01-rbac.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/02-config.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/02-config.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/02-config.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/02-config.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/03-secret.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/03-secret.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/03-secret.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/03-secret.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.star b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.star rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.star diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.yaml b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.yaml rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/values.yaml diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/vsphereconf.lib.txt b/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/vsphereconf.lib.txt similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/vsphereconf.lib.txt rename to providers/ytt/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.5/bundle/config/vsphereconf.lib.txt diff --git a/pkg/v1/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml b/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml similarity index 100% rename from pkg/v1/providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml rename to providers/ytt/vendir/vsphere_cpi/vsphere_cpi.lib.yaml diff --git a/pkg/v1/providers/yttcb/clusterbootstrap.yaml b/providers/yttcb/clusterbootstrap.yaml similarity index 100% rename from pkg/v1/providers/yttcb/clusterbootstrap.yaml rename to providers/yttcb/clusterbootstrap.yaml diff --git a/pkg/v1/providers/yttcc/01_plans/dev.yaml b/providers/yttcc/01_plans/dev.yaml similarity index 100% rename from pkg/v1/providers/yttcc/01_plans/dev.yaml rename to providers/yttcc/01_plans/dev.yaml diff --git a/pkg/v1/providers/yttcc/01_plans/prod.yaml b/providers/yttcc/01_plans/prod.yaml similarity index 100% rename from pkg/v1/providers/yttcc/01_plans/prod.yaml rename to providers/yttcc/01_plans/prod.yaml diff --git a/pkg/v1/providers/yttcc/lib/config_variable_association.star b/providers/yttcc/lib/config_variable_association.star similarity index 100% rename from pkg/v1/providers/yttcc/lib/config_variable_association.star rename to providers/yttcc/lib/config_variable_association.star diff --git a/pkg/v1/providers/yttcc/lib/helpers.star b/providers/yttcc/lib/helpers.star similarity index 100% rename from pkg/v1/providers/yttcc/lib/helpers.star rename to providers/yttcc/lib/helpers.star diff --git a/pkg/v1/providers/yttcc/lib/validate.star b/providers/yttcc/lib/validate.star similarity index 100% rename from pkg/v1/providers/yttcc/lib/validate.star rename to providers/yttcc/lib/validate.star diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/LICENSE b/providers/yttcc/vendir/cni/_ytt_lib/LICENSE similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/LICENSE rename to providers/yttcc/vendir/cni/_ytt_lib/LICENSE diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/NOTICE b/providers/yttcc/vendir/cni/_ytt_lib/NOTICE similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/NOTICE rename to providers/yttcc/vendir/cni/_ytt_lib/NOTICE diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/kapp-config.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/kapp-config.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/kapp-config.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/kapp-config.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/overlay/antrea_overlay.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/overlay/antrea_overlay.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/overlay/antrea_overlay.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/overlay/antrea_overlay.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/upstream/antrea.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/upstream/antrea.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/upstream/antrea.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/upstream/antrea.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.star b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.star rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.star diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/antrea/1.2.3/bundle/config/values.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/overlay/calico_overlay.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/overlay/calico_overlay.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/overlay/calico_overlay.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/overlay/calico_overlay.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/upstream/calico.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/upstream/calico.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/upstream/calico.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/upstream/calico.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.star b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.star rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.star diff --git a/pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.yaml b/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.yaml rename to providers/yttcc/vendir/cni/_ytt_lib/addons/packages/calico/3.19.1/bundle/config/values.yaml diff --git a/pkg/v1/providers/yttcc/vendir/cni/cni.lib.yaml b/providers/yttcc/vendir/cni/cni.lib.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/cni/cni.lib.yaml rename to providers/yttcc/vendir/cni/cni.lib.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/LICENSE b/providers/yttcc/vendir/kapp-controller/_ytt_lib/LICENSE similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/LICENSE rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/LICENSE diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/NOTICE b/providers/yttcc/vendir/kapp-controller/_ytt_lib/NOTICE similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/NOTICE rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/NOTICE diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/change-namespace.yaml b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/change-namespace.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/change-namespace.yaml rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/change-namespace.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-configmap.yaml b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-configmap.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-configmap.yaml rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-configmap.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-crds.yaml b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-crds.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-crds.yaml rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-crds.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-deployment.yaml b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-deployment.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-deployment.yaml rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/overlays/update-deployment.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/upstream/kapp-controller.yaml b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/upstream/kapp-controller.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/upstream/kapp-controller.yaml rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/upstream/kapp-controller.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.star b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.star rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.star diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.yaml b/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.yaml rename to providers/yttcc/vendir/kapp-controller/_ytt_lib/addons/packages/kapp-controller/0.30.1/bundle/config/values.yaml diff --git a/pkg/v1/providers/yttcc/vendir/kapp-controller/kapp-controller.lib.yaml b/providers/yttcc/vendir/kapp-controller/kapp-controller.lib.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/kapp-controller/kapp-controller.lib.yaml rename to providers/yttcc/vendir/kapp-controller/kapp-controller.lib.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/LICENSE b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/LICENSE similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/LICENSE rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/LICENSE diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/NOTICE b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/NOTICE similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/NOTICE rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/NOTICE diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/add-secret.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/add-secret.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/add-secret.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/add-secret.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-config.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-config.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-config.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-config.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-daemonset.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-daemonset.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-daemonset.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-daemonset.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-secret.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-secret.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-secret.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/overlays/update-secret.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/01-rbac.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/01-rbac.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/01-rbac.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/01-rbac.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/02-config.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/02-config.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/02-config.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/02-config.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/03-secret.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/03-secret.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/03-secret.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/03-secret.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/upstream/vsphere-cpi/04-daemonset.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.star b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.star similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.star rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.star diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.yaml b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.yaml rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/values.yaml diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/vsphereconf.lib.txt b/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/vsphereconf.lib.txt similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/vsphereconf.lib.txt rename to providers/yttcc/vendir/vsphere_cpi/_ytt_lib/addons/packages/vsphere-cpi/1.22.4/bundle/config/vsphereconf.lib.txt diff --git a/pkg/v1/providers/yttcc/vendir/vsphere_cpi/vsphere_cpi.lib.yaml b/providers/yttcc/vendir/vsphere_cpi/vsphere_cpi.lib.yaml similarity index 100% rename from pkg/v1/providers/yttcc/vendir/vsphere_cpi/vsphere_cpi.lib.yaml rename to providers/yttcc/vendir/vsphere_cpi/vsphere_cpi.lib.yaml diff --git a/tkg/client/management_components_test.go b/tkg/client/management_components_test.go index 11df42872c..217fd7c757 100644 --- a/tkg/client/management_components_test.go +++ b/tkg/client/management_components_test.go @@ -99,7 +99,7 @@ Test4: var _ = Describe("Unit tests for GetKappControllerConfigValuesFile", func() { var ( err error - kappControllerValuesYttDir = "../../pkg/v1/providers/kapp-controller-values" + kappControllerValuesYttDir = "../../providers/kapp-controller-values" inputDataValuesFile string processedKappControllerValuesFile string outputKappControllerValuesFile string diff --git a/tkg/tkgctl/client/client.go b/tkg/tkgctl/client/client.go index f40da2e60d..a14585ad51 100644 --- a/tkg/tkgctl/client/client.go +++ b/tkg/tkgctl/client/client.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // Package client provides access to the providers template data -// Copied over from github.com/vmware-tanzu/tanzu-framework/pkg/v1/providers/client +// Copied over from github.com/vmware-tanzu/tanzu-framework/providers/client package client import (