diff --git a/candi/docs/README.md b/candi/docs/README.md index e08fe3b529..fb553acf92 100644 --- a/candi/docs/README.md +++ b/candi/docs/README.md @@ -50,7 +50,7 @@ For validation and values defaulting, each configuration object has its OpenAPI | OpenStackClusterConfiguration | OpenStack specific configuration | [candi/cloud-providers/openstack/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/ee/candi/cloud-providers/openstack/openapi/cluster_configuration.yaml) | | AWSClusterConfiguration | AWS specific configuration | [candi/cloud-providers/aws/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/cloud-providers/aws/openapi/cluster_configuration.yaml) | | GCPClusterConfiguration | GCP specific configuration | [candi/cloud-providers/gcp/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/cloud-providers/gcp/openapi/cluster_configuration.yaml) | -| vSphereClusterConfiguration | vSphere specific configuration | [candi/cloud-providers/vsphere/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/ee/candi/cloud-providers/vsphere/openapi/cluster_configuration.yaml) | +| vSphereClusterConfiguration | vSphere specific configuration | [candi/cloud-providers/vsphere/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/ee/se-plus/candi/cloud-providers/vsphere/openapi/cluster_configuration.yaml) | | YandexClusterConfiguration | Yandex Cloud specific configuration | [candi/cloud-providers/yandex/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/cloud-providers/yandex/openapi/cluster_configuration.yaml) | | BashibleTemplateData | Bashible Bundle compiling settings (only for dhctl render bashible-bunble) | [candi/bashible/openapi.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/bashible/openapi.yaml) | | KubeadmConfigTemplateData | Kubeadm config compiling settings (only for dhctl render kubeadm-config) | [candi/control-plane-kubeadm/openapi.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/control-plane-kubeadm/openapi.yaml)| diff --git a/dhctl/hack/devenv/start.sh b/dhctl/hack/devenv/start.sh index 05efbd409c..60c80b7f01 100755 --- a/dhctl/hack/devenv/start.sh +++ b/dhctl/hack/devenv/start.sh @@ -36,7 +36,7 @@ if [[ "x$id" == "x" ]]; then -v /deckhouse/dhctl:/dhctl \ -v /deckhouse/candi:/deckhouse/candi \ -v /deckhouse/ee/candi/cloud-providers/openstack:/deckhouse/candi/cloud-providers/openstack \ - -v /deckhouse/ee/candi/cloud-providers/vsphere:/deckhouse/candi/cloud-providers/vsphere \ + -v /deckhouse/ee/se-plus/candi/cloud-providers/vsphere:/deckhouse/candi/cloud-providers/vsphere \ ${INSTALLER_IMAGE_URL} \ tail -f /dev/null) echo "Run new container with ID: ${id}" diff --git a/docs/documentation/werf-git-section.inc.yaml b/docs/documentation/werf-git-section.inc.yaml index 69846aecce..42401fc22e 100644 --- a/docs/documentation/werf-git-section.inc.yaml +++ b/docs/documentation/werf-git-section.inc.yaml @@ -110,7 +110,7 @@ includePaths: ['*cluster_configuration.yaml'] stageDependencies: setup: ['**/*'] -- add: /ee/candi/cloud-providers/vsphere/openapi +- add: /ee/se-plus/candi/cloud-providers/vsphere/openapi to: /src/ee/se-plus/modules/030-cloud-provider-vsphere/crds owner: jekyll group: jekyll @@ -124,7 +124,7 @@ includePaths: ['*instance_class.yaml'] stageDependencies: setup: ['**/*'] -- add: /ee/candi/cloud-providers/vsphere/openapi +- add: /ee/se-plus/candi/cloud-providers/vsphere/openapi to: /src/ee/se-plus/modules/030-cloud-provider-vsphere/openapi owner: jekyll group: jekyll @@ -152,14 +152,14 @@ includePaths: ['*cluster_configuration.yaml'] stageDependencies: setup: ['**/*'] -- add: /ee/candi/cloud-providers/zvirt/openapi +- add: /ee/se-plus/candi/cloud-providers/zvirt/openapi to: /src/ee/modules/030-cloud-provider-zvirt/crds owner: jekyll group: jekyll includePaths: ['*instance_class.yaml'] stageDependencies: setup: ['**/*'] -- add: /ee/candi/cloud-providers/zvirt/openapi +- add: /ee/se-plus/candi/cloud-providers/zvirt/openapi to: /src/ee/modules/030-cloud-provider-zvirt/openapi owner: jekyll group: jekyll @@ -234,7 +234,7 @@ includePaths: ['LAYOUTS*.md','ENVIRONMENT*.md','CLUSTER_CONFIGURATION*.md'] stageDependencies: setup: ['**/*'] -- add: /ee/candi/cloud-providers/vsphere/docs +- add: /ee/se-plus/candi/cloud-providers/vsphere/docs to: /src/ee/se-plus/modules/030-cloud-provider-vsphere/docs owner: jekyll group: jekyll @@ -255,7 +255,7 @@ includePaths: ['LAYOUTS*.md','ENVIRONMENT*.md','CLUSTER_CONFIGURATION*.md'] stageDependencies: setup: ['**/*'] -- add: /ee/candi/cloud-providers/zvirt/docs +- add: /ee/se-plus/candi/cloud-providers/zvirt/docs to: /src/ee/modules/030-cloud-provider-zvirt/docs owner: jekyll group: jekyll diff --git a/ee/se-plus/candi/clodu-providers/.build.yaml b/ee/se-plus/candi/cloud-providers/.build.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/.build.yaml rename to ee/se-plus/candi/cloud-providers/.build.yaml diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bootstrap-networks.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bootstrap-networks.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bootstrap-networks.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bootstrap-networks.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/altlinux/all/030_upgrade_open_vm_tools.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/altlinux/all/030_upgrade_open_vm_tools.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/altlinux/all/030_upgrade_open_vm_tools.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/altlinux/all/030_upgrade_open_vm_tools.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/astra/all/030_upgrade_open_vm_tools.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/astra/all/030_upgrade_open_vm_tools.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/astra/all/030_upgrade_open_vm_tools.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/astra/all/030_upgrade_open_vm_tools.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/centos/all/030_upgrade_open_vm_tools.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/centos/all/030_upgrade_open_vm_tools.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/centos/all/030_upgrade_open_vm_tools.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/centos/all/030_upgrade_open_vm_tools.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/debian/all/030_upgrade_open_vm_tools.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/debian/all/030_upgrade_open_vm_tools.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/debian/all/030_upgrade_open_vm_tools.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/debian/all/030_upgrade_open_vm_tools.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/redos/all/030_upgrade_open_vm_tools.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/redos/all/030_upgrade_open_vm_tools.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/redos/all/030_upgrade_open_vm_tools.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/redos/all/030_upgrade_open_vm_tools.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/ubuntu-lts/all/030_upgrade_open_vm_tools.sh.tpl b/ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/ubuntu-lts/all/030_upgrade_open_vm_tools.sh.tpl similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/bashible/bundles/ubuntu-lts/all/030_upgrade_open_vm_tools.sh.tpl rename to ee/se-plus/candi/cloud-providers/vsphere/bashible/bundles/ubuntu-lts/all/030_upgrade_open_vm_tools.sh.tpl diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/CLUSTER_CONFIGURATION.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/CLUSTER_CONFIGURATION.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/CLUSTER_CONFIGURATION.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/CLUSTER_CONFIGURATION.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/CLUSTER_CONFIGURATION_RU.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/CLUSTER_CONFIGURATION_RU.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/CLUSTER_CONFIGURATION_RU.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/CLUSTER_CONFIGURATION_RU.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/ENVIRONMENT.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/ENVIRONMENT.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/ENVIRONMENT.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/ENVIRONMENT.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/ENVIRONMENT_RU.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/ENVIRONMENT_RU.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/ENVIRONMENT_RU.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/ENVIRONMENT_RU.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/LAYOUTS.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/LAYOUTS.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/LAYOUTS.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/LAYOUTS.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/LAYOUTS_RU.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/LAYOUTS_RU.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/LAYOUTS_RU.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/LAYOUTS_RU.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/docs/internal/narrow_roles_example.md b/ee/se-plus/candi/cloud-providers/vsphere/docs/internal/narrow_roles_example.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/docs/internal/narrow_roles_example.md rename to ee/se-plus/candi/cloud-providers/vsphere/docs/internal/narrow_roles_example.md diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/main.tf b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/main.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/main.tf rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/main.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/outputs.tf b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/outputs.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/outputs.tf rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/outputs.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/providers.tf b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/providers.tf rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/variables.tf b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/variables.tf rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/versions.tf b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/base-infrastructure/versions.tf rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/base-infrastructure/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/master-node b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/master-node similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/master-node rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/master-node diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/static-node b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/static-node similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/static-node rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/static-node diff --git a/ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/variables.tf b/ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/layouts/standard/variables.tf rename to ee/se-plus/candi/cloud-providers/vsphere/layouts/standard/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/openapi/cloud_discovery_data.yaml b/ee/se-plus/candi/cloud-providers/vsphere/openapi/cloud_discovery_data.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/openapi/cloud_discovery_data.yaml rename to ee/se-plus/candi/cloud-providers/vsphere/openapi/cloud_discovery_data.yaml diff --git a/ee/se-plus/candi/clodu-providers/vsphere/openapi/cluster_configuration.yaml b/ee/se-plus/candi/cloud-providers/vsphere/openapi/cluster_configuration.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/openapi/cluster_configuration.yaml rename to ee/se-plus/candi/cloud-providers/vsphere/openapi/cluster_configuration.yaml diff --git a/ee/se-plus/candi/clodu-providers/vsphere/openapi/doc-ru-cluster_configuration.yaml b/ee/se-plus/candi/cloud-providers/vsphere/openapi/doc-ru-cluster_configuration.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/openapi/doc-ru-cluster_configuration.yaml rename to ee/se-plus/candi/cloud-providers/vsphere/openapi/doc-ru-cluster_configuration.yaml diff --git a/ee/se-plus/candi/clodu-providers/vsphere/openapi/doc-ru-instance_class.yaml b/ee/se-plus/candi/cloud-providers/vsphere/openapi/doc-ru-instance_class.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/openapi/doc-ru-instance_class.yaml rename to ee/se-plus/candi/cloud-providers/vsphere/openapi/doc-ru-instance_class.yaml diff --git a/ee/se-plus/candi/clodu-providers/vsphere/openapi/instance_class.yaml b/ee/se-plus/candi/cloud-providers/vsphere/openapi/instance_class.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/openapi/instance_class.yaml rename to ee/se-plus/candi/cloud-providers/vsphere/openapi/instance_class.yaml diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/main.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/main.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/main.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/main.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/outputs.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/outputs.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/outputs.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/outputs.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/providers.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/providers.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/variables.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/variables.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/versions.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/master-node/versions.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/master-node/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/providers.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/providers.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/main.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/main.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/main.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/main.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/providers.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/providers.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/variables.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/variables.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/versions.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/static-node/versions.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/static-node/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/variables.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/variables.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/versions.tf b/ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/vsphere/terraform-modules/versions.tf rename to ee/se-plus/candi/cloud-providers/vsphere/terraform-modules/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/docs/CLUSTER_CONFIGURATION.md b/ee/se-plus/candi/cloud-providers/zvirt/docs/CLUSTER_CONFIGURATION.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/docs/CLUSTER_CONFIGURATION.md rename to ee/se-plus/candi/cloud-providers/zvirt/docs/CLUSTER_CONFIGURATION.md diff --git a/ee/se-plus/candi/clodu-providers/zvirt/docs/CLUSTER_CONFIGURATION_RU.md b/ee/se-plus/candi/cloud-providers/zvirt/docs/CLUSTER_CONFIGURATION_RU.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/docs/CLUSTER_CONFIGURATION_RU.md rename to ee/se-plus/candi/cloud-providers/zvirt/docs/CLUSTER_CONFIGURATION_RU.md diff --git a/ee/se-plus/candi/clodu-providers/zvirt/docs/ENVIRONMENT.md b/ee/se-plus/candi/cloud-providers/zvirt/docs/ENVIRONMENT.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/docs/ENVIRONMENT.md rename to ee/se-plus/candi/cloud-providers/zvirt/docs/ENVIRONMENT.md diff --git a/ee/se-plus/candi/clodu-providers/zvirt/docs/ENVIRONMENT_RU.md b/ee/se-plus/candi/cloud-providers/zvirt/docs/ENVIRONMENT_RU.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/docs/ENVIRONMENT_RU.md rename to ee/se-plus/candi/cloud-providers/zvirt/docs/ENVIRONMENT_RU.md diff --git a/ee/se-plus/candi/clodu-providers/zvirt/docs/LAYOUTS.md b/ee/se-plus/candi/cloud-providers/zvirt/docs/LAYOUTS.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/docs/LAYOUTS.md rename to ee/se-plus/candi/cloud-providers/zvirt/docs/LAYOUTS.md diff --git a/ee/se-plus/candi/clodu-providers/zvirt/docs/LAYOUTS_RU.md b/ee/se-plus/candi/cloud-providers/zvirt/docs/LAYOUTS_RU.md similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/docs/LAYOUTS_RU.md rename to ee/se-plus/candi/cloud-providers/zvirt/docs/LAYOUTS_RU.md diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/main.tf b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/main.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/main.tf rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/main.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/outputs.tf b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/outputs.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/outputs.tf rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/outputs.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/providers.tf b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/providers.tf rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/variables.tf b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/variables.tf rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/versions.tf b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/base-infrastructure/versions.tf rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/base-infrastructure/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/master-node b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/master-node similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/master-node rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/master-node diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/master-node~HEAD b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/master-node~HEAD similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/master-node~HEAD rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/master-node~HEAD diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/static-node b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/static-node similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/static-node rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/static-node diff --git a/ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/variables.tf b/ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/layouts/standard/variables.tf rename to ee/se-plus/candi/cloud-providers/zvirt/layouts/standard/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/openapi/cloud_discovery_data.yaml b/ee/se-plus/candi/cloud-providers/zvirt/openapi/cloud_discovery_data.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/openapi/cloud_discovery_data.yaml rename to ee/se-plus/candi/cloud-providers/zvirt/openapi/cloud_discovery_data.yaml diff --git a/ee/se-plus/candi/clodu-providers/zvirt/openapi/cluster_configuration.yaml b/ee/se-plus/candi/cloud-providers/zvirt/openapi/cluster_configuration.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/openapi/cluster_configuration.yaml rename to ee/se-plus/candi/cloud-providers/zvirt/openapi/cluster_configuration.yaml diff --git a/ee/se-plus/candi/clodu-providers/zvirt/openapi/doc-ru-cluster_configuration.yaml b/ee/se-plus/candi/cloud-providers/zvirt/openapi/doc-ru-cluster_configuration.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/openapi/doc-ru-cluster_configuration.yaml rename to ee/se-plus/candi/cloud-providers/zvirt/openapi/doc-ru-cluster_configuration.yaml diff --git a/ee/se-plus/candi/clodu-providers/zvirt/openapi/doc-ru-instance_class.yaml b/ee/se-plus/candi/cloud-providers/zvirt/openapi/doc-ru-instance_class.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/openapi/doc-ru-instance_class.yaml rename to ee/se-plus/candi/cloud-providers/zvirt/openapi/doc-ru-instance_class.yaml diff --git a/ee/se-plus/candi/clodu-providers/zvirt/openapi/instance_class.yaml b/ee/se-plus/candi/cloud-providers/zvirt/openapi/instance_class.yaml similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/openapi/instance_class.yaml rename to ee/se-plus/candi/cloud-providers/zvirt/openapi/instance_class.yaml diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/main.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/main.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/main.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/main.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/outputs.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/outputs.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/outputs.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/outputs.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/providers.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/providers.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/variables.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/variables.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/versions.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/master-node/versions.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/master-node/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/providers.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/providers.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/main.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/main.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/main.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/main.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/providers.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/providers.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/providers.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/providers.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/variables.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/variables.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/versions.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/static-node/versions.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/static-node/versions.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/variables.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/variables.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/variables.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/variables.tf diff --git a/ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/versions.tf b/ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/versions.tf similarity index 100% rename from ee/se-plus/candi/clodu-providers/zvirt/terraform-modules/versions.tf rename to ee/se-plus/candi/cloud-providers/zvirt/terraform-modules/versions.tf diff --git a/ee/se-plus/modules/030-cloud-provider-vsphere/template_tests/module_test.go b/ee/se-plus/modules/030-cloud-provider-vsphere/template_tests/module_test.go index 6a7cdf2f12..77f8d22a21 100644 --- a/ee/se-plus/modules/030-cloud-provider-vsphere/template_tests/module_test.go +++ b/ee/se-plus/modules/030-cloud-provider-vsphere/template_tests/module_test.go @@ -226,7 +226,7 @@ var _ = Describe("Module :: cloud-provider-vsphere :: helm template ::", func() BeforeSuite(func() { err := os.Remove("/deckhouse/ee/se-plus/modules/030-cloud-provider-vsphere/candi") Expect(err).ShouldNot(HaveOccurred()) - err = os.Symlink("/deckhouse/ee/candi/cloud-providers/vsphere", "/deckhouse/ee/se-plus/modules/030-cloud-provider-vsphere/candi") + err = os.Symlink("/deckhouse/ee/se-plus/candi/cloud-providers/vsphere", "/deckhouse/ee/se-plus/modules/030-cloud-provider-vsphere/candi") Expect(err).ShouldNot(HaveOccurred()) }) diff --git a/ee/se-plus/modules/030-cloud-provider-zvirt/candi b/ee/se-plus/modules/030-cloud-provider-zvirt/candi index 5e3ea0ee94..3c4a8e8cf1 120000 --- a/ee/se-plus/modules/030-cloud-provider-zvirt/candi +++ b/ee/se-plus/modules/030-cloud-provider-zvirt/candi @@ -1 +1 @@ -/deckhouse/ee/candi/cloud-providers/zvirt/ \ No newline at end of file +/deckhouse/ee/se-plus/candi/cloud-providers/zvirt/ \ No newline at end of file diff --git a/ee/se-plus/modules/030-cloud-provider-zvirt/hooks/discover.go b/ee/se-plus/modules/030-cloud-provider-zvirt/hooks/discover.go index 54ab668dbe..12c8a1a508 100644 --- a/ee/se-plus/modules/030-cloud-provider-zvirt/hooks/discover.go +++ b/ee/se-plus/modules/030-cloud-provider-zvirt/hooks/discover.go @@ -115,7 +115,7 @@ func handleCloudProviderDiscoveryDataSecret(input *go_hook.HookInput) error { discoveryDataJSON := secret.Data["discovery-data.json"] - _, err := config.ValidateDiscoveryData(&discoveryDataJSON, []string{"/deckhouse/ee/candi/cloud-providers/zvirt/openapi"}) + _, err := config.ValidateDiscoveryData(&discoveryDataJSON, []string{"/deckhouse/ee/se-plus/candi/cloud-providers/zvirt/openapi"}) if err != nil { return fmt.Errorf("failed to validate 'discovery-data.json' from 'd8-cloud-provider-discovery-data' secret: %v", err) } diff --git a/testing/matrix/matrix_test.go b/testing/matrix/matrix_test.go index bbb7ffe69d..0f47741e69 100644 --- a/testing/matrix/matrix_test.go +++ b/testing/matrix/matrix_test.go @@ -95,13 +95,13 @@ func (s *TestMatrixSuite) changeSymlinks() { "/deckhouse/ee/candi/cloud-providers/openstack/") s.changeSymlink( "/deckhouse/ee/se-plus/modules/030-cloud-provider-vsphere/candi", - "/deckhouse/ee/candi/cloud-providers/vsphere/") + "/deckhouse/ee/se-plus/candi/cloud-providers/vsphere/") s.changeSymlink( "/deckhouse/ee/modules/030-cloud-provider-vcd/candi", "/deckhouse/ee/candi/cloud-providers/vcd/") s.changeSymlink( "/deckhouse/ee/se-plus/modules/030-cloud-provider-zvirt/candi", - "/deckhouse/ee/candi/cloud-providers/zvirt/") + "/deckhouse/ee/se-plus/candi/cloud-providers/zvirt/") s.delSymlink("/deckhouse/modules/040-node-manager/images_digests.json") s.symlink( "/deckhouse/ee/modules/030-cloud-provider-openstack/cloud-instance-manager/", diff --git a/tools/build_includes/candi-EE.yaml b/tools/build_includes/candi-EE.yaml index d9e1c5faf4..edcb2a832f 100644 --- a/tools/build_includes/candi-EE.yaml +++ b/tools/build_includes/candi-EE.yaml @@ -22,10 +22,10 @@ stageDependencies: setup: - '**/*' -- add: /ee/se-plus/candi/clodu-providers/vsphere - to: /deckhouse/candi/clodu-providers/vsphere -- add: /ee/se-plus/candi/clodu-providers/zvirt - to: /deckhouse/candi/clodu-providers/zvirt +- add: /ee/se-plus/candi/cloud-providers/vsphere + to: /deckhouse/candi/cloud-providers/vsphere +- add: /ee/se-plus/candi/cloud-providers/zvirt + to: /deckhouse/candi/cloud-providers/zvirt - add: /ee/candi/cloud-providers/openstack to: /deckhouse/candi/cloud-providers/openstack - add: /ee/candi/cloud-providers/vcd diff --git a/tools/build_includes/candi-FE.yaml b/tools/build_includes/candi-FE.yaml index e93b195450..343a4fbe5e 100644 --- a/tools/build_includes/candi-FE.yaml +++ b/tools/build_includes/candi-FE.yaml @@ -22,10 +22,10 @@ stageDependencies: setup: - '**/*' -- add: /ee/se-plus/candi/clodu-providers/vsphere - to: /deckhouse/candi/clodu-providers/vsphere -- add: /ee/se-plus/candi/clodu-providers/zvirt - to: /deckhouse/candi/clodu-providers/zvirt +- add: /ee/se-plus/candi/cloud-providers/vsphere + to: /deckhouse/candi/cloud-providers/vsphere +- add: /ee/se-plus/candi/cloud-providers/zvirt + to: /deckhouse/candi/cloud-providers/zvirt - add: /ee/candi/cloud-providers/openstack to: /deckhouse/candi/cloud-providers/openstack - add: /ee/candi/cloud-providers/vcd diff --git a/tools/build_includes/candi-SE+.yaml b/tools/build_includes/candi-SE+.yaml index 076050d2a9..91a3033073 100644 --- a/tools/build_includes/candi-SE+.yaml +++ b/tools/build_includes/candi-SE+.yaml @@ -22,7 +22,7 @@ stageDependencies: setup: - '**/*' -- add: /ee/se-plus/candi/clodu-providers/vsphere - to: /deckhouse/candi/clodu-providers/vsphere -- add: /ee/se-plus/candi/clodu-providers/zvirt - to: /deckhouse/candi/clodu-providers/zvirt +- add: /ee/se-plus/candi/cloud-providers/vsphere + to: /deckhouse/candi/cloud-providers/vsphere +- add: /ee/se-plus/candi/cloud-providers/zvirt + to: /deckhouse/candi/cloud-providers/zvirt