+

Signed-off-by: Nikolay Gorbatov <nikolay.gorbatov@flant.com>

docs/documentation/werf-git-section.inc.yaml

@@ -111,7 +111,7 @@
   stageDependencies:
     setup: ['**/*']
 - add: /ee/candi/cloud-providers/vsphere/openapi
-  to: /src/ee/modules/030-cloud-provider-vsphere/crds
+  to: /src/ee/se_plus/modules/030-cloud-provider-vsphere/crds
   owner: jekyll
   group: jekyll
   includePaths: ['*instance_class.yaml']
@@ -125,7 +125,7 @@
   stageDependencies:
     setup: ['**/*']
 - add: /ee/candi/cloud-providers/vsphere/openapi
-  to: /src/ee/modules/030-cloud-provider-vsphere/openapi
+  to: /src/ee/se_plus/modules/030-cloud-provider-vsphere/openapi
   owner: jekyll
   group: jekyll
   includePaths: ['*cluster_configuration.yaml']
@@ -235,7 +235,7 @@
   stageDependencies:
     setup: ['**/*']
 - add: /ee/candi/cloud-providers/vsphere/docs
-  to: /src/ee/modules/030-cloud-provider-vsphere/docs
+  to: /src/ee/se_plus/modules/030-cloud-provider-vsphere/docs
   owner: jekyll
   group: jekyll
   includePaths: ['LAYOUTS*.md','ENVIRONMENT*.md','CLUSTER_CONFIGURATION*.md']

docs/site/LOCAL_DEV.md

@@ -73,7 +73,7 @@ Use the following commands:
   Example:
 
   ```shell
-  file=ee/modules/030-cloud-provider-vsphere/docs/CONFIGURATION_RU.md make docs-spellcheck`
+  file=ee/se_plus/modules/030-cloud-provider-vsphere/docs/CONFIGURATION_RU.md make docs-spellcheck`
   ```
 
 - `make docs-spellcheck-generate-dictionary` — to generate a dictionary of words. Run it after adding new words to the tools/spelling/wordlist file.

ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/werf.inc.yaml

@@ -8,7 +8,7 @@ import:
 docker:
   ENTRYPOINT: ["/egress-gateway-agent"]
 ---
-{{ $discovererAbsPath := "/deckhouse/ee/modules/021-cni-cilium/images/egress-gateway-agent" }}
+{{ $discovererAbsPath := "/deckhouse/ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent" }}
   {{ $discovererRelPath := printf "%s/modules/021-cni-cilium/images/egress-gateway-agent" .ModulePath }}
 artifact: {{ .ModuleName }}/{{ .ImageName }}-artifact
 fromCacheVersion: 20241021-1

ee/se_plus/modules/030-cloud-provider-vsphere/candi

@@ -1 +1 @@
-/deckhouse/candi/cloud-providers/vsphere
+/deckhouse/candi/cloud-providers/vsphere/

ee/se_plus/modules/030-cloud-provider-vsphere/hooks/discover_zones_and_datastores.go

@@ -14,7 +14,7 @@ import (
 	"github.com/flant/addon-operator/pkg/module_manager/go_hook"
 	"github.com/flant/addon-operator/sdk"
 
-	v1 "github.com/deckhouse/deckhouse/ee/modules/030-cloud-provider-vsphere/hooks/internal/v1"
+	v1 "github.com/deckhouse/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/internal/v1"
 	"github.com/deckhouse/deckhouse/go_lib/dependency"
 	"github.com/deckhouse/deckhouse/go_lib/dependency/vsphere"
 )

ee/se_plus/modules/030-cloud-provider-vsphere/hooks/vsphere_cluster_configuration.go

@@ -15,7 +15,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/deckhouse/deckhouse/dhctl/pkg/config"
-	v1 "github.com/deckhouse/deckhouse/ee/modules/030-cloud-provider-vsphere/hooks/internal/v1"
+	v1 "github.com/deckhouse/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/internal/v1"
 	"github.com/deckhouse/deckhouse/go_lib/hooks/cluster_configuration"
 )
 

ee/se_plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer/werf.inc.yaml

@@ -9,7 +9,7 @@ import:
 docker:
   ENTRYPOINT: ["/discoverer"]
 ---
