Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprait patch 2 #372

Merged
merged 4 commits into from
Nov 28, 2024
Merged

Sprait patch 2 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87ed567
+
sprait Nov 28, 2024
7e6dff1
+
sprait Nov 28, 2024
13db0af
+
sprait Nov 28, 2024
26440b1
+
sprait Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion candi/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ For validation and values defaulting, each configuration object has its OpenAPI
| OpenStackClusterConfiguration | OpenStack specific configuration | [candi/cloud-providers/openstack/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/ee/candi/cloud-providers/openstack/openapi/cluster_configuration.yaml) |
| AWSClusterConfiguration | AWS specific configuration | [candi/cloud-providers/aws/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/cloud-providers/aws/openapi/cluster_configuration.yaml) |
| GCPClusterConfiguration | GCP specific configuration | [candi/cloud-providers/gcp/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/cloud-providers/gcp/openapi/cluster_configuration.yaml) |
| vSphereClusterConfiguration | vSphere specific configuration | [candi/cloud-providers/vsphere/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/ee/candi/cloud-providers/vsphere/openapi/cluster_configuration.yaml) |
| vSphereClusterConfiguration | vSphere specific configuration | [candi/cloud-providers/vsphere/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/ee/se-plus/candi/cloud-providers/vsphere/openapi/cluster_configuration.yaml) |
| YandexClusterConfiguration | Yandex Cloud specific configuration | [candi/cloud-providers/yandex/openapi/openapi/cluster_configuration.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/cloud-providers/yandex/openapi/cluster_configuration.yaml) |
| BashibleTemplateData | Bashible Bundle compiling settings (only for dhctl render bashible-bunble) | [candi/bashible/openapi.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/bashible/openapi.yaml) |
| KubeadmConfigTemplateData | Kubeadm config compiling settings (only for dhctl render kubeadm-config) | [candi/control-plane-kubeadm/openapi.yaml](https://github.com/deckhouse/deckhouse/blob/main/candi/control-plane-kubeadm/openapi.yaml)|
Expand Down
2 changes: 1 addition & 1 deletion dhctl/hack/devenv/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if [[ "x$id" == "x" ]]; then
-v /deckhouse/dhctl:/dhctl \
-v /deckhouse/candi:/deckhouse/candi \
-v /deckhouse/ee/candi/cloud-providers/openstack:/deckhouse/candi/cloud-providers/openstack \
-v /deckhouse/ee/candi/cloud-providers/vsphere:/deckhouse/candi/cloud-providers/vsphere \
-v /deckhouse/ee/se-plus/candi/cloud-providers/vsphere:/deckhouse/candi/cloud-providers/vsphere \
${INSTALLER_IMAGE_URL} \
tail -f /dev/null)
echo "Run new container with ID: ${id}"
Expand Down
12 changes: 6 additions & 6 deletions docs/documentation/werf-git-section.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
includePaths: ['*cluster_configuration.yaml']
stageDependencies:
setup: ['**/*']
- add: /ee/candi/cloud-providers/vsphere/openapi
- add: /ee/se-plus/candi/cloud-providers/vsphere/openapi
to: /src/ee/se-plus/modules/030-cloud-provider-vsphere/crds
owner: jekyll
group: jekyll
Expand All @@ -124,7 +124,7 @@
includePaths: ['*instance_class.yaml']
stageDependencies:
setup: ['**/*']
- add: /ee/candi/cloud-providers/vsphere/openapi
- add: /ee/se-plus/candi/cloud-providers/vsphere/openapi
to: /src/ee/se-plus/modules/030-cloud-provider-vsphere/openapi
owner: jekyll
group: jekyll
Expand Down Expand Up @@ -152,14 +152,14 @@
includePaths: ['*cluster_configuration.yaml']
stageDependencies:
setup: ['**/*']
- add: /ee/candi/cloud-providers/zvirt/openapi
- add: /ee/se-plus/candi/cloud-providers/zvirt/openapi
to: /src/ee/modules/030-cloud-provider-zvirt/crds
owner: jekyll
group: jekyll
includePaths: ['*instance_class.yaml']
stageDependencies:
setup: ['**/*']
- add: /ee/candi/cloud-providers/zvirt/openapi
- add: /ee/se-plus/candi/cloud-providers/zvirt/openapi
to: /src/ee/modules/030-cloud-provider-zvirt/openapi
owner: jekyll
group: jekyll
Expand Down Expand Up @@ -234,7 +234,7 @@
includePaths: ['LAYOUTS*.md','ENVIRONMENT*.md','CLUSTER_CONFIGURATION*.md']
stageDependencies:
setup: ['**/*']
- add: /ee/candi/cloud-providers/vsphere/docs
- add: /ee/se-plus/candi/cloud-providers/vsphere/docs
to: /src/ee/se-plus/modules/030-cloud-provider-vsphere/docs
owner: jekyll
group: jekyll
Expand All @@ -255,7 +255,7 @@
includePaths: ['LAYOUTS*.md','ENVIRONMENT*.md','CLUSTER_CONFIGURATION*.md']
stageDependencies:
setup: ['**/*']
- add: /ee/candi/cloud-providers/zvirt/docs
- add: /ee/se-plus/candi/cloud-providers/zvirt/docs
to: /src/ee/modules/030-cloud-provider-zvirt/docs
owner: jekyll
group: jekyll
Expand Down
0 ee/se-plus/candi/clodu-providers/.build.yaml → ee/se-plus/candi/cloud-providers/.build.yaml
View file
Open in desktop
File renamed without changes.
0 ...sphere/bashible/bootstrap-networks.sh.tpl → ...sphere/bashible/bootstrap-networks.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...inux/all/030_upgrade_open_vm_tools.sh.tpl → ...inux/all/030_upgrade_open_vm_tools.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...stra/all/030_upgrade_open_vm_tools.sh.tpl → ...stra/all/030_upgrade_open_vm_tools.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...ntos/all/030_upgrade_open_vm_tools.sh.tpl → ...ntos/all/030_upgrade_open_vm_tools.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...bian/all/030_upgrade_open_vm_tools.sh.tpl → ...bian/all/030_upgrade_open_vm_tools.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...edos/all/030_upgrade_open_vm_tools.sh.tpl → ...edos/all/030_upgrade_open_vm_tools.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...-lts/all/030_upgrade_open_vm_tools.sh.tpl → ...-lts/all/030_upgrade_open_vm_tools.sh.tpl
View file
Open in desktop
File renamed without changes.
0 ...ers/vsphere/docs/CLUSTER_CONFIGURATION.md → ...ers/vsphere/docs/CLUSTER_CONFIGURATION.md
View file
Open in desktop
File renamed without changes.
0 .../vsphere/docs/CLUSTER_CONFIGURATION_RU.md → .../vsphere/docs/CLUSTER_CONFIGURATION_RU.md
View file
Open in desktop
File renamed without changes.
0 ...odu-providers/vsphere/docs/ENVIRONMENT.md → ...oud-providers/vsphere/docs/ENVIRONMENT.md
View file
Open in desktop
File renamed without changes.
0 ...-providers/vsphere/docs/ENVIRONMENT_RU.md → ...-providers/vsphere/docs/ENVIRONMENT_RU.md
View file
Open in desktop
File renamed without changes.
0 ...i/clodu-providers/vsphere/docs/LAYOUTS.md → ...i/cloud-providers/vsphere/docs/LAYOUTS.md
View file
Open in desktop
File renamed without changes.
0 ...lodu-providers/vsphere/docs/LAYOUTS_RU.md → ...loud-providers/vsphere/docs/LAYOUTS_RU.md
View file
Open in desktop
File renamed without changes.
0 ...ere/docs/internal/narrow_roles_example.md → ...ere/docs/internal/narrow_roles_example.md
View file
Open in desktop
File renamed without changes.
0 ...outs/standard/base-infrastructure/main.tf → ...outs/standard/base-infrastructure/main.tf
View file
Open in desktop
File renamed without changes.
0 ...s/standard/base-infrastructure/outputs.tf → ...s/standard/base-infrastructure/outputs.tf
View file
Open in desktop
File renamed without changes.
0 ...standard/base-infrastructure/providers.tf → ...standard/base-infrastructure/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...standard/base-infrastructure/variables.tf → ...standard/base-infrastructure/variables.tf
View file
Open in desktop
File renamed without changes.
0 .../standard/base-infrastructure/versions.tf → .../standard/base-infrastructure/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...ders/vsphere/layouts/standard/master-node → ...ders/vsphere/layouts/standard/master-node
View file
Open in desktop
File renamed without changes.
0 ...ders/vsphere/layouts/standard/static-node → ...ders/vsphere/layouts/standard/static-node
View file
Open in desktop
File renamed without changes.
0 ...ers/vsphere/layouts/standard/variables.tf → ...ers/vsphere/layouts/standard/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...vsphere/openapi/cloud_discovery_data.yaml → ...vsphere/openapi/cloud_discovery_data.yaml
View file
Open in desktop
File renamed without changes.
0 ...sphere/openapi/cluster_configuration.yaml → ...sphere/openapi/cluster_configuration.yaml
View file
Open in desktop
File renamed without changes.
0 ...openapi/doc-ru-cluster_configuration.yaml → ...openapi/doc-ru-cluster_configuration.yaml
View file
Open in desktop
File renamed without changes.
0 ...sphere/openapi/doc-ru-instance_class.yaml → ...sphere/openapi/doc-ru-instance_class.yaml
View file
Open in desktop
File renamed without changes.
0 ...iders/vsphere/openapi/instance_class.yaml → ...iders/vsphere/openapi/instance_class.yaml
View file
Open in desktop
File renamed without changes.
0 ...ere/terraform-modules/master-node/main.tf → ...ere/terraform-modules/master-node/main.tf
View file
Open in desktop
File renamed without changes.
0 .../terraform-modules/master-node/outputs.tf → .../terraform-modules/master-node/outputs.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/master-node/providers.tf → ...erraform-modules/master-node/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/master-node/variables.tf → ...erraform-modules/master-node/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...terraform-modules/master-node/versions.tf → ...terraform-modules/master-node/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...rs/vsphere/terraform-modules/providers.tf → ...rs/vsphere/terraform-modules/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...ere/terraform-modules/static-node/main.tf → ...ere/terraform-modules/static-node/main.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/static-node/providers.tf → ...erraform-modules/static-node/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/static-node/variables.tf → ...erraform-modules/static-node/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...terraform-modules/static-node/versions.tf → ...terraform-modules/static-node/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...rs/vsphere/terraform-modules/variables.tf → ...rs/vsphere/terraform-modules/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...ers/vsphere/terraform-modules/versions.tf → ...ers/vsphere/terraform-modules/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...iders/zvirt/docs/CLUSTER_CONFIGURATION.md → ...iders/zvirt/docs/CLUSTER_CONFIGURATION.md
View file
Open in desktop
File renamed without changes.
0 ...rs/zvirt/docs/CLUSTER_CONFIGURATION_RU.md → ...rs/zvirt/docs/CLUSTER_CONFIGURATION_RU.md
View file
Open in desktop
File renamed without changes.
0 ...clodu-providers/zvirt/docs/ENVIRONMENT.md → ...cloud-providers/zvirt/docs/ENVIRONMENT.md
View file
Open in desktop
File renamed without changes.
0 ...du-providers/zvirt/docs/ENVIRONMENT_RU.md → ...ud-providers/zvirt/docs/ENVIRONMENT_RU.md
View file
Open in desktop
File renamed without changes.
0 ...ndi/clodu-providers/zvirt/docs/LAYOUTS.md → ...ndi/cloud-providers/zvirt/docs/LAYOUTS.md
View file
Open in desktop
File renamed without changes.
0 .../clodu-providers/zvirt/docs/LAYOUTS_RU.md → .../cloud-providers/zvirt/docs/LAYOUTS_RU.md
View file
Open in desktop
File renamed without changes.
0 ...outs/standard/base-infrastructure/main.tf → ...outs/standard/base-infrastructure/main.tf
View file
Open in desktop
File renamed without changes.
0 ...s/standard/base-infrastructure/outputs.tf → ...s/standard/base-infrastructure/outputs.tf
View file
Open in desktop
File renamed without changes.
0 ...standard/base-infrastructure/providers.tf → ...standard/base-infrastructure/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...standard/base-infrastructure/variables.tf → ...standard/base-infrastructure/variables.tf
View file
Open in desktop
File renamed without changes.
0 .../standard/base-infrastructure/versions.tf → .../standard/base-infrastructure/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...viders/zvirt/layouts/standard/master-node → ...viders/zvirt/layouts/standard/master-node
View file
Open in desktop
File renamed without changes.
0 ...s/zvirt/layouts/standard/master-node~HEAD → ...s/zvirt/layouts/standard/master-node~HEAD
View file
Open in desktop
File renamed without changes.
0 ...viders/zvirt/layouts/standard/static-node → ...viders/zvirt/layouts/standard/static-node
View file
Open in desktop
File renamed without changes.
0 ...iders/zvirt/layouts/standard/variables.tf → ...iders/zvirt/layouts/standard/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...s/zvirt/openapi/cloud_discovery_data.yaml → ...s/zvirt/openapi/cloud_discovery_data.yaml
View file
Open in desktop
File renamed without changes.
0 .../zvirt/openapi/cluster_configuration.yaml → .../zvirt/openapi/cluster_configuration.yaml
View file
Open in desktop
File renamed without changes.
0 ...openapi/doc-ru-cluster_configuration.yaml → ...openapi/doc-ru-cluster_configuration.yaml
View file
Open in desktop
File renamed without changes.
0 .../zvirt/openapi/doc-ru-instance_class.yaml → .../zvirt/openapi/doc-ru-instance_class.yaml
View file
Open in desktop
File renamed without changes.
0 ...oviders/zvirt/openapi/instance_class.yaml → ...oviders/zvirt/openapi/instance_class.yaml
View file
Open in desktop
File renamed without changes.
0 ...irt/terraform-modules/master-node/main.tf → ...irt/terraform-modules/master-node/main.tf
View file
Open in desktop
File renamed without changes.
0 .../terraform-modules/master-node/outputs.tf → .../terraform-modules/master-node/outputs.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/master-node/providers.tf → ...erraform-modules/master-node/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/master-node/variables.tf → ...erraform-modules/master-node/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...terraform-modules/master-node/versions.tf → ...terraform-modules/master-node/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...ders/zvirt/terraform-modules/providers.tf → ...ders/zvirt/terraform-modules/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...irt/terraform-modules/static-node/main.tf → ...irt/terraform-modules/static-node/main.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/static-node/providers.tf → ...erraform-modules/static-node/providers.tf
View file
Open in desktop
File renamed without changes.
0 ...erraform-modules/static-node/variables.tf → ...erraform-modules/static-node/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...terraform-modules/static-node/versions.tf → ...terraform-modules/static-node/versions.tf
View file
Open in desktop
File renamed without changes.
0 ...ders/zvirt/terraform-modules/variables.tf → ...ders/zvirt/terraform-modules/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...iders/zvirt/terraform-modules/versions.tf → ...iders/zvirt/terraform-modules/versions.tf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ee/se-plus/modules/030-cloud-provider-vsphere/template_tests/module_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ var _ = Describe("Module :: cloud-provider-vsphere :: helm template ::", func()
BeforeSuite(func() {
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/se-plus/candi/cloud-providers/vsphere", "/deckhouse/ee/se-plus/modules/030-cloud-provider-vsphere/candi")
Expect(err).ShouldNot(HaveOccurred())
})

Expand Down
2 changes: 1 addition & 1 deletion ee/se-plus/modules/030-cloud-provider-zvirt/candi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/deckhouse/ee/candi/cloud-providers/zvirt/
/deckhouse/ee/se-plus/candi/cloud-providers/zvirt/
2 changes: 1 addition & 1 deletion ee/se-plus/modules/030-cloud-provider-zvirt/hooks/discover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func handleCloudProviderDiscoveryDataSecret(input *go_hook.HookInput) error {

discoveryDataJSON := secret.Data["discovery-data.json"]

_, err := config.ValidateDiscoveryData(&discoveryDataJSON, []string{"/deckhouse/ee/candi/cloud-providers/zvirt/openapi"})
_, err := config.ValidateDiscoveryData(&discoveryDataJSON, []string{"/deckhouse/ee/se-plus/candi/cloud-providers/zvirt/openapi"})
if err != nil {
return fmt.Errorf("failed to validate 'discovery-data.json' from 'd8-cloud-provider-discovery-data' secret: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions testing/matrix/matrix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
8 changes: 4 additions & 4 deletions tools/build_includes/candi-EE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tools/build_includes/candi-FE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tools/build_includes/candi-SE+.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading