Skip to content

Commit 3e6aa67

Browse files
committed
remove CSI migration test for EOL'd k8s v1.22
1 parent 0191a2e commit 3e6aa67

File tree

2 files changed

+0
-368
lines changed

2 files changed

+0
-368
lines changed

test/e2e/csi_migration_test.go

Lines changed: 0 additions & 335 deletions
This file was deleted.

test/e2e/helpers.go

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,10 @@ import (
5858
typedappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
5959
typedbatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
6060
typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
61-
"k8s.io/utils/pointer"
6261
infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
6362
"sigs.k8s.io/cluster-api-provider-azure/azure"
6463
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1"
6564
azureutil "sigs.k8s.io/cluster-api-provider-azure/util/azure"
66-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
67-
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
6865
capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
6966
"sigs.k8s.io/cluster-api/test/framework"
7067
"sigs.k8s.io/cluster-api/test/framework/clusterctl"
@@ -989,36 +986,6 @@ func InstallHelmChart(ctx context.Context, input clusterctl.ApplyClusterTemplate
989986
}
990987
}
991988

992-
func defaultConfigCluster(clusterName, namespace string) clusterctl.ConfigClusterInput {
993-
return clusterctl.ConfigClusterInput{
994-
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
995-
ClusterctlConfigPath: clusterctlConfigPath,
996-
KubeconfigPath: bootstrapClusterProxy.GetKubeconfigPath(),
997-
InfrastructureProvider: clusterctl.DefaultInfrastructureProvider,
998-
Flavor: clusterctl.DefaultFlavor,
999-
Namespace: namespace,
1000-
ClusterName: clusterName,
1001-
KubernetesVersion: e2eConfig.GetVariable(capi_e2e.KubernetesVersion),
1002-
ControlPlaneMachineCount: pointer.Int64Ptr(3),
1003-
WorkerMachineCount: pointer.Int64Ptr(0),
1004-
}
1005-
}
1006-
1007-
func createClusterWithControlPlaneWaiters(ctx context.Context, configCluster clusterctl.ConfigClusterInput,
1008-
cpWaiters clusterctl.ControlPlaneWaiters,
1009-
result *clusterctl.ApplyClusterTemplateAndWaitResult) (*clusterv1.Cluster,
1010-
*controlplanev1.KubeadmControlPlane) {
1011-
clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
1012-
ClusterProxy: bootstrapClusterProxy,
1013-
ConfigCluster: configCluster,
1014-
WaitForClusterIntervals: e2eConfig.GetIntervals("", "wait-cluster"),
1015-
WaitForControlPlaneIntervals: e2eConfig.GetIntervals("", "wait-control-plane"),
1016-
WaitForMachineDeployments: e2eConfig.GetIntervals("", "wait-worker-nodes"),
1017-
ControlPlaneWaiters: cpWaiters,
1018-
}, result)
1019-
return result.Cluster, result.ControlPlane
1020-
}
1021-
1022989
func CopyConfigMap(ctx context.Context, cl client.Client, cmName, fromNamespace, toNamespace string) {
1023990
cm := &corev1.ConfigMap{}
1024991
Expect(cl.Get(ctx, client.ObjectKey{Name: cmName, Namespace: fromNamespace}, cm)).To(Succeed())

0 commit comments

Comments
 (0)