From 14109e7a73e95fd8730b2e33a4c31cc649830a2d Mon Sep 17 00:00:00 2001 From: Sedef Savas Date: Thu, 15 Sep 2022 10:32:38 -0700 Subject: [PATCH] Enable clusterctl upgrade test --- api/v1beta1/awscluster_conversion.go | 2 +- api/v1beta1/awsidentity_conversion.go | 2 +- api/v1beta1/awsmachine_conversion.go | 2 +- test/e2e/data/e2e_conf.yaml | 4 ++-- test/e2e/suites/unmanaged/unmanaged_CAPI_test.go | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/v1beta1/awscluster_conversion.go b/api/v1beta1/awscluster_conversion.go index 59786dffc4..afdc8d9196 100644 --- a/api/v1beta1/awscluster_conversion.go +++ b/api/v1beta1/awscluster_conversion.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes Authors. +Copyright 2022 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/api/v1beta1/awsidentity_conversion.go b/api/v1beta1/awsidentity_conversion.go index cbf67d0d48..34b1bad2f7 100644 --- a/api/v1beta1/awsidentity_conversion.go +++ b/api/v1beta1/awsidentity_conversion.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes Authors. +Copyright 2022 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/api/v1beta1/awsmachine_conversion.go b/api/v1beta1/awsmachine_conversion.go index ac074cf35a..e5dad870cd 100644 --- a/api/v1beta1/awsmachine_conversion.go +++ b/api/v1beta1/awsmachine_conversion.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes Authors. +Copyright 2022 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index b8da1a3beb..044b68f956 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -84,7 +84,7 @@ providers: - name: aws type: InfrastructureProvider versions: - - name: v1.5.0 # latest published release in the v1alpha4 series; this is used for v1beta1 --> v1beta2 clusterctl upgrades test only. + - name: v1.5.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta2 clusterctl upgrades test only. value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v1.5.0/infrastructure-components.yaml" type: "url" contract: v1beta1 @@ -94,7 +94,7 @@ providers: - name: v1.6.99 # Use manifest from source files value: ../../../config/default - contract: v1beta1 + # Do not add contract field for v1beta1 --> v1beta2 clusterctl upgrades test to work. files: - sourcePath: "./infrastructure-aws/generated/cluster-template-efs-support.yaml" - sourcePath: "./infrastructure-aws/generated/cluster-template-external-csi.yaml" diff --git a/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go b/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go index b77bfcff23..bb2657eb23 100644 --- a/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go +++ b/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go @@ -110,8 +110,7 @@ var _ = ginkgo.Context("[unmanaged] [Cluster API Framework]", func() { }) }) - // TODO: clusterctl init uses v1beta2, this needs to be fixed. - ginkgo.PDescribe("Clusterctl Upgrade Spec [from latest v1beta1 release to v1beta2]", func() { + ginkgo.Describe("Clusterctl Upgrade Spec [from latest v1beta1 release to v1beta2]", func() { ginkgo.BeforeEach(func() { // As the resources cannot be defined by the It() clause in CAPI tests, using the largest values required for all It() tests in this CAPI test. requiredResources = &shared.TestResource{EC2Normal: 5 * e2eCtx.Settings.InstanceVCPU, IGW: 2, NGW: 2, VPC: 2, ClassicLB: 2, EIP: 2}