Merge pull request #700 from Nordix/fix/clusterctl-config

🐛 Fix clusterctl config file path
metal3-io · Aug 31, 2022 · 0f32822 · 0f32822
2 parents 24ac1a4 + 1ae071c
commit 0f32822
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -132,6 +132,7 @@ variables:
  # Default vars for the template, those values could be overridden by the env-vars.
  CAPI_VERSION: "v1beta1"
  CAPM3_VERSION: "v1beta1"
+ CONFIG_FILE_PATH: "${HOME}/.cluster-api/clusterctl.yaml"
  SERVICE_CIDR: "10.96.0.0/12"
  POD_CIDR: "192.168.0.0/18"
  PROVISIONING_CIDR: "24"

diff --git a/test/e2e/pivoting_test.go b/test/e2e/pivoting_test.go
@@ -52,7 +52,7 @@ func pivoting() {
  By("Initialize Provider component in target cluster")
  clusterctl.Init(ctx, clusterctl.InitInput{
  KubeconfigPath: targetCluster.GetKubeconfigPath(),
- ClusterctlConfigPath: os.Getenv("CONFIG_FILE_PATH"),
+ ClusterctlConfigPath: e2eConfig.GetVariable("CONFIG_FILE_PATH"),
  CoreProvider: config.ClusterAPIProviderName + ":" + os.Getenv("CAPIRELEASE"),
  BootstrapProviders: []string{config.KubeadmBootstrapProviderName + ":" + os.Getenv("CAPIRELEASE")},
  ControlPlaneProviders: []string{config.KubeadmControlPlaneProviderName + ":" + os.Getenv("CAPIRELEASE")},