rancher
/
cluster-api-provider-rke2
mirror of https://github.com/rancher/cluster-api-provider-rke2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update upgrade test to verify scalability of old worker machines on new version 

Signed-off-by: Danil Grigorev <danil.grigorev@suse.com>
This commit is contained in:
Danil Grigorev 2024-05-02 13:50:00 +02:00
parent 86025754c0
commit c1d4c59f06
No known key found for this signature in database
GPG Key ID: 7C96CE1776C81090
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/e2e_upgrade_test.go
View File

@ -126,35 +126,36 @@ var _ = Describe("Workload cluster creation", func() {
// At this point provider does not have an etcd secret, as a new node was never rolled out // At this point provider does not have an etcd secret, as a new node was never rolled out
// and the cluster was created in the old version. Should still be possible to do. // and the cluster was created in the old version. Should still be possible to do.
By("Scaling down control plane to 2") By("Scaling down control plane to 2 and workers up to 2 using v1apha1")
ApplyClusterTemplateAndWait(ctx, ApplyClusterTemplateAndWaitInput{ ApplyClusterTemplateAndWait(ctx, ApplyClusterTemplateAndWaitInput{
Legacy: true,
ClusterProxy: bootstrapClusterProxy, ClusterProxy: bootstrapClusterProxy,
ConfigCluster: clusterctl.ConfigClusterInput{ ConfigCluster: clusterctl.ConfigClusterInput{
LogFolder: clusterctlLogFolder, LogFolder: clusterctlLogFolder,
ClusterctlConfigPath: clusterctlConfigPath, ClusterctlConfigPath: clusterctlConfigPath,
KubeconfigPath: bootstrapClusterProxy.GetKubeconfigPath(), KubeconfigPath: bootstrapClusterProxy.GetKubeconfigPath(),
InfrastructureProvider: "docker", InfrastructureProvider: "docker",
Flavor: "docker", Flavor: "docker-legacy",
Namespace: namespace.Name, Namespace: namespace.Name,
ClusterName: clusterName, ClusterName: clusterName,
KubernetesVersion: e2eConfig.GetVariable(KubernetesVersion), KubernetesVersion: e2eConfig.GetVariable(KubernetesVersion),
ControlPlaneMachineCount: ptr.To(int64(2)), ControlPlaneMachineCount: ptr.To(int64(2)),
WorkerMachineCount: ptr.To(int64(1)), WorkerMachineCount: ptr.To(int64(2)),
}, },
WaitForClusterIntervals: e2eConfig.GetIntervals(specName, "wait-cluster"), WaitForClusterIntervals: e2eConfig.GetIntervals(specName, "wait-cluster"),
WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"), WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"), WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
}, result) }, result)
WaitForControlPlaneToBeReady(ctx, WaitForControlPlaneToBeReadyInput{ WaitForLegacyControlPlaneToBeReady(ctx, WaitForControlPlaneToBeReadyInput{
Getter: bootstrapClusterProxy.GetClient(), Getter: bootstrapClusterProxy.GetClient(),
ControlPlane: client.ObjectKeyFromObject(result.ControlPlane), ControlPlane: client.ObjectKeyFromObject(result.LegacyControlPlane),
}, e2eConfig.GetIntervals(specName, "wait-control-plane")...) }, e2eConfig.GetIntervals(specName, "wait-control-plane")...)
// Possible only with valid etcd certificate in the secret // Possible only with valid etcd certificate in the secret
// Created machine is a scale up, so the secret will be populated for the // Created machine is a scale up, so the secret will be populated for the
// remaning 2 machines to scale down to 1 later // remaning 2 machines to scale down to 1 later
By("Upgrading control plane and worker machines and scale down to 1") By("Upgrading control plane and worker machines using v1beta1")
ApplyClusterTemplateAndWait(ctx, ApplyClusterTemplateAndWaitInput{ ApplyClusterTemplateAndWait(ctx, ApplyClusterTemplateAndWaitInput{
ClusterProxy: bootstrapClusterProxy, ClusterProxy: bootstrapClusterProxy,
ConfigCluster: clusterctl.ConfigClusterInput{ ConfigCluster: clusterctl.ConfigClusterInput{
@ -186,7 +187,7 @@ var _ = Describe("Workload cluster creation", func() {
ControlPlane: client.ObjectKeyFromObject(result.ControlPlane), ControlPlane: client.ObjectKeyFromObject(result.ControlPlane),
}, e2eConfig.GetIntervals(specName, "wait-control-plane")...) }, e2eConfig.GetIntervals(specName, "wait-control-plane")...)
By("Scale down to 1") By("Scale down CP and workers to 1")
ApplyClusterTemplateAndWait(ctx, ApplyClusterTemplateAndWaitInput{ ApplyClusterTemplateAndWait(ctx, ApplyClusterTemplateAndWaitInput{
ClusterProxy: bootstrapClusterProxy, ClusterProxy: bootstrapClusterProxy,
ConfigCluster: clusterctl.ConfigClusterInput{ ConfigCluster: clusterctl.ConfigClusterInput{