From bd600b539d85900ad0072b76ecd18e9bfd4eb6bf Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Thu, 20 Jun 2024 09:45:07 +0200 Subject: [PATCH] fixes --- Makefile | 4 ++-- test/e2e/config/vsphere.yaml | 4 ++-- .../kustomization.yaml | 0 .../patch-clusterclass.yaml | 0 .../kustomization.yaml | 0 .../patch-clusterclass.yaml | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/data/infrastructure-vsphere-govmomi/main/{upgrades-runtimesdk => topology-runtimesdk}/kustomization.yaml (100%) rename test/e2e/data/infrastructure-vsphere-govmomi/main/{upgrades-runtimesdk => topology-runtimesdk}/patch-clusterclass.yaml (100%) rename test/e2e/data/infrastructure-vsphere-supervisor/main/{upgrades-runtimesdk => topology-runtimesdk}/kustomization.yaml (100%) rename test/e2e/data/infrastructure-vsphere-supervisor/main/{upgrades-runtimesdk => topology-runtimesdk}/patch-clusterclass.yaml (100%) diff --git a/Makefile b/Makefile index 1b615d933b..3d857d1d5f 100644 --- a/Makefile +++ b/Makefile @@ -391,7 +391,7 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/clusterclass-runtimesdk" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/clusterclass-runtimesdk-quick-start.yaml" cp "$(RELEASE_DIR)/main/cluster-template-topology.yaml" "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/topology/cluster-template-topology.yaml" "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/topology" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/cluster-template-topology.yaml" - "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/upgrades-runtimesdk" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/cluster-template-upgrades-runtimesdk.yaml" + "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/topology-runtimesdk" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/cluster-template-topology-runtimesdk.yaml" "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/install-on-bootstrap" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/cluster-template-install-on-bootstrap.yaml" # for PCI passthrough template "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/pci" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/main/cluster-template-pci.yaml" @@ -408,7 +408,7 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/clusterclass-runtimesdk" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/clusterclass-runtimesdk-quick-start-supervisor.yaml" cp "$(RELEASE_DIR)/main/cluster-template-topology-supervisor.yaml" "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/topology/cluster-template-topology-supervisor.yaml" "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/topology" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-topology-supervisor.yaml" - "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/upgrades-runtimesdk" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-upgrades-runtimesdk-supervisor.yaml" + "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/topology-runtimesdk" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-topology-runtimesdk-supervisor.yaml" "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/conformance" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-conformance-supervisor.yaml" "$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/install-on-bootstrap" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-install-on-bootstrap-supervisor.yaml" diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml index 46f31afac3..cd661a087e 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -161,7 +161,7 @@ providers: - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/cluster-template-pci.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/cluster-template-storage-policy.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/cluster-template-topology.yaml" - - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/cluster-template-upgrades-runtimesdk.yaml" + - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/cluster-template-topology-runtimesdk.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/cluster-template.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass-quick-start.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass-runtimesdk-quick-start.yaml" @@ -171,7 +171,7 @@ providers: - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass-runtimesdk-quick-start-supervisor.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/cluster-template-install-on-bootstrap-supervisor.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/cluster-template-conformance-supervisor.yaml" - - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/cluster-template-upgrades-runtimesdk-supervisor.yaml" + - sourcePath: "../../../test/e2e/data/infrastructure-vsphere-supervisor/main/cluster-template-topology-runtimesdk-supervisor.yaml" - sourcePath: "../data/shared/capv/main/metadata.yaml" - name: "{go://sigs.k8s.io/cluster-api-provider-vsphere@v1.10}" # supported release in the v1beta1 series # Use manifest from source files diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/upgrades-runtimesdk/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/topology-runtimesdk/kustomization.yaml similarity index 100% rename from test/e2e/data/infrastructure-vsphere-govmomi/main/upgrades-runtimesdk/kustomization.yaml rename to test/e2e/data/infrastructure-vsphere-govmomi/main/topology-runtimesdk/kustomization.yaml diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/upgrades-runtimesdk/patch-clusterclass.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/topology-runtimesdk/patch-clusterclass.yaml similarity index 100% rename from test/e2e/data/infrastructure-vsphere-govmomi/main/upgrades-runtimesdk/patch-clusterclass.yaml rename to test/e2e/data/infrastructure-vsphere-govmomi/main/topology-runtimesdk/patch-clusterclass.yaml diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/upgrades-runtimesdk/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/topology-runtimesdk/kustomization.yaml similarity index 100% rename from test/e2e/data/infrastructure-vsphere-supervisor/main/upgrades-runtimesdk/kustomization.yaml rename to test/e2e/data/infrastructure-vsphere-supervisor/main/topology-runtimesdk/kustomization.yaml diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/upgrades-runtimesdk/patch-clusterclass.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/topology-runtimesdk/patch-clusterclass.yaml similarity index 100% rename from test/e2e/data/infrastructure-vsphere-supervisor/main/upgrades-runtimesdk/patch-clusterclass.yaml rename to test/e2e/data/infrastructure-vsphere-supervisor/main/topology-runtimesdk/patch-clusterclass.yaml