+

Signed-off-by: Nikolay Gorbatov <[email protected]>
deckhouse · Nov 28, 2024 · 068981d · 068981d
1 parent 26440b1
commit 068981d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflow_templates/build-and-test_dev.yml b/.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:

diff --git a/.github/workflows/build-and-test_dev.yml b/.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:

diff --git a/docs/documentation/_data/deckhouse-alerts.yml b/docs/documentation/_data/deckhouse-alerts.yml
@@ -165,7 +165,7 @@ alerts:
       sourceFile: ee/se-plus/modules/021-cni-cilium/monitoring/prometheus-rules/egressgatewaypolicies.yaml
       moduleUrl: 021-cni-cilium
       module: cni-cilium
-      edition: se
+      edition: se+
       description: |
         There is orphan EgressGatewayPolicy in the cluster: with the name: `{{$labels.name}}` which has irrelevant EgressGateway name.
 

diff --git a/editions.yaml b/editions.yaml
@@ -53,6 +53,7 @@ editions:
   modulesDir: "ee/se-plus/modules"
   terraformProviders:
     - vsphere
+    - ovirt
   excludeModules:
   - dashboard
 
@@ -61,7 +62,6 @@ editions:
   terraformProviders:
     - openstack
     - vcd
-    - ovirt
     - decort
 
 - name: FE

diff --git a/ee/se-plus/modules/030-cloud-provider-vsphere/hooks/vsphere_cluster_configuration_test.go b/ee/se-plus/modules/030-cloud-provider-vsphere/hooks/vsphere_cluster_configuration_test.go
@@ -286,7 +286,7 @@ data: {}
 
 	// todo(31337Ghost) eliminate the following dirty hack after `ee` subdirectory will be merged to the root
 	// Used to make dhctl config function able to validate `VsphereClusterConfiguration`.
-	_ = os.Setenv("DHCTL_CLI_ADDITIONAL_SCHEMAS_PATHS", "/deckhouse/ee/candi")
+	_ = os.Setenv("DHCTL_CLI_ADDITIONAL_SCHEMAS_PATHS", "/deckhouse/ee/se-plus/candi")
 
 	a := HookExecutionConfigInit(emptyValues, `{}`)
 	Context("Cluster without module configuration, with secret (without nsx-t)", func() {

diff --git a/tools/helm_generate/runners/alert_templates/alert_templates.go b/tools/helm_generate/runners/alert_templates/alert_templates.go
@@ -307,7 +307,7 @@ func modules(deckhouseRoot string) (modules []module) {
 			md := module{
 				Name:    file.Name(),
 				Path:    filepath.Join("ee/se-plus/modules", file.Name()),
-				Edition: se,
+				Edition: sePlus,
 			}
 			modules = append(modules, md)
 		}