-{{ $discovererAbsPath := "/deckhouse/ee/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer" }}
+{{ $discovererAbsPath := "/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer" }}
 {{ $discovererRelPath := printf "%s/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer" .ModulePath }}
 artifact: {{ .ModuleName }}/{{ .ImageName }}-artifact
 from: {{ .Images.BASE_GOLANG_21_ALPINE }}

ee/se_plus/modules/030-cloud-provider-vsphere/template_tests/module_test.go

@@ -224,16 +224,16 @@ var _ = Describe("Module :: cloud-provider-vsphere :: helm template ::", func()
 	f := SetupHelmConfig(``)
 
 	BeforeSuite(func() {
-		err := os.Remove("/deckhouse/ee/modules/030-cloud-provider-vsphere/candi")
+		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/modules/030-cloud-provider-vsphere/candi")
+		err = os.Symlink("/deckhouse/ee/candi/cloud-providers/vsphere", "/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/candi")
 		Expect(err).ShouldNot(HaveOccurred())
 	})
 
 	AfterSuite(func() {
-		err := os.Remove("/deckhouse/ee/modules/030-cloud-provider-vsphere/candi")
+		err := os.Remove("/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/candi")
 		Expect(err).ShouldNot(HaveOccurred())
-		err = os.Symlink("/deckhouse/candi/cloud-providers/vsphere", "/deckhouse/ee/modules/030-cloud-provider-vsphere/candi")
+		err = os.Symlink("/deckhouse/candi/cloud-providers/vsphere", "/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/candi")
 		Expect(err).ShouldNot(HaveOccurred())
 	})
 

ee/se_plus/modules/030-cloud-provider-zvirt/candi

@@ -1 +1 @@
-/deckhouse/candi/cloud-providers/zvirt
+/deckhouse/ee/candi/cloud-providers/zvirt/

go.mod

@@ -258,7 +258,7 @@ replace github.com/deckhouse/deckhouse/go_lib/cloud-data => ./go_lib/cloud-data
 
 replace github.com/deckhouse/deckhouse/pkg/log => ./pkg/log
 
-replace github.com/deckhouse/deckhouse/egress-gateway-agent => ./ee/modules/021-cni-cilium/images/egress-gateway-agent
+replace github.com/deckhouse/deckhouse/egress-gateway-agent => ./ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent
 
 // Remove 'in body' from errors, fix for Go 1.16 (https://github.com/go-openapi/validate/pull/138).
 replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.12-flant.1

modules/021-cni-cilium/template_tests/module_test.go

@@ -127,7 +127,7 @@ func getSubdirs(dir string) ([]string, error) {
 }
 
 const (
-	ciliumEETempaltesPath = "/deckhouse/ee/modules/021-cni-cilium/templates/"
+	ciliumEETempaltesPath = "/deckhouse/ee/se_plus/modules/021-cni-cilium/templates/"
 	ciliumCETempaltesPath = "/deckhouse/modules/021-cni-cilium/templates/"
 )
 

modules/040-node-manager/images_digests.json

@@ -0,0 +1 @@
+../images_digests.json

modules/040-node-manager/template_tests/module_test.go

@@ -689,7 +689,7 @@ spec:
 
 const openstackCIMPath = "/deckhouse/ee/modules/030-cloud-provider-openstack/cloud-instance-manager"
 const openstackCIMSymlink = "/deckhouse/modules/040-node-manager/cloud-providers/openstack"
-const vsphereCIMPath = "/deckhouse/ee/modules/030-cloud-provider-vsphere/cloud-instance-manager"
+const vsphereCIMPath = "/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/cloud-instance-manager"
 const vsphereCIMSymlink = "/deckhouse/modules/040-node-manager/cloud-providers/vsphere"
 const vcdCAPIPath = "/deckhouse/ee/modules/030-cloud-provider-vcd/capi"
 const vcdCAPISymlink = "/deckhouse/modules/040-node-manager/capi/vcd"

testing/matrix/matrix_test.go

@@ -94,21 +94,21 @@ func (s *TestMatrixSuite) changeSymlinks() {
 		"/deckhouse/ee/modules/030-cloud-provider-openstack/candi",
 		"/deckhouse/ee/candi/cloud-providers/openstack/")
 	s.changeSymlink(
-		"/deckhouse/ee/modules/030-cloud-provider-vsphere/candi",
+		"/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/candi",
 		"/deckhouse/ee/candi/cloud-providers/vsphere/")
 	s.changeSymlink(
 		"/deckhouse/ee/modules/030-cloud-provider-vcd/candi",
 		"/deckhouse/ee/candi/cloud-providers/vcd/")
 	s.changeSymlink(
-		"/deckhouse/ee/modules/030-cloud-provider-zvirt/candi",
+		"/deckhouse/ee/se_plus/modules/030-cloud-provider-zvirt/candi",
 		"/deckhouse/ee/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/",
 		"/deckhouse/modules/040-node-manager/cloud-providers/openstack",
 	)
 	s.symlink(
-		"/deckhouse/ee/modules/030-cloud-provider-vsphere/cloud-instance-manager/",
+		"/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/cloud-instance-manager/",
 		"/deckhouse/modules/040-node-manager/cloud-providers/vsphere",
 	)
 	s.changeSymlink(
@@ -122,7 +122,7 @@ func (s *TestMatrixSuite) restoreSymlinks() {
 		"/deckhouse/ee/modules/030-cloud-provider-openstack/candi",
 		"/deckhouse/candi/cloud-providers/openstack/")
 	s.changeSymlink(
-		"/deckhouse/ee/modules/030-cloud-provider-vsphere/candi",
+		"/deckhouse/ee/se_plus/modules/030-cloud-provider-vsphere/candi",
 		"/deckhouse/candi/cloud-providers/vsphere/")
 	s.changeSymlink(
 		"/deckhouse/ee/modules/030-cloud-provider-vcd/candi",

testing/openapi_validation/validators/enum.go

@@ -119,7 +119,7 @@ var (
 			// ignore temporary flag that is already used (will be deleted after all CSIs are migrated)
 			"properties.storageClass.properties.compatibilityFlag",
 		},
-		"ee/modules/030-cloud-provider-vsphere/openapi/config-values.yaml": {
+		"ee/se_plus/modules/030-cloud-provider-vsphere/openapi/config-values.yaml": {
 			// ignore temporary flag that is already used (will be deleted after all CSIs are migrated)
 			"properties.storageClass.properties.compatibilityFlag",
 		},
@@ -128,7 +128,7 @@ var (
 			"properties.internal.properties.providerDiscoveryData.properties.apiVersion",
 			"properties.internal.properties.providerClusterConfiguration.properties.apiVersion",
 		},
-		"ee/modules/030-cloud-provider-vsphere/openapi/values.yaml": {
+		"ee/se_plus/modules/030-cloud-provider-vsphere/openapi/values.yaml": {
 			// ignore internal values
 			"properties.internal.properties.providerDiscoveryData.properties.apiVersion",
 			"properties.internal.properties.providerClusterConfiguration.properties.apiVersion",

tools/go.mod

@@ -198,7 +198,7 @@ require (
 replace (
 	github.com/deckhouse/deckhouse => ../
 	github.com/deckhouse/deckhouse/dhctl => ../dhctl
-	github.com/deckhouse/deckhouse/egress-gateway-agent => ../ee/modules/021-cni-cilium/images/egress-gateway-agent
+	github.com/deckhouse/deckhouse/egress-gateway-agent => ../ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent
 	github.com/deckhouse/deckhouse/go_lib/cloud-data => ../go_lib/cloud-data
 )
 

werf.yaml

@@ -280,9 +280,9 @@ git:
     - deckhouse-controller
     - global-hooks/**/*.go
     - modules/**/*.go
-    - ee/modules/021-cni-cilium/images/egress-gateway-agent/**/*.go
-    - ee/modules/021-cni-cilium/images/egress-gateway-agent/go.mod
-    - ee/modules/021-cni-cilium/images/egress-gateway-agent/go.sum
+    - ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/**/*.go
+    - ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/go.mod
+    - ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/go.sum
     - go_lib/**/*.go
     - go_lib/**/go.mod
     - go_lib/**/go.sum