Merge pull request #398 from furkatgofurov7/separate-legacy-upgrade-t…

…ests Drop out legacy and add default upgrade e2e tests
rancher · Aug 13, 2024 · 125d6b8 · 125d6b8
2 parents 480a96d + ec2b27b
commit 125d6b8
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 409 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -35,8 +35,6 @@ jobs:
  uses: actions/setup-go@v5
  with:
  go-version: 1.21.x
- - name: Build e2e image
- run: make e2e-image
  - name: Setup kind
  uses: helm/kind-action@v1.9.0
  with:

diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -40,7 +40,6 @@ providers:
  contract: v1beta1
  files:
  - sourcePath: "../data/infrastructure/cluster-template-docker.yaml"
- - sourcePath: "../data/infrastructure/cluster-template-docker-legacy.yaml"
  - sourcePath: "../data/shared/v1beta1/metadata.yaml"
  replacements:
  - old: "imagePullPolicy: Always"
@@ -52,30 +51,6 @@ providers:
  - name: rke2-control-plane
  type: ControlPlaneProvider
  versions:
- - name: "v0.2.7"
- value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.2.7/control-plane-components.yaml"
- type: "url"
- contract: v1beta1
- files:
- - sourcePath: "../../../metadata.yaml"
- targetName: "metadata.yaml"
- replacements:
- - old: "imagePullPolicy: Always"
- new: "imagePullPolicy: IfNotPresent"
- - old: "--leader-elect"
- new: "--leader-elect=false"
- - name: "v0.3.0"
- value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.3.0/control-plane-components.yaml"
- type: "url"
- contract: v1beta1
- files:
- - sourcePath: "../../../metadata.yaml"
- targetName: "metadata.yaml"
- replacements:
- - old: "imagePullPolicy: Always"
- new: "imagePullPolicy: IfNotPresent"
- - old: "--leader-elect"
- new: "--leader-elect=false"
  - name: "v0.4.0"
  value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.4.0/control-plane-components.yaml"
  type: "url"
@@ -114,30 +89,6 @@ providers:
  - name: rke2-bootstrap
  type: BootstrapProvider
  versions:
- - name: "v0.2.7"
- value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.2.7/bootstrap-components.yaml"
- type: "url"
- contract: v1beta1
- files:
- - sourcePath: "../../../metadata.yaml"
- targetName: "metadata.yaml"
- replacements:
- - old: "imagePullPolicy: Always"
- new: "imagePullPolicy: IfNotPresent"
- - old: "--leader-elect"
- new: "--leader-elect=false"
- - name: "v0.3.0"
- value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.3.0/bootstrap-components.yaml"
- type: "url"
- contract: v1beta1
- files:
- - sourcePath: "../../../metadata.yaml"
- targetName: "metadata.yaml"
- replacements:
- - old: "imagePullPolicy: Always"
- new: "imagePullPolicy: IfNotPresent"
- - old: "--leader-elect"
- new: "--leader-elect=false"
  - name: "v0.4.0"
  value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.4.0/bootstrap-components.yaml"
  type: "url"

diff --git a/test/e2e/data/infrastructure/cluster-template-docker-legacy.yaml b/test/e2e/data/infrastructure/cluster-template-docker-legacy.yaml
diff --git a/test/e2e/data/infrastructure/cluster-template-docker.yaml b/test/e2e/data/infrastructure/cluster-template-docker.yaml
@@ -100,7 +100,7 @@ metadata:
 spec: 
  replicas: ${CONTROL_PLANE_MACHINE_COUNT}
  version: ${KUBERNETES_VERSION}+rke2r1
- registrationMethod: internal-first
+ registrationMethod: control-plane-endpoint
  rolloutStrategy:
  type: "RollingUpdate"
  rollingUpdate:

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -234,28 +234,31 @@ func setupBootstrapCluster(config *clusterctl.E2EConfig, scheme *runtime.Scheme,
  return clusterProvider, clusterProxy
 }
 
+// initBootstrapCluster initializes a bootstrap cluster with the latest minor version.
 func initBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *clusterctl.E2EConfig, clusterctlConfig, artifactFolder string) {
  clusterctl.InitManagementClusterAndWatchControllerLogs(context.TODO(), clusterctl.InitManagementClusterAndWatchControllerLogsInput{
  ClusterProxy: bootstrapClusterProxy,
  ClusterctlConfigPath: clusterctlConfig,
  InfrastructureProviders: config.InfrastructureProviders(),
  IPAMProviders: config.IPAMProviders(),
  RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
- BootstrapProviders: []string{"rke2-bootstrap:v0.5.0"},
- ControlPlaneProviders: []string{"rke2-control-plane:v0.5.0"},
+ BootstrapProviders: []string{"rke2-bootstrap"},
+ ControlPlaneProviders: []string{"rke2-control-plane"},
  LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
  }, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
 }
 
-func initLegacyBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *clusterctl.E2EConfig, clusterctlConfig, artifactFolder string) {
+// initUpgradableBootstrapCluster initializes a bootstrap cluster with the latest minor version N-1 and used to perform an upgrade to the latest version.
+// Make sure to update the version in the providers list to the latest minor version N-1.
+func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *clusterctl.E2EConfig, clusterctlConfig, artifactFolder string) {
  clusterctl.InitManagementClusterAndWatchControllerLogs(context.TODO(), clusterctl.InitManagementClusterAndWatchControllerLogsInput{
  ClusterProxy: bootstrapClusterProxy,
  ClusterctlConfigPath: clusterctlConfig,
  InfrastructureProviders: config.InfrastructureProviders(),
  IPAMProviders: config.IPAMProviders(),
  RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
- BootstrapProviders: []string{"rke2-bootstrap:v0.2.7"},
- ControlPlaneProviders: []string{"rke2-control-plane:v0.2.7"},
+ BootstrapProviders: []string{"rke2-bootstrap:v0.4.0"},
+ ControlPlaneProviders: []string{"rke2-control-plane:v0.4.0"},
  LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
  }, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
 }