From 62ac2b421da89bb4decb84565efe46b1fe8ac2b5 Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Wed, 10 Jul 2024 13:03:43 +0200 Subject: [PATCH 1/5] test: import gitops suite with rke2 Signed-off-by: Carlos Salas --- test/e2e/suites/import-gitops/import_gitops_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/suites/import-gitops/import_gitops_test.go b/test/e2e/suites/import-gitops/import_gitops_test.go index ebacf501..b604ee18 100644 --- a/test/e2e/suites/import-gitops/import_gitops_test.go +++ b/test/e2e/suites/import-gitops/import_gitops_test.go @@ -75,7 +75,7 @@ var _ = Describe("[Docker] [RKE2] Create and delete CAPI cluster functionality s ClusterctlConfigPath: flagVals.ConfigPath, ClusterctlBinaryPath: flagVals.ClusterctlBinaryPath, ArtifactFolder: flagVals.ArtifactFolder, - ClusterTemplate: e2e.CAPIDockerKubeadm, + ClusterTemplate: e2e.CAPIDockerRKE2, ClusterName: "clusterv1-docker-rke2", ControlPlaneMachineCount: ptr.To[int](1), WorkerMachineCount: ptr.To[int](1), From cd0b68527b5763f922a1fb65cd245b9759f8570d Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Wed, 10 Jul 2024 13:05:22 +0200 Subject: [PATCH 2/5] test: restructure v3 controller test suites Signed-off-by: Carlos Salas --- .../import_gitops_v3_test.go} | 35 ++++++++++++++++++- .../suite_test.go | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) rename test/e2e/suites/{managementv3/managementv3_test.go => import-gitops-v3/import_gitops_v3_test.go} (77%) rename test/e2e/suites/{managementv3 => import-gitops-v3}/suite_test.go (99%) diff --git a/test/e2e/suites/managementv3/managementv3_test.go b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go similarity index 77% rename from test/e2e/suites/managementv3/managementv3_test.go rename to test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go index 147d905d..da9ca4d1 100644 --- a/test/e2e/suites/managementv3/managementv3_test.go +++ b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package managementv3 +package import_gitops_v3 import ( . "github.com/onsi/ginkgo/v2" @@ -62,6 +62,39 @@ var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Create and dele }) }) +var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() { + BeforeEach(func() { + komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) + komega.SetContext(ctx) + }) + + specs.CreateMgmtV3UsingGitOpsSpec(ctx, func() specs.CreateMgmtV3UsingGitOpsSpecInput { + return specs.CreateMgmtV3UsingGitOpsSpecInput{ + E2EConfig: e2eConfig, + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + ClusterctlConfigPath: flagVals.ConfigPath, + ClusterctlBinaryPath: flagVals.ClusterctlBinaryPath, + ArtifactFolder: flagVals.ArtifactFolder, + ClusterTemplate: e2e.CAPIDockerRKE2, + ClusterName: "clusterv3-auto-import-rke2", + ControlPlaneMachineCount: ptr.To[int](1), + WorkerMachineCount: ptr.To[int](1), + GitAddr: giteaResult.GitAddress, + GitAuthSecretName: e2e.AuthSecretName, + SkipCleanup: false, + SkipDeletionTest: false, + LabelNamespace: true, + TestClusterReimport: true, + RancherServerURL: hostName, + CAPIClusterCreateWaitName: "wait-rancher", + DeleteClusterWaitName: "wait-controllers", + CapiClusterOwnerLabel: e2e.CapiClusterOwnerLabel, + CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel, + OwnedLabelName: e2e.OwnedLabelName, + } + }) +}) + var _ = Describe("[Azure] [AKS] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.DontRunLabel), func() { BeforeEach(func() { komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) diff --git a/test/e2e/suites/managementv3/suite_test.go b/test/e2e/suites/import-gitops-v3/suite_test.go similarity index 99% rename from test/e2e/suites/managementv3/suite_test.go rename to test/e2e/suites/import-gitops-v3/suite_test.go index 92e345af..4fcc9475 100644 --- a/test/e2e/suites/managementv3/suite_test.go +++ b/test/e2e/suites/import-gitops-v3/suite_test.go @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package managementv3 +package import_gitops_v3 import ( "context" From 77435110a230a446a4fcaffe0ea14f8c38cd8ed1 Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Wed, 10 Jul 2024 13:05:54 +0200 Subject: [PATCH 3/5] test: add v3 coverage when embedded-capi disabled Signed-off-by: Carlos Salas --- .../embedded_capi_disabled_v3_test.go | 62 ++++ .../embedded-capi-disabled-v3/suite_test.go | 280 ++++++++++++++++++ 2 files changed, 342 insertions(+) create mode 100644 test/e2e/suites/embedded-capi-disabled-v3/embedded_capi_disabled_v3_test.go create mode 100644 test/e2e/suites/embedded-capi-disabled-v3/suite_test.go diff --git a/test/e2e/suites/embedded-capi-disabled-v3/embedded_capi_disabled_v3_test.go b/test/e2e/suites/embedded-capi-disabled-v3/embedded_capi_disabled_v3_test.go new file mode 100644 index 00000000..d2390fea --- /dev/null +++ b/test/e2e/suites/embedded-capi-disabled-v3/embedded_capi_disabled_v3_test.go @@ -0,0 +1,62 @@ +//go:build e2e +// +build e2e + +/* +Copyright © 2023 - 2024 SUSE LLC + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package embedded_capi_disabled_v3 + +import ( + . "github.com/onsi/ginkgo/v2" + . "sigs.k8s.io/controller-runtime/pkg/envtest/komega" + + "k8s.io/utils/ptr" + + "github.com/rancher/turtles/test/e2e" + "github.com/rancher/turtles/test/e2e/specs" +) + +var _ = Describe("[AWS] [EKS] [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import (embedded capi disabled from start)", Label(e2e.FullTestLabel), func() { + BeforeEach(func() { + SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) + SetContext(ctx) + }) + + specs.CreateMgmtV3UsingGitOpsSpec(ctx, func() specs.CreateMgmtV3UsingGitOpsSpecInput { + return specs.CreateMgmtV3UsingGitOpsSpecInput{ + E2EConfig: e2eConfig, + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + ClusterctlConfigPath: flagVals.ConfigPath, + ClusterctlBinaryPath: flagVals.ClusterctlBinaryPath, + ArtifactFolder: flagVals.ArtifactFolder, + ClusterTemplate: e2e.CAPIAwsEKSMMP, + ClusterName: "highlander-e2e-cluster1", + ControlPlaneMachineCount: ptr.To[int](1), + WorkerMachineCount: ptr.To[int](1), + GitAddr: giteaResult.GitAddress, + GitAuthSecretName: e2e.AuthSecretName, + SkipCleanup: false, + SkipDeletionTest: false, + LabelNamespace: true, + RancherServerURL: hostName, + CAPIClusterCreateWaitName: "wait-capa-create-cluster", + DeleteClusterWaitName: "wait-eks-delete", + CapiClusterOwnerLabel: e2e.CapiClusterOwnerLabel, + CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel, + OwnedLabelName: e2e.OwnedLabelName, + } + }) +}) diff --git a/test/e2e/suites/embedded-capi-disabled-v3/suite_test.go b/test/e2e/suites/embedded-capi-disabled-v3/suite_test.go new file mode 100644 index 00000000..59a4139b --- /dev/null +++ b/test/e2e/suites/embedded-capi-disabled-v3/suite_test.go @@ -0,0 +1,280 @@ +//go:build e2e +// +build e2e + +/* +Copyright © 2023 - 2024 SUSE LLC + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package embedded_capi_disabled_v3 + +import ( + "context" + "fmt" + "os" + "path/filepath" + "runtime" + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "k8s.io/klog/v2" + "sigs.k8s.io/cluster-api/test/framework/clusterctl" + ctrl "sigs.k8s.io/controller-runtime" + + "github.com/rancher/turtles/test/e2e" + "github.com/rancher/turtles/test/framework" + turtlesframework "github.com/rancher/turtles/test/framework" + "github.com/rancher/turtles/test/testenv" +) + +// Test suite flags. +var ( + flagVals *e2e.FlagValues +) + +// Test suite global vars. +var ( + // e2eConfig to be used for this test, read from configPath. + e2eConfig *clusterctl.E2EConfig + + // clusterctlConfigPath to be used for this test, created by generating a clusterctl local repository + // with the providers specified in the configPath. + clusterctlConfigPath string + + // hostName is the host name for the Rancher Manager server. + hostName string + + ctx = context.Background() + + setupClusterResult *testenv.SetupTestClusterResult + giteaResult *testenv.DeployGiteaResult +) + +func init() { + flagVals = &e2e.FlagValues{} + e2e.InitFlags(flagVals) +} + +func TestE2E(t *testing.T) { + RegisterFailHandler(Fail) + + ctrl.SetLogger(klog.Background()) + + RunSpecs(t, "rancher-turtles-e2e-embedded-capi-disabled-v3") +} + +var _ = BeforeSuite(func() { + Expect(flagVals.ConfigPath).To(BeAnExistingFile(), "Invalid test suite argument. e2e.config should be an existing file.") + Expect(os.MkdirAll(flagVals.ArtifactFolder, 0o755)).To(Succeed(), "Invalid test suite argument. Can't create e2e.artifacts-folder %q", flagVals.ArtifactFolder) + Expect(flagVals.HelmBinaryPath).To(BeAnExistingFile(), "Invalid test suite argument. helm-binary-path should be an existing file.") + Expect(flagVals.ChartPath).To(BeAnExistingFile(), "Invalid test suite argument. chart-path should be an existing file.") + + By(fmt.Sprintf("Loading the e2e test configuration from %q", flagVals.ConfigPath)) + e2eConfig = e2e.LoadE2EConfig(flagVals.ConfigPath) + + dockerUsername := "" + dockerPassword := "" + if flagVals.UseEKS { + Expect(flagVals.IsolatedMode).To(BeFalse(), "You cannot use eks with isolated") + dockerUsername = os.Getenv("GITHUB_USERNAME") + Expect(dockerUsername).NotTo(BeEmpty(), "Github username is required") + dockerPassword = os.Getenv("GITHUB_TOKEN") + Expect(dockerPassword).NotTo(BeEmpty(), "Github token is required") + } + + By(fmt.Sprintf("Creating a clusterctl config into %q", flagVals.ArtifactFolder)) + clusterctlConfigPath = e2e.CreateClusterctlLocalRepository(ctx, e2eConfig, filepath.Join(flagVals.ArtifactFolder, "repository")) + + hostName = e2eConfig.GetVariable(e2e.RancherHostnameVar) + + setupClusterResult = testenv.SetupTestCluster(ctx, testenv.SetupTestClusterInput{ + UseExistingCluster: flagVals.UseExistingCluster, + E2EConfig: e2eConfig, + ClusterctlConfigPath: clusterctlConfigPath, + Scheme: e2e.InitScheme(), + ArtifactFolder: flagVals.ArtifactFolder, + KubernetesVersion: e2eConfig.GetVariable(e2e.KubernetesManagementVersionVar), + IsolatedMode: flagVals.IsolatedMode, + HelmBinaryPath: flagVals.HelmBinaryPath, + UseEKS: flagVals.UseEKS, + }) + + if flagVals.IsolatedMode { + hostName = setupClusterResult.IsolatedHostName + } + + testenv.RancherDeployIngress(ctx, testenv.RancherDeployIngressInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + HelmBinaryPath: flagVals.HelmBinaryPath, + HelmExtraValuesPath: filepath.Join(flagVals.HelmExtraValuesDir, "deploy-rancher-ingress.yaml"), + IsolatedMode: flagVals.IsolatedMode, + UseEKS: flagVals.UseEKS, + NginxIngress: e2e.NginxIngress, + NginxIngressNamespace: e2e.NginxIngressNamespace, + IngressWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-rancher"), + NgrokApiKey: e2eConfig.GetVariable(e2e.NgrokApiKeyVar), + NgrokAuthToken: e2eConfig.GetVariable(e2e.NgrokAuthTokenVar), + NgrokPath: e2eConfig.GetVariable(e2e.NgrokPathVar), + NgrokRepoName: e2eConfig.GetVariable(e2e.NgrokRepoNameVar), + NgrokRepoURL: e2eConfig.GetVariable(e2e.NgrokUrlVar), + DefaultIngressClassPatch: e2e.IngressClassPatch, + }) + + if flagVals.UseEKS { + By("Getting ingress hostname") + svcRes := &testenv.WaitForServiceIngressHostnameResult{} + testenv.WaitForServiceIngressHostname(ctx, testenv.WaitForServiceIngressHostnameInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + ServiceName: "ingress-nginx-controller", + ServiceNamespace: "ingress-nginx", + IngressWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-rancher"), + }, svcRes) + hostName = svcRes.Hostname + + By("Deploying ghcr details") + framework.CreateDockerRegistrySecret(ctx, framework.CreateDockerRegistrySecretInput{ + Name: "regcred", + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + Namespace: "rancher-turtles-system", + DockerServer: "https://ghcr.io", + DockerUsername: dockerUsername, + DockerPassword: dockerPassword, + }) + } + + // NOTE: deploy Rancher first with the embedded-cluster-api feature disabled. + // and the deploy Rancher Turtles. + rancherInput := testenv.DeployRancherInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + HelmBinaryPath: flagVals.HelmBinaryPath, + HelmExtraValuesPath: filepath.Join(flagVals.HelmExtraValuesDir, "deploy-rancher.yaml"), + InstallCertManager: true, + CertManagerChartPath: e2eConfig.GetVariable(e2e.CertManagerPathVar), + CertManagerUrl: e2eConfig.GetVariable(e2e.CertManagerUrlVar), + CertManagerRepoName: e2eConfig.GetVariable(e2e.CertManagerRepoNameVar), + RancherChartRepoName: e2eConfig.GetVariable(e2e.RancherRepoNameVar), + RancherChartURL: e2eConfig.GetVariable(e2e.RancherUrlVar), + RancherChartPath: e2eConfig.GetVariable(e2e.RancherPathVar), + RancherVersion: e2eConfig.GetVariable(e2e.RancherVersionVar), + RancherHost: hostName, + RancherNamespace: e2e.RancherNamespace, + RancherPassword: e2eConfig.GetVariable(e2e.RancherPasswordVar), + RancherFeatures: "embedded-cluster-api=false", + RancherPatches: [][]byte{e2e.RancherSettingPatch}, + RancherWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-rancher"), + ControllerWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"), + Variables: e2eConfig.Variables, + } + if !flagVals.IsolatedMode && !flagVals.UseEKS { + // i.e. we are using ngrok locally + rancherInput.RancherIngressConfig = e2e.IngressConfig + rancherInput.RancherServicePatch = e2e.RancherServicePatch + } + if flagVals.UseEKS { + rancherInput.RancherIngressClassName = "nginx" + } + testenv.DeployRancher(ctx, rancherInput) + + rtInput := testenv.DeployRancherTurtlesInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + HelmBinaryPath: flagVals.HelmBinaryPath, + ChartPath: flagVals.ChartPath, + CAPIProvidersYAML: e2e.CapiProviders, + Namespace: turtlesframework.DefaultRancherTurtlesNamespace, + Image: fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH), + Tag: "v0.0.1", + WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"), + AdditionalValues: map[string]string{ + "cluster-api-operator.cert-manager.enabled": "false", + "rancherTurtles.features.embedded-capi.disabled": "false", + }, + } + if flagVals.UseEKS { + rtInput.AdditionalValues["rancherTurtles.imagePullSecrets"] = "{regcred}" + rtInput.AdditionalValues["rancherTurtles.imagePullPolicy"] = "IfNotPresent" + } else { + // NOTE: this was the default previously in the chart locally and ok as + // we where loading the image into kind manually. + rtInput.AdditionalValues["rancherTurtles.imagePullPolicy"] = "Never" + } + testenv.DeployRancherTurtles(ctx, rtInput) + + // NOTE: there are no short or local tests in this suite + By("Deploying additional infrastructure providers") + awsCreds := e2eConfig.GetVariable(e2e.CapaEncodedCredentialsVar) + Expect(awsCreds).ToNot(BeEmpty(), "AWS creds required for full test") + + testenv.CAPIOperatorDeployProvider(ctx, testenv.CAPIOperatorDeployProviderInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + CAPIProvidersSecretsYAML: [][]byte{ + e2e.AWSProviderSecret, + e2e.AzureIdentitySecret, + }, + CAPIProvidersYAML: e2e.FullProviders, + TemplateData: map[string]string{ + "AWSEncodedCredentials": e2eConfig.GetVariable(e2e.CapaEncodedCredentialsVar), + }, + WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"), + WaitForDeployments: []testenv.NamespaceName{ + { + Name: "capa-controller-manager", + Namespace: "capa-system", + }, + { + Name: "capz-controller-manager", + Namespace: "capz-system", + }, + }, + }) + + giteaValues := map[string]string{ + "gitea.admin.username": e2eConfig.GetVariable(e2e.GiteaUserNameVar), + "gitea.admin.password": e2eConfig.GetVariable(e2e.GiteaUserPasswordVar), + "service.http.type": "NodePort", + } + if flagVals.UseEKS { + giteaValues["service.http.type"] = "LoadBalancer" + } + + giteaResult = testenv.DeployGitea(ctx, testenv.DeployGiteaInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + HelmBinaryPath: flagVals.HelmBinaryPath, + ChartRepoName: e2eConfig.GetVariable(e2e.GiteaRepoNameVar), + ChartRepoURL: e2eConfig.GetVariable(e2e.GiteaRepoURLVar), + ChartName: e2eConfig.GetVariable(e2e.GiteaChartNameVar), + ChartVersion: e2eConfig.GetVariable(e2e.GiteaChartVersionVar), + ValuesFilePath: "../../data/gitea/values.yaml", + Values: giteaValues, + RolloutWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-gitea"), + ServiceWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-gitea-service"), + AuthSecretName: e2e.AuthSecretName, + Username: e2eConfig.GetVariable(e2e.GiteaUserNameVar), + Password: e2eConfig.GetVariable(e2e.GiteaUserPasswordVar), + }) +}) + +var _ = AfterSuite(func() { + testenv.UninstallGitea(ctx, testenv.UninstallGiteaInput{ + BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, + HelmBinaryPath: flagVals.HelmBinaryPath, + DeleteWaitInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-gitea-uninstall"), + }) + + testenv.CleanupTestCluster(ctx, testenv.CleanupTestClusterInput{ + SetupTestClusterResult: *setupClusterResult, + SkipCleanup: flagVals.SkipCleanup, + ArtifactFolder: flagVals.ArtifactFolder, + }) +}) From 72d6847d7282cbbba22c313ff3da00f1f8d42655 Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Thu, 11 Jul 2024 15:01:23 +0200 Subject: [PATCH 4/5] test: disable rke2 tests until capi version bump Signed-off-by: Carlos Salas --- test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go | 2 +- test/e2e/suites/import-gitops/import_gitops_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go index da9ca4d1..b4852dd8 100644 --- a/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go +++ b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go @@ -62,7 +62,7 @@ var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Create and dele }) }) -var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() { +var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.DontRunLabel), func() { BeforeEach(func() { komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) komega.SetContext(ctx) diff --git a/test/e2e/suites/import-gitops/import_gitops_test.go b/test/e2e/suites/import-gitops/import_gitops_test.go index b604ee18..ca9b40a5 100644 --- a/test/e2e/suites/import-gitops/import_gitops_test.go +++ b/test/e2e/suites/import-gitops/import_gitops_test.go @@ -62,7 +62,7 @@ var _ = Describe("[Docker] [Kubeadm] Create and delete CAPI cluster functionalit }) }) -var _ = Describe("[Docker] [RKE2] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() { +var _ = Describe("[Docker] [RKE2] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.DontRunLabel), func() { BeforeEach(func() { SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) SetContext(ctx) From ceeb2872a1b531c3eb71b17c0922a30d8b916f7b Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Thu, 11 Jul 2024 16:28:55 +0200 Subject: [PATCH 5/5] chore: downgrade capd version to match core capi's Signed-off-by: Carlos Salas --- test/e2e/data/capi-operator/capi-providers.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/data/capi-operator/capi-providers.yaml b/test/e2e/data/capi-operator/capi-providers.yaml index 3d204ec8..1f7476b6 100644 --- a/test/e2e/data/capi-operator/capi-providers.yaml +++ b/test/e2e/data/capi-operator/capi-providers.yaml @@ -12,7 +12,7 @@ metadata: spec: name: docker type: infrastructure - version: v1.7.0 + version: v1.4.6 configSecret: name: variables ---