Skip to content

Commit

Permalink
Use previous CAPIProvider configuration for chart upgrade e2e
Browse files Browse the repository at this point in the history
Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>
  • Loading branch information
Danil-Grigorev committed Oct 21, 2024
1 parent ff1a1ef commit 77cac4c
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 1 deletion.
3 changes: 3 additions & 0 deletions test/e2e/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
48 changes: 48 additions & 0 deletions test/e2e/data/capi-operator/capi-providers-legacy.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test/e2e/suites/chart-upgrade/chart_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down

0 comments on commit 77cac4c

Please sign in to comment.