+

Signed-off-by: Nikolay Gorbatov <nikolay.gorbatov@flant.com>
deckhouse · Nov 28, 2024 · 87ed567 · 87ed567
1 parent 14d30c3
commit 87ed567
Show file tree

Hide file tree

Showing 79 changed files with 17 additions and 17 deletions.
diff --git a/ee/modules/030-cloud-provider-dynamix/candi b/ee/modules/030-cloud-provider-dynamix/candi
@@ -1 +1 @@
-/deckhouse/candi/cloud-providers/dynamix
+/deckhouse/ee/candi/cloud-providers/dynamix/
diff --git a/ee/modules/030-cloud-provider-openstack/candi b/ee/modules/030-cloud-provider-openstack/candi
@@ -1 +1 @@
-/deckhouse/candi/cloud-providers/openstack
+/deckhouse/candi/cloud-providers/openstack/
diff --git a/ee/modules/030-cloud-provider-vcd/candi b/ee/modules/030-cloud-provider-vcd/candi
@@ -1 +1 @@
-/deckhouse/candi/cloud-providers/vcd
+/deckhouse/candi/cloud-providers/vcd/
diff --git a/ee/se-plus/candi/clodu-providers/.build.yaml → ee/se-plus/candi/cloud-providers/.build.yaml b/ee/se-plus/candi/clodu-providers/.build.yaml → ee/se-plus/candi/cloud-providers/.build.yaml
diff --git a/...sphere/bashible/bootstrap-networks.sh.tpl → ...sphere/bashible/bootstrap-networks.sh.tpl b/...sphere/bashible/bootstrap-networks.sh.tpl → ...sphere/bashible/bootstrap-networks.sh.tpl
diff --git a/...inux/all/030_upgrade_open_vm_tools.sh.tpl → ...inux/all/030_upgrade_open_vm_tools.sh.tpl b/...inux/all/030_upgrade_open_vm_tools.sh.tpl → ...inux/all/030_upgrade_open_vm_tools.sh.tpl
diff --git a/...stra/all/030_upgrade_open_vm_tools.sh.tpl → ...stra/all/030_upgrade_open_vm_tools.sh.tpl b/...stra/all/030_upgrade_open_vm_tools.sh.tpl → ...stra/all/030_upgrade_open_vm_tools.sh.tpl
diff --git a/...ntos/all/030_upgrade_open_vm_tools.sh.tpl → ...ntos/all/030_upgrade_open_vm_tools.sh.tpl b/...ntos/all/030_upgrade_open_vm_tools.sh.tpl → ...ntos/all/030_upgrade_open_vm_tools.sh.tpl
diff --git a/...bian/all/030_upgrade_open_vm_tools.sh.tpl → ...bian/all/030_upgrade_open_vm_tools.sh.tpl b/...bian/all/030_upgrade_open_vm_tools.sh.tpl → ...bian/all/030_upgrade_open_vm_tools.sh.tpl
diff --git a/...edos/all/030_upgrade_open_vm_tools.sh.tpl → ...edos/all/030_upgrade_open_vm_tools.sh.tpl b/...edos/all/030_upgrade_open_vm_tools.sh.tpl → ...edos/all/030_upgrade_open_vm_tools.sh.tpl
diff --git a/...-lts/all/030_upgrade_open_vm_tools.sh.tpl → ...-lts/all/030_upgrade_open_vm_tools.sh.tpl b/...-lts/all/030_upgrade_open_vm_tools.sh.tpl → ...-lts/all/030_upgrade_open_vm_tools.sh.tpl
diff --git a/...ers/vsphere/docs/CLUSTER_CONFIGURATION.md → ...ers/vsphere/docs/CLUSTER_CONFIGURATION.md b/...ers/vsphere/docs/CLUSTER_CONFIGURATION.md → ...ers/vsphere/docs/CLUSTER_CONFIGURATION.md
diff --git a/.../vsphere/docs/CLUSTER_CONFIGURATION_RU.md → .../vsphere/docs/CLUSTER_CONFIGURATION_RU.md b/.../vsphere/docs/CLUSTER_CONFIGURATION_RU.md → .../vsphere/docs/CLUSTER_CONFIGURATION_RU.md
diff --git a/...odu-providers/vsphere/docs/ENVIRONMENT.md → ...oud-providers/vsphere/docs/ENVIRONMENT.md b/...odu-providers/vsphere/docs/ENVIRONMENT.md → ...oud-providers/vsphere/docs/ENVIRONMENT.md
diff --git a/...-providers/vsphere/docs/ENVIRONMENT_RU.md → ...-providers/vsphere/docs/ENVIRONMENT_RU.md b/...-providers/vsphere/docs/ENVIRONMENT_RU.md → ...-providers/vsphere/docs/ENVIRONMENT_RU.md
diff --git a/...i/clodu-providers/vsphere/docs/LAYOUTS.md → ...i/cloud-providers/vsphere/docs/LAYOUTS.md b/...i/clodu-providers/vsphere/docs/LAYOUTS.md → ...i/cloud-providers/vsphere/docs/LAYOUTS.md
diff --git a/...lodu-providers/vsphere/docs/LAYOUTS_RU.md → ...loud-providers/vsphere/docs/LAYOUTS_RU.md b/...lodu-providers/vsphere/docs/LAYOUTS_RU.md → ...loud-providers/vsphere/docs/LAYOUTS_RU.md
diff --git a/...ere/docs/internal/narrow_roles_example.md → ...ere/docs/internal/narrow_roles_example.md b/...ere/docs/internal/narrow_roles_example.md → ...ere/docs/internal/narrow_roles_example.md
diff --git a/...outs/standard/base-infrastructure/main.tf → ...outs/standard/base-infrastructure/main.tf b/...outs/standard/base-infrastructure/main.tf → ...outs/standard/base-infrastructure/main.tf
diff --git a/...s/standard/base-infrastructure/outputs.tf → ...s/standard/base-infrastructure/outputs.tf b/...s/standard/base-infrastructure/outputs.tf → ...s/standard/base-infrastructure/outputs.tf
diff --git a/...standard/base-infrastructure/providers.tf → ...standard/base-infrastructure/providers.tf b/...standard/base-infrastructure/providers.tf → ...standard/base-infrastructure/providers.tf
diff --git a/...standard/base-infrastructure/variables.tf → ...standard/base-infrastructure/variables.tf b/...standard/base-infrastructure/variables.tf → ...standard/base-infrastructure/variables.tf
diff --git a/.../standard/base-infrastructure/versions.tf → .../standard/base-infrastructure/versions.tf b/.../standard/base-infrastructure/versions.tf → .../standard/base-infrastructure/versions.tf
diff --git a/...ders/vsphere/layouts/standard/master-node → ...ders/vsphere/layouts/standard/master-node b/...ders/vsphere/layouts/standard/master-node → ...ders/vsphere/layouts/standard/master-node
diff --git a/...ders/vsphere/layouts/standard/static-node → ...ders/vsphere/layouts/standard/static-node b/...ders/vsphere/layouts/standard/static-node → ...ders/vsphere/layouts/standard/static-node
diff --git a/...ers/vsphere/layouts/standard/variables.tf → ...ers/vsphere/layouts/standard/variables.tf b/...ers/vsphere/layouts/standard/variables.tf → ...ers/vsphere/layouts/standard/variables.tf
diff --git a/...vsphere/openapi/cloud_discovery_data.yaml → ...vsphere/openapi/cloud_discovery_data.yaml b/...vsphere/openapi/cloud_discovery_data.yaml → ...vsphere/openapi/cloud_discovery_data.yaml
diff --git a/...sphere/openapi/cluster_configuration.yaml → ...sphere/openapi/cluster_configuration.yaml b/...sphere/openapi/cluster_configuration.yaml → ...sphere/openapi/cluster_configuration.yaml
diff --git a/...openapi/doc-ru-cluster_configuration.yaml → ...openapi/doc-ru-cluster_configuration.yaml b/...openapi/doc-ru-cluster_configuration.yaml → ...openapi/doc-ru-cluster_configuration.yaml
diff --git a/...sphere/openapi/doc-ru-instance_class.yaml → ...sphere/openapi/doc-ru-instance_class.yaml b/...sphere/openapi/doc-ru-instance_class.yaml → ...sphere/openapi/doc-ru-instance_class.yaml
diff --git a/...iders/vsphere/openapi/instance_class.yaml → ...iders/vsphere/openapi/instance_class.yaml b/...iders/vsphere/openapi/instance_class.yaml → ...iders/vsphere/openapi/instance_class.yaml
diff --git a/...ere/terraform-modules/master-node/main.tf → ...ere/terraform-modules/master-node/main.tf b/...ere/terraform-modules/master-node/main.tf → ...ere/terraform-modules/master-node/main.tf
diff --git a/.../terraform-modules/master-node/outputs.tf → .../terraform-modules/master-node/outputs.tf b/.../terraform-modules/master-node/outputs.tf → .../terraform-modules/master-node/outputs.tf
diff --git a/...erraform-modules/master-node/providers.tf → ...erraform-modules/master-node/providers.tf b/...erraform-modules/master-node/providers.tf → ...erraform-modules/master-node/providers.tf
diff --git a/...erraform-modules/master-node/variables.tf → ...erraform-modules/master-node/variables.tf b/...erraform-modules/master-node/variables.tf → ...erraform-modules/master-node/variables.tf
diff --git a/...terraform-modules/master-node/versions.tf → ...terraform-modules/master-node/versions.tf b/...terraform-modules/master-node/versions.tf → ...terraform-modules/master-node/versions.tf
diff --git a/...rs/vsphere/terraform-modules/providers.tf → ...rs/vsphere/terraform-modules/providers.tf b/...rs/vsphere/terraform-modules/providers.tf → ...rs/vsphere/terraform-modules/providers.tf
diff --git a/...ere/terraform-modules/static-node/main.tf → ...ere/terraform-modules/static-node/main.tf b/...ere/terraform-modules/static-node/main.tf → ...ere/terraform-modules/static-node/main.tf
diff --git a/...erraform-modules/static-node/providers.tf → ...erraform-modules/static-node/providers.tf b/...erraform-modules/static-node/providers.tf → ...erraform-modules/static-node/providers.tf
diff --git a/...erraform-modules/static-node/variables.tf → ...erraform-modules/static-node/variables.tf b/...erraform-modules/static-node/variables.tf → ...erraform-modules/static-node/variables.tf
diff --git a/...terraform-modules/static-node/versions.tf → ...terraform-modules/static-node/versions.tf b/...terraform-modules/static-node/versions.tf → ...terraform-modules/static-node/versions.tf
diff --git a/...rs/vsphere/terraform-modules/variables.tf → ...rs/vsphere/terraform-modules/variables.tf b/...rs/vsphere/terraform-modules/variables.tf → ...rs/vsphere/terraform-modules/variables.tf
diff --git a/...ers/vsphere/terraform-modules/versions.tf → ...ers/vsphere/terraform-modules/versions.tf b/...ers/vsphere/terraform-modules/versions.tf → ...ers/vsphere/terraform-modules/versions.tf
diff --git a/...iders/zvirt/docs/CLUSTER_CONFIGURATION.md → ...iders/zvirt/docs/CLUSTER_CONFIGURATION.md b/...iders/zvirt/docs/CLUSTER_CONFIGURATION.md → ...iders/zvirt/docs/CLUSTER_CONFIGURATION.md
diff --git a/...rs/zvirt/docs/CLUSTER_CONFIGURATION_RU.md → ...rs/zvirt/docs/CLUSTER_CONFIGURATION_RU.md b/...rs/zvirt/docs/CLUSTER_CONFIGURATION_RU.md → ...rs/zvirt/docs/CLUSTER_CONFIGURATION_RU.md
diff --git a/...clodu-providers/zvirt/docs/ENVIRONMENT.md → ...cloud-providers/zvirt/docs/ENVIRONMENT.md b/...clodu-providers/zvirt/docs/ENVIRONMENT.md → ...cloud-providers/zvirt/docs/ENVIRONMENT.md
diff --git a/...du-providers/zvirt/docs/ENVIRONMENT_RU.md → ...ud-providers/zvirt/docs/ENVIRONMENT_RU.md b/...du-providers/zvirt/docs/ENVIRONMENT_RU.md → ...ud-providers/zvirt/docs/ENVIRONMENT_RU.md
diff --git a/...ndi/clodu-providers/zvirt/docs/LAYOUTS.md → ...ndi/cloud-providers/zvirt/docs/LAYOUTS.md b/...ndi/clodu-providers/zvirt/docs/LAYOUTS.md → ...ndi/cloud-providers/zvirt/docs/LAYOUTS.md
diff --git a/.../clodu-providers/zvirt/docs/LAYOUTS_RU.md → .../cloud-providers/zvirt/docs/LAYOUTS_RU.md b/.../clodu-providers/zvirt/docs/LAYOUTS_RU.md → .../cloud-providers/zvirt/docs/LAYOUTS_RU.md
diff --git a/...outs/standard/base-infrastructure/main.tf → ...outs/standard/base-infrastructure/main.tf b/...outs/standard/base-infrastructure/main.tf → ...outs/standard/base-infrastructure/main.tf
diff --git a/...s/standard/base-infrastructure/outputs.tf → ...s/standard/base-infrastructure/outputs.tf b/...s/standard/base-infrastructure/outputs.tf → ...s/standard/base-infrastructure/outputs.tf
diff --git a/...standard/base-infrastructure/providers.tf → ...standard/base-infrastructure/providers.tf b/...standard/base-infrastructure/providers.tf → ...standard/base-infrastructure/providers.tf
diff --git a/...standard/base-infrastructure/variables.tf → ...standard/base-infrastructure/variables.tf b/...standard/base-infrastructure/variables.tf → ...standard/base-infrastructure/variables.tf
diff --git a/.../standard/base-infrastructure/versions.tf → .../standard/base-infrastructure/versions.tf b/.../standard/base-infrastructure/versions.tf → .../standard/base-infrastructure/versions.tf
diff --git a/...viders/zvirt/layouts/standard/master-node → ...viders/zvirt/layouts/standard/master-node b/...viders/zvirt/layouts/standard/master-node → ...viders/zvirt/layouts/standard/master-node
diff --git a/...s/zvirt/layouts/standard/master-node~HEAD → ...s/zvirt/layouts/standard/master-node~HEAD b/...s/zvirt/layouts/standard/master-node~HEAD → ...s/zvirt/layouts/standard/master-node~HEAD
diff --git a/...viders/zvirt/layouts/standard/static-node → ...viders/zvirt/layouts/standard/static-node b/...viders/zvirt/layouts/standard/static-node → ...viders/zvirt/layouts/standard/static-node
diff --git a/...iders/zvirt/layouts/standard/variables.tf → ...iders/zvirt/layouts/standard/variables.tf b/...iders/zvirt/layouts/standard/variables.tf → ...iders/zvirt/layouts/standard/variables.tf
diff --git a/...s/zvirt/openapi/cloud_discovery_data.yaml → ...s/zvirt/openapi/cloud_discovery_data.yaml b/...s/zvirt/openapi/cloud_discovery_data.yaml → ...s/zvirt/openapi/cloud_discovery_data.yaml
diff --git a/.../zvirt/openapi/cluster_configuration.yaml → .../zvirt/openapi/cluster_configuration.yaml b/.../zvirt/openapi/cluster_configuration.yaml → .../zvirt/openapi/cluster_configuration.yaml
diff --git a/...openapi/doc-ru-cluster_configuration.yaml → ...openapi/doc-ru-cluster_configuration.yaml b/...openapi/doc-ru-cluster_configuration.yaml → ...openapi/doc-ru-cluster_configuration.yaml
diff --git a/.../zvirt/openapi/doc-ru-instance_class.yaml → .../zvirt/openapi/doc-ru-instance_class.yaml b/.../zvirt/openapi/doc-ru-instance_class.yaml → .../zvirt/openapi/doc-ru-instance_class.yaml
diff --git a/...oviders/zvirt/openapi/instance_class.yaml → ...oviders/zvirt/openapi/instance_class.yaml b/...oviders/zvirt/openapi/instance_class.yaml → ...oviders/zvirt/openapi/instance_class.yaml
diff --git a/...irt/terraform-modules/master-node/main.tf → ...irt/terraform-modules/master-node/main.tf b/...irt/terraform-modules/master-node/main.tf → ...irt/terraform-modules/master-node/main.tf
diff --git a/.../terraform-modules/master-node/outputs.tf → .../terraform-modules/master-node/outputs.tf b/.../terraform-modules/master-node/outputs.tf → .../terraform-modules/master-node/outputs.tf
diff --git a/...erraform-modules/master-node/providers.tf → ...erraform-modules/master-node/providers.tf b/...erraform-modules/master-node/providers.tf → ...erraform-modules/master-node/providers.tf
diff --git a/...erraform-modules/master-node/variables.tf → ...erraform-modules/master-node/variables.tf b/...erraform-modules/master-node/variables.tf → ...erraform-modules/master-node/variables.tf
diff --git a/...terraform-modules/master-node/versions.tf → ...terraform-modules/master-node/versions.tf b/...terraform-modules/master-node/versions.tf → ...terraform-modules/master-node/versions.tf
diff --git a/...ders/zvirt/terraform-modules/providers.tf → ...ders/zvirt/terraform-modules/providers.tf b/...ders/zvirt/terraform-modules/providers.tf → ...ders/zvirt/terraform-modules/providers.tf
diff --git a/...irt/terraform-modules/static-node/main.tf → ...irt/terraform-modules/static-node/main.tf b/...irt/terraform-modules/static-node/main.tf → ...irt/terraform-modules/static-node/main.tf
diff --git a/...erraform-modules/static-node/providers.tf → ...erraform-modules/static-node/providers.tf b/...erraform-modules/static-node/providers.tf → ...erraform-modules/static-node/providers.tf
diff --git a/...erraform-modules/static-node/variables.tf → ...erraform-modules/static-node/variables.tf b/...erraform-modules/static-node/variables.tf → ...erraform-modules/static-node/variables.tf
diff --git a/...terraform-modules/static-node/versions.tf → ...terraform-modules/static-node/versions.tf b/...terraform-modules/static-node/versions.tf → ...terraform-modules/static-node/versions.tf
diff --git a/...ders/zvirt/terraform-modules/variables.tf → ...ders/zvirt/terraform-modules/variables.tf b/...ders/zvirt/terraform-modules/variables.tf → ...ders/zvirt/terraform-modules/variables.tf
diff --git a/...iders/zvirt/terraform-modules/versions.tf → ...iders/zvirt/terraform-modules/versions.tf b/...iders/zvirt/terraform-modules/versions.tf → ...iders/zvirt/terraform-modules/versions.tf
diff --git 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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/deckhouse/candi/cloud-providers/dynamix
		/deckhouse/ee/candi/cloud-providers/dynamix/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/deckhouse/candi/cloud-providers/openstack
		/deckhouse/candi/cloud-providers/openstack/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/deckhouse/candi/cloud-providers/vcd
		/deckhouse/candi/cloud-providers/vcd/