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..cd6bb9e652 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 @@ -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 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