diff --git a/test/e2e/const.go b/test/e2e/const.go index b476cc13..c19f36ee 100644 --- a/test/e2e/const.go +++ b/test/e2e/const.go @@ -27,6 +27,9 @@ var ( //go:embed data/capi-operator/capi-providers.yaml CapiProviders []byte + //go:embed data/capi-operator/capi-providers-legacy.yaml + CapiProvidersLegacy []byte + //go:embed data/capi-operator/capv-provider.yaml CapvProvider []byte diff --git a/test/e2e/data/capi-operator/capi-providers-legacy.yaml b/test/e2e/data/capi-operator/capi-providers-legacy.yaml new file mode 100644 index 00000000..b6086df7 --- /dev/null +++ b/test/e2e/data/capi-operator/capi-providers-legacy.yaml @@ -0,0 +1,48 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: capd-system +--- +apiVersion: turtles-capi.cattle.io/v1alpha1 +kind: CAPIProvider +metadata: + name: docker + namespace: capd-system +spec: + name: docker + type: infrastructure + configSecret: + name: variables +--- +apiVersion: v1 +kind: Namespace +metadata: + name: capi-kubeadm-bootstrap-system +--- +apiVersion: turtles-capi.cattle.io/v1alpha1 +kind: CAPIProvider +metadata: + name: kubeadm-bootstrap + namespace: capi-kubeadm-bootstrap-system +spec: + name: kubeadm + type: bootstrap + configSecret: + name: variables +--- +apiVersion: v1 +kind: Namespace +metadata: + name: capi-kubeadm-control-plane-system +--- +apiVersion: turtles-capi.cattle.io/v1alpha1 +kind: CAPIProvider +metadata: + name: kubeadm-control-plane + namespace: capi-kubeadm-control-plane-system +spec: + name: kubeadm + type: controlPlane + configSecret: + name: variables diff --git a/test/e2e/suites/chart-upgrade/chart_upgrade_test.go b/test/e2e/suites/chart-upgrade/chart_upgrade_test.go index 645d41bd..5b205173 100644 --- a/test/e2e/suites/chart-upgrade/chart_upgrade_test.go +++ b/test/e2e/suites/chart-upgrade/chart_upgrade_test.go @@ -55,7 +55,7 @@ var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestL BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, HelmBinaryPath: e2eConfig.GetVariable(e2e.HelmBinaryPathVar), TurtlesChartPath: "https://rancher.github.io/turtles", - CAPIProvidersYAML: e2e.CapiProviders, + CAPIProvidersYAML: e2e.CapiProvidersLegacy, Namespace: framework.DefaultRancherTurtlesNamespace, Version: "v0.6.0", WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),