From cabafc38007bcb2991dd0038fd048c2366a0d2cd Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Thu, 23 Jan 2025 18:06:33 +0100 Subject: [PATCH] test/framework: Rename GetVariable functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- test/e2e/autoscaler.go | 4 ++-- test/e2e/cluster_deletion.go | 2 +- test/e2e/cluster_upgrade.go | 22 +++++++++---------- test/e2e/cluster_upgrade_runtimesdk.go | 10 ++++----- test/e2e/cluster_upgrade_runtimesdk_test.go | 2 +- test/e2e/clusterclass_changes.go | 4 ++-- test/e2e/clusterclass_rollout.go | 4 ++-- test/e2e/clusterctl_upgrade.go | 4 ++-- test/e2e/clusterctl_upgrade_test.go | 2 +- test/e2e/e2e_suite_test.go | 6 +++--- test/e2e/k8s_conformance.go | 4 ++-- test/e2e/k8s_conformance_test.go | 2 +- test/e2e/kcp_adoption.go | 2 +- test/e2e/kcp_remediations.go | 2 +- test/e2e/machine_pool.go | 4 ++-- test/e2e/md_remediations.go | 2 +- test/e2e/md_rollout.go | 4 ++-- test/e2e/md_scale.go | 4 ++-- test/e2e/node_drain.go | 2 +- test/e2e/quick_start.go | 2 +- test/e2e/scale.go | 24 ++++++++++----------- test/e2e/self_hosted.go | 22 +++++++++---------- test/framework/clusterctl/e2e_config.go | 20 ++++++++--------- test/framework/clusterctl/repository.go | 4 ++-- 24 files changed, 79 insertions(+), 79 deletions(-) diff --git a/test/e2e/autoscaler.go b/test/e2e/autoscaler.go index 5092dba69ce5..6803b6382663 100644 --- a/test/e2e/autoscaler.go +++ b/test/e2e/autoscaler.go @@ -136,7 +136,7 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput) Flavor: flavor, Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: nil, }, @@ -180,7 +180,7 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput) } By("Installing the autoscaler on the workload cluster") - autoscalerWorkloadYAMLPath := input.E2EConfig.GetVariable(AutoscalerWorkloadYAMLPath) + autoscalerWorkloadYAMLPath := input.E2EConfig.MustGetVariable(AutoscalerWorkloadYAMLPath) framework.ApplyAutoscalerToWorkloadCluster(ctx, framework.ApplyAutoscalerToWorkloadClusterInput{ ArtifactFolder: input.ArtifactFolder, InfrastructureMachineTemplateKind: input.InfrastructureMachineTemplateKind, diff --git a/test/e2e/cluster_deletion.go b/test/e2e/cluster_deletion.go index 2cec799ad25b..fef448d69b6c 100644 --- a/test/e2e/cluster_deletion.go +++ b/test/e2e/cluster_deletion.go @@ -183,7 +183,7 @@ func ClusterDeletionSpec(ctx context.Context, inputGetter func() ClusterDeletion Flavor: flavor, Namespace: namespace.Name, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: controlPlaneMachineCount, WorkerMachineCount: workerMachineCount, }, diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index bd680f4897c6..30015effce5e 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -113,7 +113,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersionUpgradeTo)) Expect(input.E2EConfig.Variables).To(HaveKey(kubetestConfigurationVariable), "% spec requires a %s variable to be defined in the config file", specName, kubetestConfigurationVariable) - kubetestConfigFilePath = input.E2EConfig.GetVariable(kubetestConfigurationVariable) + kubetestConfigFilePath = input.E2EConfig.MustGetVariable(kubetestConfigurationVariable) Expect(kubetestConfigFilePath).To(BeAnExistingFile(), "%s should be a valid kubetest config file") if input.ControlPlaneMachineCount == nil { @@ -129,10 +129,10 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust } if input.E2EConfig.HasVariable(EtcdVersionUpgradeTo) { - etcdVersionUpgradeTo = input.E2EConfig.GetVariable(EtcdVersionUpgradeTo) + etcdVersionUpgradeTo = input.E2EConfig.MustGetVariable(EtcdVersionUpgradeTo) } if input.E2EConfig.HasVariable(CoreDNSVersionUpgradeTo) { - coreDNSVersionUpgradeTo = input.E2EConfig.GetVariable(CoreDNSVersionUpgradeTo) + coreDNSVersionUpgradeTo = input.E2EConfig.MustGetVariable(CoreDNSVersionUpgradeTo) } // Setup a Namespace where to host objects for this spec and create a watcher for the Namespace events. @@ -160,7 +160,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust Flavor: ptr.Deref(input.Flavor, "upgrades"), Namespace: namespace.Name, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeFrom), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeFrom), ControlPlaneMachineCount: ptr.To[int64](controlPlaneMachineCount), WorkerMachineCount: ptr.To[int64](workerMachineCount), }, @@ -182,7 +182,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust DNSImageTag: coreDNSVersionUpgradeTo, MachineDeployments: clusterResources.MachineDeployments, MachinePools: clusterResources.MachinePools, - KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesUpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForMachinePoolToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-upgrade"), WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), @@ -203,11 +203,11 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust ) if input.E2EConfig.HasVariable(CPMachineTemplateUpgradeTo) { - upgradeCPMachineTemplateTo = ptr.To(input.E2EConfig.GetVariable(CPMachineTemplateUpgradeTo)) + upgradeCPMachineTemplateTo = ptr.To(input.E2EConfig.MustGetVariable(CPMachineTemplateUpgradeTo)) } if input.E2EConfig.HasVariable(WorkersMachineTemplateUpgradeTo) { - upgradeWorkersMachineTemplateTo = ptr.To(input.E2EConfig.GetVariable(WorkersMachineTemplateUpgradeTo)) + upgradeWorkersMachineTemplateTo = ptr.To(input.E2EConfig.MustGetVariable(WorkersMachineTemplateUpgradeTo)) } framework.UpgradeControlPlaneAndWaitForUpgrade(ctx, framework.UpgradeControlPlaneAndWaitForUpgradeInput{ @@ -216,7 +216,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust ControlPlane: clusterResources.ControlPlane, EtcdImageTag: etcdVersionUpgradeTo, DNSImageTag: coreDNSVersionUpgradeTo, - KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesUpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), UpgradeMachineTemplate: upgradeCPMachineTemplateTo, WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), @@ -234,7 +234,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust framework.UpgradeMachineDeploymentsAndWait(ctx, framework.UpgradeMachineDeploymentsAndWaitInput{ ClusterProxy: input.BootstrapClusterProxy, Cluster: clusterResources.Cluster, - UpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + UpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), UpgradeMachineTemplate: upgradeWorkersMachineTemplateTo, MachineDeployments: clusterResources.MachineDeployments, WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"), @@ -245,7 +245,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust framework.UpgradeMachinePoolAndWait(ctx, framework.UpgradeMachinePoolAndWaitInput{ ClusterProxy: input.BootstrapClusterProxy, Cluster: clusterResources.Cluster, - UpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + UpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), WaitForMachinePoolToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-upgrade"), MachinePools: clusterResources.MachinePools, }) @@ -258,7 +258,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust workloadClient := workloadProxy.GetClient() framework.WaitForNodesReady(ctx, framework.WaitForNodesReadyInput{ Lister: workloadClient, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), Count: int(clusterResources.ExpectedTotalNodes()), WaitForNodesReady: input.E2EConfig.GetIntervals(specName, "wait-nodes-ready"), }) diff --git a/test/e2e/cluster_upgrade_runtimesdk.go b/test/e2e/cluster_upgrade_runtimesdk.go index 80fe78a0438b..43d0223b4b9f 100644 --- a/test/e2e/cluster_upgrade_runtimesdk.go +++ b/test/e2e/cluster_upgrade_runtimesdk.go @@ -205,7 +205,7 @@ func ClusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() Cl Flavor: ptr.Deref(input.Flavor, "upgrades"), Namespace: namespace.Name, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeFrom), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeFrom), ControlPlaneMachineCount: ptr.To[int64](controlPlaneMachineCount), WorkerMachineCount: ptr.To[int64](workerMachineCount), ClusterctlVariables: variables, @@ -256,7 +256,7 @@ func ClusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() Cl ControlPlane: clusterResources.ControlPlane, MachineDeployments: clusterResources.MachineDeployments, MachinePools: clusterResources.MachinePools, - KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesUpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForMachinePoolToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-upgrade"), WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), @@ -266,7 +266,7 @@ func ClusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() Cl beforeClusterUpgradeTestHandler(ctx, input.BootstrapClusterProxy.GetClient(), clusterRef, - input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade")) }, PreWaitForWorkersToBeUpgraded: func() { @@ -277,7 +277,7 @@ func ClusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() Cl afterControlPlaneUpgradeTestHandler(ctx, input.BootstrapClusterProxy.GetClient(), clusterRef, - input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade")) }, }) @@ -287,7 +287,7 @@ func ClusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() Cl workloadClient := workloadProxy.GetClient() framework.WaitForNodesReady(ctx, framework.WaitForNodesReadyInput{ Lister: workloadClient, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), Count: int(clusterResources.ExpectedTotalNodes()), WaitForNodesReady: input.E2EConfig.GetIntervals(specName, "wait-nodes-ready"), }) diff --git a/test/e2e/cluster_upgrade_runtimesdk_test.go b/test/e2e/cluster_upgrade_runtimesdk_test.go index 8cd5b930f2aa..8f0f4d5ce35d 100644 --- a/test/e2e/cluster_upgrade_runtimesdk_test.go +++ b/test/e2e/cluster_upgrade_runtimesdk_test.go @@ -31,7 +31,7 @@ import ( var _ = Describe("When upgrading a workload cluster using ClusterClass with RuntimeSDK [ClusterClass]", Label("ClusterClass"), func() { ClusterUpgradeWithRuntimeSDKSpec(ctx, func() ClusterUpgradeWithRuntimeSDKSpecInput { - version, err := semver.ParseTolerant(e2eConfig.GetVariable(KubernetesVersionUpgradeFrom)) + version, err := semver.ParseTolerant(e2eConfig.MustGetVariable(KubernetesVersionUpgradeFrom)) Expect(err).ToNot(HaveOccurred(), "Invalid argument, KUBERNETES_VERSION_UPGRADE_FROM is not a valid version") if version.LT(semver.MustParse("1.24.0")) { Fail("This test only supports upgrades from Kubernetes >= v1.24.0") diff --git a/test/e2e/clusterclass_changes.go b/test/e2e/clusterclass_changes.go index 61979966792a..d3138e0842fd 100644 --- a/test/e2e/clusterclass_changes.go +++ b/test/e2e/clusterclass_changes.go @@ -150,7 +150,7 @@ func ClusterClassChangesSpec(ctx context.Context, inputGetter func() ClusterClas Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName) Expect(os.MkdirAll(input.ArtifactFolder, 0750)).To(Succeed(), "Invalid argument. input.ArtifactFolder can't be created for %s spec", specName) Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) - Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.GetVariable(KubernetesVersion))) + Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.MustGetVariable(KubernetesVersion))) Expect(input.ModifyControlPlaneFields).ToNot(BeEmpty(), "Invalid argument. input.ModifyControlPlaneFields can't be empty when calling %s spec", specName) // Set up a Namespace where to host objects for this spec and create a watcher for the namespace events. @@ -174,7 +174,7 @@ func ClusterClassChangesSpec(ctx context.Context, inputGetter func() ClusterClas Flavor: input.Flavor, Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](1), }, diff --git a/test/e2e/clusterclass_rollout.go b/test/e2e/clusterclass_rollout.go index da8ea05788ab..ae82323f6a0f 100644 --- a/test/e2e/clusterclass_rollout.go +++ b/test/e2e/clusterclass_rollout.go @@ -115,7 +115,7 @@ func ClusterClassRolloutSpec(ctx context.Context, inputGetter func() ClusterClas Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName) Expect(os.MkdirAll(input.ArtifactFolder, 0750)).To(Succeed(), "Invalid argument. input.ArtifactFolder can't be created for %s spec", specName) Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) - Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.GetVariable(KubernetesVersion))) + Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.MustGetVariable(KubernetesVersion))) // Set a default function to ensure that FilterMetadataBeforeValidation has a default behavior for // filtering metadata if it is not specified by infrastructure provider. @@ -146,7 +146,7 @@ func ClusterClassRolloutSpec(ctx context.Context, inputGetter func() ClusterClas Flavor: input.Flavor, Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](1), }, diff --git a/test/e2e/clusterctl_upgrade.go b/test/e2e/clusterctl_upgrade.go index de179e9639f8..ed805335027d 100644 --- a/test/e2e/clusterctl_upgrade.go +++ b/test/e2e/clusterctl_upgrade.go @@ -273,7 +273,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg RequiresDockerSock: input.E2EConfig.HasDockerProvider(), // Note: most of this images won't be used while starting the controllers, because it is used to spin up older versions of CAPI. Those images will be eventually used when upgrading to current. Images: input.E2EConfig.Images, - IPFamily: input.E2EConfig.GetVariable(IPFamily), + IPFamily: input.E2EConfig.MustGetVariable(IPFamily), LogFolder: filepath.Join(managementClusterLogFolder, "logs-kind"), }) Expect(managementClusterProvider).ToNot(BeNil(), "Failed to create a kind cluster") @@ -416,7 +416,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg workloadClusterNamespace := testNamespace.Name kubernetesVersion := input.WorkloadKubernetesVersion if kubernetesVersion == "" { - kubernetesVersion = input.E2EConfig.GetVariable(KubernetesVersion) + kubernetesVersion = input.E2EConfig.MustGetVariable(KubernetesVersion) } controlPlaneMachineCount := ptr.To[int64](1) if input.ControlPlaneMachineCount != nil { diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go index 14746c1ec4c8..f1182223e3a6 100644 --- a/test/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/clusterctl_upgrade_test.go @@ -285,7 +285,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur stableRelease, err := GetStableReleaseOfMinor(ctx, version) Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version) ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput { - initKubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.GetVariable("KUBERNETES_VERSION_LATEST_CI")) + initKubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.MustGetVariable("KUBERNETES_VERSION_LATEST_CI")) Expect(err).ToNot(HaveOccurred()) return ClusterctlUpgradeSpecInput{ E2EConfig: e2eConfig, diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 41b174acfa24..3162790233d6 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -220,7 +220,7 @@ func createClusterctlLocalRepository(config *clusterctl.E2EConfig, repositoryFol // Ensuring a CNI file is defined in the config and register a FileTransformation to inject the referenced file in place of the CNI_RESOURCES envSubst variable. Expect(config.Variables).To(HaveKey(CNIPath), "Missing %s variable in the config", CNIPath) - cniPath := config.GetVariable(CNIPath) + cniPath := config.MustGetVariable(CNIPath) Expect(cniPath).To(BeAnExistingFile(), "The %s variable should resolve to an existing file", CNIPath) createRepositoryInput.RegisterClusterResourceSetConfigMapTransformation(cniPath, CNIResources) @@ -237,10 +237,10 @@ func setupBootstrapCluster(config *clusterctl.E2EConfig, scheme *runtime.Scheme, By("Creating the bootstrap cluster") clusterProvider = bootstrap.CreateKindBootstrapClusterAndLoadImages(ctx, bootstrap.CreateKindBootstrapClusterAndLoadImagesInput{ Name: config.ManagementClusterName, - KubernetesVersion: config.GetVariable(KubernetesVersionManagement), + KubernetesVersion: config.MustGetVariable(KubernetesVersionManagement), RequiresDockerSock: config.HasDockerProvider(), Images: config.Images, - IPFamily: config.GetVariable(IPFamily), + IPFamily: config.MustGetVariable(IPFamily), LogFolder: filepath.Join(artifactFolder, "kind"), }) Expect(clusterProvider).ToNot(BeNil(), "Failed to create a bootstrap cluster") diff --git a/test/e2e/k8s_conformance.go b/test/e2e/k8s_conformance.go index 44b45122541a..494de81eb59f 100644 --- a/test/e2e/k8s_conformance.go +++ b/test/e2e/k8s_conformance.go @@ -83,7 +83,7 @@ func K8SConformanceSpec(ctx context.Context, inputGetter func() K8SConformanceSp Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) Expect(input.E2EConfig.Variables).To(HaveKey(kubetestConfigurationVariable), "% spec requires a %s variable to be defined in the config file", specName, kubetestConfigurationVariable) - kubetestConfigFilePath = input.E2EConfig.GetVariable(kubetestConfigurationVariable) + kubetestConfigFilePath = input.E2EConfig.MustGetVariable(kubetestConfigurationVariable) Expect(kubetestConfigFilePath).To(BeAnExistingFile(), "%s should be a valid kubetest config file") // Setup a Namespace where to host objects for this spec and create a watcher for the namespace events. @@ -113,7 +113,7 @@ func K8SConformanceSpec(ctx context.Context, inputGetter func() K8SConformanceSp Flavor: input.Flavor, Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](workerMachineCount), }, diff --git a/test/e2e/k8s_conformance_test.go b/test/e2e/k8s_conformance_test.go index fa740eb1866b..f8e0c7177204 100644 --- a/test/e2e/k8s_conformance_test.go +++ b/test/e2e/k8s_conformance_test.go @@ -48,7 +48,7 @@ var _ = Describe("When testing K8S conformance with K8S latest ci [Conformance] // KUBERNETES_VERSION env var. This only works without side effects on other tests because we are // running this test in its separate job. K8SConformanceSpec(ctx, func() K8SConformanceSpecInput { - kubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.GetVariable("KUBERNETES_VERSION_LATEST_CI")) + kubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.MustGetVariable("KUBERNETES_VERSION_LATEST_CI")) Expect(err).NotTo(HaveOccurred()) Expect(os.Setenv("KUBERNETES_VERSION", kubernetesVersion)).To(Succeed()) return K8SConformanceSpecInput{ diff --git a/test/e2e/kcp_adoption.go b/test/e2e/kcp_adoption.go index 932abb5fc317..1ad731f3396c 100644 --- a/test/e2e/kcp_adoption.go +++ b/test/e2e/kcp_adoption.go @@ -133,7 +133,7 @@ func KCPAdoptionSpec(ctx context.Context, inputGetter func() KCPAdoptionSpecInpu // define template variables Namespace: namespace.Name, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), InfrastructureProvider: infrastructureProvider, ControlPlaneMachineCount: replicas, WorkerMachineCount: ptr.To[int64](0), diff --git a/test/e2e/kcp_remediations.go b/test/e2e/kcp_remediations.go index 982cf0e777f1..f36f276a8d90 100644 --- a/test/e2e/kcp_remediations.go +++ b/test/e2e/kcp_remediations.go @@ -473,7 +473,7 @@ func createWorkloadClusterAndWait(ctx context.Context, input createWorkloadClust // define template variables Namespace: input.Namespace, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](3), WorkerMachineCount: ptr.To[int64](0), InfrastructureProvider: infrastructureProvider, diff --git a/test/e2e/machine_pool.go b/test/e2e/machine_pool.go index a35d028db2fd..6f96bab0e4f0 100644 --- a/test/e2e/machine_pool.go +++ b/test/e2e/machine_pool.go @@ -78,7 +78,7 @@ func MachinePoolSpec(ctx context.Context, inputGetter func() MachinePoolInput) { Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName) Expect(os.MkdirAll(input.ArtifactFolder, 0755)).To(Succeed(), "Invalid argument. input.ArtifactFolder can't be created for %s spec", specName) //nolint:gosec Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) - Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.GetVariable(KubernetesVersion))) + Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.MustGetVariable(KubernetesVersion))) // Setup a Namespace where to host objects for this spec and create a watcher for the namespace events. namespace, cancelWatches = framework.SetupSpecNamespace(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder, input.PostNamespaceCreated) @@ -102,7 +102,7 @@ func MachinePoolSpec(ctx context.Context, inputGetter func() MachinePoolInput) { Flavor: ptr.Deref(input.Flavor, "machine-pool"), Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](int64(workerMachineCount)), }, diff --git a/test/e2e/md_remediations.go b/test/e2e/md_remediations.go index 1f9f484e43db..7a4513a8e244 100644 --- a/test/e2e/md_remediations.go +++ b/test/e2e/md_remediations.go @@ -101,7 +101,7 @@ func MachineDeploymentRemediationSpec(ctx context.Context, inputGetter func() Ma Flavor: ptr.Deref(input.Flavor, "md-remediation"), Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](1), }, diff --git a/test/e2e/md_rollout.go b/test/e2e/md_rollout.go index e1060e8a11c5..a2d63322e1ca 100644 --- a/test/e2e/md_rollout.go +++ b/test/e2e/md_rollout.go @@ -72,7 +72,7 @@ func MachineDeploymentRolloutSpec(ctx context.Context, inputGetter func() Machin Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName) Expect(os.MkdirAll(input.ArtifactFolder, 0750)).To(Succeed(), "Invalid argument. input.ArtifactFolder can't be created for %s spec", specName) Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) - Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.GetVariable(KubernetesVersion))) + Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.MustGetVariable(KubernetesVersion))) // Setup a Namespace where to host objects for this spec and create a watcher for the namespace events. namespace, cancelWatches = framework.SetupSpecNamespace(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder, input.PostNamespaceCreated) @@ -95,7 +95,7 @@ func MachineDeploymentRolloutSpec(ctx context.Context, inputGetter func() Machin Flavor: input.Flavor, Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](1), }, diff --git a/test/e2e/md_scale.go b/test/e2e/md_scale.go index 89bacdf4a977..5107994c300b 100644 --- a/test/e2e/md_scale.go +++ b/test/e2e/md_scale.go @@ -73,7 +73,7 @@ func MachineDeploymentScaleSpec(ctx context.Context, inputGetter func() MachineD Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName) Expect(os.MkdirAll(input.ArtifactFolder, 0750)).To(Succeed(), "Invalid argument. input.ArtifactFolder can't be created for %s spec", specName) Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) - Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.GetVariable(KubernetesVersion))) + Expect(input.E2EConfig.Variables).To(HaveValidVersion(input.E2EConfig.MustGetVariable(KubernetesVersion))) // Setup a Namespace where to host objects for this spec and create a watcher for the namespace events. namespace, cancelWatches = framework.SetupSpecNamespace(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder, input.PostNamespaceCreated) @@ -96,7 +96,7 @@ func MachineDeploymentScaleSpec(ctx context.Context, inputGetter func() MachineD Flavor: input.Flavor, Namespace: namespace.Name, ClusterName: fmt.Sprintf("%s-%s", specName, util.RandomString(6)), - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](1), WorkerMachineCount: ptr.To[int64](1), }, diff --git a/test/e2e/node_drain.go b/test/e2e/node_drain.go index 946dd6810568..8de7f22cdb0d 100644 --- a/test/e2e/node_drain.go +++ b/test/e2e/node_drain.go @@ -145,7 +145,7 @@ func NodeDrainTimeoutSpec(ctx context.Context, inputGetter func() NodeDrainTimeo Flavor: ptr.Deref(input.Flavor, "topology"), Namespace: namespace.Name, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: ptr.To[int64](int64(controlPlaneReplicas)), WorkerMachineCount: ptr.To[int64](1), }, diff --git a/test/e2e/quick_start.go b/test/e2e/quick_start.go index 14d17c5d80ce..076f0f24f4df 100644 --- a/test/e2e/quick_start.go +++ b/test/e2e/quick_start.go @@ -140,7 +140,7 @@ func QuickStartSpec(ctx context.Context, inputGetter func() QuickStartSpecInput) Flavor: flavor, Namespace: namespace.Name, ClusterName: clusterName, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersion), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersion), ControlPlaneMachineCount: controlPlaneMachineCount, WorkerMachineCount: workerMachineCount, }, diff --git a/test/e2e/scale.go b/test/e2e/scale.go index 35610c64e1d8..eb7fe25da644 100644 --- a/test/e2e/scale.go +++ b/test/e2e/scale.go @@ -239,28 +239,28 @@ func ScaleSpec(ctx context.Context, inputGetter func() ScaleSpecInput) { flavor = *input.Flavor } - clusterCount := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableBestEffort(scaleClusterCount)), + clusterCount := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableOrEmpty(scaleClusterCount)), input.ClusterCount, ptr.To[int64](10), ) - concurrency := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableBestEffort(scaleConcurrency)), + concurrency := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableOrEmpty(scaleConcurrency)), input.Concurrency, ptr.To[int64](5), ) - controlPlaneMachineCount := cmp.Or(variableAsInt64(input.E2EConfig.GetVariableBestEffort(scaleControlPlaneMachineCount)), + controlPlaneMachineCount := cmp.Or(variableAsInt64(input.E2EConfig.GetVariableOrEmpty(scaleControlPlaneMachineCount)), input.ControlPlaneMachineCount, ptr.To[int64](1), ) - machineDeploymentCount := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableBestEffort(scaleMachineDeploymentCount)), + machineDeploymentCount := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableOrEmpty(scaleMachineDeploymentCount)), input.MachineDeploymentCount, ptr.To[int64](1), ) - workerPerMachineDeploymentCount := cmp.Or(variableAsInt64(input.E2EConfig.GetVariableBestEffort(scaleWorkerPerMachineDeploymentCount)), + workerPerMachineDeploymentCount := cmp.Or(variableAsInt64(input.E2EConfig.GetVariableOrEmpty(scaleWorkerPerMachineDeploymentCount)), input.WorkerPerMachineDeploymentCount, ptr.To[int64](3), ) - additionalClusterClassCount := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableBestEffort(scaleAdditionalClusterClassCount)), + additionalClusterClassCount := *cmp.Or(variableAsInt64(input.E2EConfig.GetVariableOrEmpty(scaleAdditionalClusterClassCount)), input.AdditionalClusterClassCount, ptr.To[int64](0), ) - deployClusterInSeparateNamespaces := *cmp.Or(variableAsBool(input.E2EConfig.GetVariableBestEffort(scaleDeployClusterInSeparateNamespaces)), + deployClusterInSeparateNamespaces := *cmp.Or(variableAsBool(input.E2EConfig.GetVariableOrEmpty(scaleDeployClusterInSeparateNamespaces)), input.DeployClusterInSeparateNamespaces, ptr.To[bool](false), ) - useCrossNamespaceClusterClass := *cmp.Or(variableAsBool(input.E2EConfig.GetVariableBestEffort(scaleUseCrossNamespaceClusterClass)), + useCrossNamespaceClusterClass := *cmp.Or(variableAsBool(input.E2EConfig.GetVariableOrEmpty(scaleUseCrossNamespaceClusterClass)), input.UseCrossNamespaceClusterClass, ptr.To[bool](false), ) if useCrossNamespaceClusterClass { @@ -311,7 +311,7 @@ func ScaleSpec(ctx context.Context, inputGetter func() ScaleSpecInput) { Flavor: flavor, Namespace: scaleClusterNamespacePlaceholder, ClusterName: scaleClusterNamePlaceholder, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeFrom), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeFrom), ControlPlaneMachineCount: controlPlaneMachineCount, WorkerMachineCount: workerPerMachineDeploymentCount, ClusterctlVariables: variables, @@ -410,9 +410,9 @@ func ScaleSpec(ctx context.Context, inputGetter func() ScaleSpecInput) { // Get the upgrade function for upgrading the workload clusters. upgrader := getClusterUpgradeAndWaitFn(framework.UpgradeClusterTopologyAndWaitForUpgradeInput{ ClusterProxy: input.BootstrapClusterProxy, - KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), - EtcdImageTag: input.E2EConfig.GetVariable(EtcdVersionUpgradeTo), - DNSImageTag: input.E2EConfig.GetVariable(CoreDNSVersionUpgradeTo), + KubernetesUpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), + EtcdImageTag: input.E2EConfig.MustGetVariable(EtcdVersionUpgradeTo), + DNSImageTag: input.E2EConfig.MustGetVariable(CoreDNSVersionUpgradeTo), WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForDNSUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), diff --git a/test/e2e/self_hosted.go b/test/e2e/self_hosted.go index c4eec033b798..3c1b5aa92399 100644 --- a/test/e2e/self_hosted.go +++ b/test/e2e/self_hosted.go @@ -117,18 +117,18 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) // Use KubernetesVersion if no upgrade step is defined by test input. Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion)) - kubernetesVersion = input.E2EConfig.GetVariable(KubernetesVersion) + kubernetesVersion = input.E2EConfig.MustGetVariable(KubernetesVersion) } else { Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersionUpgradeFrom)) Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersionUpgradeTo)) - kubernetesVersion = input.E2EConfig.GetVariable(KubernetesVersionUpgradeFrom) + kubernetesVersion = input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeFrom) if input.E2EConfig.HasVariable(EtcdVersionUpgradeTo) { - etcdVersionUpgradeTo = input.E2EConfig.GetVariable(EtcdVersionUpgradeTo) + etcdVersionUpgradeTo = input.E2EConfig.MustGetVariable(EtcdVersionUpgradeTo) } if input.E2EConfig.HasVariable(CoreDNSVersionUpgradeTo) { - coreDNSVersionUpgradeTo = input.E2EConfig.GetVariable(CoreDNSVersionUpgradeTo) + coreDNSVersionUpgradeTo = input.E2EConfig.MustGetVariable(CoreDNSVersionUpgradeTo) } } @@ -351,7 +351,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) DNSImageTag: coreDNSVersionUpgradeTo, MachineDeployments: clusterResources.MachineDeployments, MachinePools: clusterResources.MachinePools, - KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesUpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForMachinePoolToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-upgrade"), WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), @@ -367,11 +367,11 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) ) if input.E2EConfig.HasVariable(CPMachineTemplateUpgradeTo) { - upgradeCPMachineTemplateTo = ptr.To(input.E2EConfig.GetVariable(CPMachineTemplateUpgradeTo)) + upgradeCPMachineTemplateTo = ptr.To(input.E2EConfig.MustGetVariable(CPMachineTemplateUpgradeTo)) } if input.E2EConfig.HasVariable(WorkersMachineTemplateUpgradeTo) { - upgradeWorkersMachineTemplateTo = ptr.To(input.E2EConfig.GetVariable(WorkersMachineTemplateUpgradeTo)) + upgradeWorkersMachineTemplateTo = ptr.To(input.E2EConfig.MustGetVariable(WorkersMachineTemplateUpgradeTo)) } framework.UpgradeControlPlaneAndWaitForUpgrade(ctx, framework.UpgradeControlPlaneAndWaitForUpgradeInput{ @@ -380,7 +380,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) ControlPlane: clusterResources.ControlPlane, EtcdImageTag: etcdVersionUpgradeTo, DNSImageTag: coreDNSVersionUpgradeTo, - KubernetesUpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesUpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), UpgradeMachineTemplate: upgradeCPMachineTemplateTo, WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), WaitForKubeProxyUpgrade: input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade"), @@ -393,7 +393,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) framework.UpgradeMachineDeploymentsAndWait(ctx, framework.UpgradeMachineDeploymentsAndWaitInput{ ClusterProxy: selfHostedClusterProxy, Cluster: clusterResources.Cluster, - UpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + UpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), UpgradeMachineTemplate: upgradeWorkersMachineTemplateTo, MachineDeployments: clusterResources.MachineDeployments, WaitForMachinesToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"), @@ -404,7 +404,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) framework.UpgradeMachinePoolAndWait(ctx, framework.UpgradeMachinePoolAndWaitInput{ ClusterProxy: selfHostedClusterProxy, Cluster: clusterResources.Cluster, - UpgradeVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + UpgradeVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), WaitForMachinePoolToBeUpgraded: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-upgrade"), MachinePools: clusterResources.MachinePools, }) @@ -417,7 +417,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput) workloadClient := workloadProxy.GetClient() framework.WaitForNodesReady(ctx, framework.WaitForNodesReadyInput{ Lister: workloadClient, - KubernetesVersion: input.E2EConfig.GetVariable(KubernetesVersionUpgradeTo), + KubernetesVersion: input.E2EConfig.MustGetVariable(KubernetesVersionUpgradeTo), Count: int(clusterResources.ExpectedTotalNodes()), WaitForNodesReady: input.E2EConfig.GetIntervals(specName, "wait-nodes-ready"), }) diff --git a/test/framework/clusterctl/e2e_config.go b/test/framework/clusterctl/e2e_config.go index f54801f1ce4f..4654541a8fd4 100644 --- a/test/framework/clusterctl/e2e_config.go +++ b/test/framework/clusterctl/e2e_config.go @@ -789,8 +789,8 @@ func (c *E2EConfig) HasVariable(varName string) bool { return ok } -// GetVariable returns a variable from environment variables or from the e2e config file. -func (c *E2EConfig) GetVariable(varName string) string { +// MustGetVariable returns a variable from environment variables or from the e2e config file. +func (c *E2EConfig) MustGetVariable(varName string) string { if value, ok := os.LookupEnv(varName); ok { return value } @@ -800,9 +800,9 @@ func (c *E2EConfig) GetVariable(varName string) string { return value } -// GetVariableBestEffort returns a variable from environment variables or from the e2e config file. +// GetVariableOrEmpty returns a variable from environment variables or from the e2e config file. // If the variable cannot be found it returns an empty string and does not fail. -func (c *E2EConfig) GetVariableBestEffort(varName string) string { +func (c *E2EConfig) GetVariableOrEmpty(varName string) string { if value, ok := os.LookupEnv(varName); ok { return value } @@ -815,9 +815,9 @@ func (c *E2EConfig) GetVariableBestEffort(varName string) string { return "" } -// GetInt64PtrVariable returns an Int64Ptr variable from the e2e config file. -func (c *E2EConfig) GetInt64PtrVariable(varName string) *int64 { - wCountStr := c.GetVariable(varName) +// MustGetInt64PtrVariable returns an Int64Ptr variable from the e2e config file. +func (c *E2EConfig) MustGetInt64PtrVariable(varName string) *int64 { + wCountStr := c.MustGetVariable(varName) if wCountStr == "" { return nil } @@ -827,9 +827,9 @@ func (c *E2EConfig) GetInt64PtrVariable(varName string) *int64 { return ptr.To[int64](wCount) } -// GetInt32PtrVariable returns an Int32Ptr variable from the e2e config file. -func (c *E2EConfig) GetInt32PtrVariable(varName string) *int32 { - wCountStr := c.GetVariable(varName) +// MustGetInt32PtrVariable returns an Int32Ptr variable from the e2e config file. +func (c *E2EConfig) MustGetInt32PtrVariable(varName string) *int32 { + wCountStr := c.MustGetVariable(varName) if wCountStr == "" { return nil } diff --git a/test/framework/clusterctl/repository.go b/test/framework/clusterctl/repository.go index d871c65bd196..99d4f651834c 100644 --- a/test/framework/clusterctl/repository.go +++ b/test/framework/clusterctl/repository.go @@ -139,7 +139,7 @@ func CreateRepository(ctx context.Context, input CreateRepositoryInput) string { }, } for key := range input.E2EConfig.Variables { - clusterctlConfigFile.Values[key] = input.E2EConfig.GetVariable(key) + clusterctlConfigFile.Values[key] = input.E2EConfig.MustGetVariable(key) } Expect(clusterctlConfigFile.write()).To(Succeed(), "Failed to write clusterctlConfigFile") @@ -152,7 +152,7 @@ func CreateRepository(ctx context.Context, input CreateRepositoryInput) string { }, } for key := range input.E2EConfig.Variables { - clusterctlConfigFileV1_2.Values[key] = input.E2EConfig.GetVariable(key) + clusterctlConfigFileV1_2.Values[key] = input.E2EConfig.MustGetVariable(key) } Expect(clusterctlConfigFileV1_2.write()).To(Succeed(), "Failed to write v1.2 clusterctlConfigFile")