Update main.go

.github/dependabot.yml

@@ -133,7 +133,7 @@ updates:
   open-pull-requests-limit: 0
 
 - package-ecosystem: "gomod"
-  directory: "/ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent"
+  directory: "/ee/se-plus/modules/021-cni-cilium/images/egress-gateway-agent"
   labels:
   - "type/dependencies"
   - "status/ok-to-test"
@@ -142,7 +142,7 @@ updates:
   open-pull-requests-limit: 0
 
 - package-ecosystem: "gomod"
-  directory: "/ee/se_plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer"
+  directory: "/ee/se-plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer"
   labels:
   - "type/dependencies"
   - "status/ok-to-test"
@@ -151,7 +151,7 @@ updates:
   open-pull-requests-limit: 0
 
 - package-ecosystem: "gomod"
-  directory: "/ee/se_plus/modules/030-cloud-provider-zvirt/images/capz-controller-manager/src"
+  directory: "/ee/se-plus/modules/030-cloud-provider-zvirt/images/capz-controller-manager/src"
   labels:
   - "type/dependencies"
   - "status/ok-to-test"
@@ -160,7 +160,7 @@ updates:
   open-pull-requests-limit: 0
 
 - package-ecosystem: "gomod"
-  directory: "/ee/se_plus/modules/030-cloud-provider-zvirt/images/cloud-controller-manager/src"
+  directory: "/ee/se-plus/modules/030-cloud-provider-zvirt/images/cloud-controller-manager/src"
   labels:
   - "type/dependencies"
   - "status/ok-to-test"
@@ -169,7 +169,7 @@ updates:
   open-pull-requests-limit: 0
 
 - package-ecosystem: "gomod"
-  directory: "/ee/se_plus/modules/030-cloud-provider-zvirt/images/cloud-data-discoverer"
+  directory: "/ee/se-plus/modules/030-cloud-provider-zvirt/images/cloud-data-discoverer"
   labels:
   - "type/dependencies"
   - "status/ok-to-test"

.github/workflow_templates/build-and-test_dev.yml

@@ -86,7 +86,7 @@ jobs:
       - run: |
           echo Enable ${{ needs.pull_request_info.outputs.edition }}
 
-  enable_se_plus:
+  enable_se-plus:
     if: ${{ needs.pull_request_info.outputs.edition == 'SE+' }}
     name: Enable SE+
     needs:

.github/workflows/build-and-test_dev.yml

@@ -415,7 +415,7 @@ jobs:
       - run: |
           echo Enable ${{ needs.pull_request_info.outputs.edition }}
 
-  enable_se_plus:
+  enable_se-plus:
     if: ${{ needs.pull_request_info.outputs.edition == 'SE+' }}
     name: Enable SE+
     needs:

Makefile

@@ -47,7 +47,7 @@ endif
 
 # Set testing path for tests-modules
 ifeq ($(FOCUS),)
-	TESTS_PATH = ./modules/... ./global-hooks/... ./ee/modules/... ./ee/fe/modules/... ./ee/be/modules/... ./ee/se/modules/... ./ee/se_plus/modules/...
+	TESTS_PATH = ./modules/... ./global-hooks/... ./ee/modules/... ./ee/fe/modules/... ./ee/be/modules/... ./ee/se/modules/... ./ee/se-plus/modules/...
 else
 	CE_MODULES = $(shell find ./modules -maxdepth 1 -regex ".*[0-9]-${FOCUS}")
 	ifneq ($(CE_MODULES),)
@@ -69,7 +69,7 @@ else
 	ifneq ($(FE_MODULES),)
 		SE_MODULES_RECURSE = ${SE_MODULES}/...
 	endif
-	SE_PLUS_MODULES = $(shell find ./ee/se_plus/modules -maxdepth 1 -regex ".*[0-9]-${FOCUS}")
+	SE_PLUS_MODULES = $(shell find ./ee/se-plus/modules -maxdepth 1 -regex ".*[0-9]-${FOCUS}")
 	ifneq ($(FE_MODULES),)
 		SE_PLUS_MODULES_RECURSE = ${SE_PLUS_MODULES}/...
 	endif

docs/documentation/_data/deckhouse-alerts.yml

@@ -162,7 +162,7 @@ alerts:
       severity: "4"
       markupFormat: markdown
     - name: CniCiliumOrphanEgressGatewayPolicyFound
-      sourceFile: ee/se_plus/modules/021-cni-cilium/monitoring/prometheus-rules/egressgatewaypolicies.yaml
+      sourceFile: ee/se-plus/modules/021-cni-cilium/monitoring/prometheus-rules/egressgatewaypolicies.yaml
       moduleUrl: 021-cni-cilium
       module: cni-cilium
       edition: se

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

@@ -111,7 +111,7 @@
   stageDependencies:
     setup: ['**/*']
 - add: /ee/candi/cloud-providers/vsphere/openapi
-  to: /src/ee/se_plus/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/se_plus/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/se_plus/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/se_plus/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.

editions.yaml

@@ -50,7 +50,7 @@ editions:
   - dashboard
 
 - name: SE+
-  modulesDir: "ee/se_plus/modules"
+  modulesDir: "ee/se-plus/modules"
   terraformProviders:
     - vsphere
   excludeModules:

ee/candi/cloud-providers/.build.yaml

@@ -1,5 +1,3 @@
 openstack
-vsphere
 vcd
-zvirt
 dynamix

ee/se-plus/candi/clodu-providers/.build.yaml

@@ -0,0 +1,2 @@
+vsphere
+zvirt

ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/werf.inc.yaml → 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/se_plus/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/hooks/discover_zones_and_datastores.go → 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/se_plus/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 → 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/se_plus/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 → 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/se_plus/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 → 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/se_plus/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/se_plus/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/se_plus/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/se_plus/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())
 	})