From 876a60c11a510382ab089ea8c61fd4288f1da80f Mon Sep 17 00:00:00 2001 From: Nikolay Gorbatov Date: Wed, 27 Nov 2024 18:02:40 +0300 Subject: [PATCH] + Signed-off-by: Nikolay Gorbatov --- docs/documentation/werf-git-section.inc.yaml | 6 +++--- docs/site/LOCAL_DEV.md | 2 +- .../images/egress-gateway-agent/werf.inc.yaml | 2 +- ee/se_plus/modules/030-cloud-provider-vsphere/candi | 2 +- .../hooks/discover_zones_and_datastores.go | 2 +- .../hooks/vsphere_cluster_configuration.go | 2 +- .../images/cloud-data-discoverer/werf.inc.yaml | 2 +- .../template_tests/module_test.go | 8 ++++---- ee/se_plus/modules/030-cloud-provider-zvirt/candi | 2 +- go.mod | 2 +- modules/021-cni-cilium/template_tests/module_test.go | 2 +- modules/040-node-manager/images_digests.json | 1 + modules/040-node-manager/template_tests/module_test.go | 2 +- testing/matrix/matrix_test.go | 8 ++++---- testing/openapi_validation/validators/enum.go | 4 ++-- tools/go.mod | 2 +- werf.yaml | 6 +++--- 17 files changed, 28 insertions(+), 27 deletions(-) create mode 120000 modules/040-node-manager/images_digests.json diff --git a/docs/documentation/werf-git-section.inc.yaml b/docs/documentation/werf-git-section.inc.yaml index 3f5b212e6b..4a5584c4c6 100644 --- a/docs/documentation/werf-git-section.inc.yaml +++ b/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'] diff --git a/docs/site/LOCAL_DEV.md b/docs/site/LOCAL_DEV.md index 6a4b480f8b..5417f9f48d 100644 --- a/docs/site/LOCAL_DEV.md +++ b/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. diff --git a/ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/werf.inc.yaml b/ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/werf.inc.yaml index e4bc521be2..33644048fd 100644 --- a/ee/se_plus/modules/021-cni-cilium/images/egress-gateway-agent/werf.inc.yaml +++ b/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 diff --git a/ee/se_plus/modules/030-cloud-provider-vsphere/candi b/ee/se_plus/modules/030-cloud-provider-vsphere/candi index 7288c88ade..d7a1498032 120000 --- a/ee/se_plus/modules/030-cloud-provider-vsphere/candi +++ b/ee/se_plus/modules/030-cloud-provider-vsphere/candi @@ -1 +1 @@ -/deckhouse/candi/cloud-providers/vsphere \ No newline at end of file +/deckhouse/candi/cloud-providers/vsphere/ \ No newline at end of file diff --git a/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/discover_zones_and_datastores.go b/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/discover_zones_and_datastores.go index c4cf04efe1..ec5c15ffec 100644 --- a/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/discover_zones_and_datastores.go +++ b/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" ) diff --git a/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/vsphere_cluster_configuration.go b/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/vsphere_cluster_configuration.go index 4686f04b3e..b0dbeb689d 100644 --- a/ee/se_plus/modules/030-cloud-provider-vsphere/hooks/vsphere_cluster_configuration.go +++ b/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" ) diff --git a/ee/se_plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer/werf.inc.yaml b/ee/se_plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer/werf.inc.yaml index 2b6e5ab718..e2c68f9861 100644 --- a/ee/se_plus/modules/030-cloud-provider-vsphere/images/cloud-data-discoverer/werf.inc.yaml +++ b/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 }} 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 fd372446a6..3663b44c66 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 @@ -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()) }) diff --git a/ee/se_plus/modules/030-cloud-provider-zvirt/candi b/ee/se_plus/modules/030-cloud-provider-zvirt/candi index 9f026af132..5e3ea0ee94 120000 --- a/ee/se_plus/modules/030-cloud-provider-zvirt/candi +++ b/ee/se_plus/modules/030-cloud-provider-zvirt/candi @@ -1 +1 @@ -/deckhouse/candi/cloud-providers/zvirt \ No newline at end of file +/deckhouse/ee/candi/cloud-providers/zvirt/ \ No newline at end of file diff --git a/go.mod b/go.mod index f96f1267ce..be3841b4c8 100644 --- a/go.mod +++ b/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 diff --git a/modules/021-cni-cilium/template_tests/module_test.go b/modules/021-cni-cilium/template_tests/module_test.go index fc97184e43..bb3598f7d0 100644 --- a/modules/021-cni-cilium/template_tests/module_test.go +++ b/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/" ) diff --git a/modules/040-node-manager/images_digests.json b/modules/040-node-manager/images_digests.json new file mode 120000 index 0000000000..d2f5bb6fd8 --- /dev/null +++ b/modules/040-node-manager/images_digests.json @@ -0,0 +1 @@ +../images_digests.json \ No newline at end of file diff --git a/modules/040-node-manager/template_tests/module_test.go b/modules/040-node-manager/template_tests/module_test.go index 7f203f7350..aa38031941 100644 --- a/modules/040-node-manager/template_tests/module_test.go +++ b/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" diff --git a/testing/matrix/matrix_test.go b/testing/matrix/matrix_test.go index 08a05dbe63..092ad42e63 100644 --- a/testing/matrix/matrix_test.go +++ b/testing/matrix/matrix_test.go @@ -94,13 +94,13 @@ 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( @@ -108,7 +108,7 @@ func (s *TestMatrixSuite) changeSymlinks() { "/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", diff --git a/testing/openapi_validation/validators/enum.go b/testing/openapi_validation/validators/enum.go index af08c75ea4..8bd3d000ca 100644 --- a/testing/openapi_validation/validators/enum.go +++ b/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", diff --git a/tools/go.mod b/tools/go.mod index ef4a52985b..7fcf150da8 100644 --- a/tools/go.mod +++ b/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 ) diff --git a/werf.yaml b/werf.yaml index 16f49df48b..53edef1aa7 100644 --- a/werf.yaml +++ b/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