Skip to content

Commit

Permalink
Enable clusterctl upgrade test
Browse files Browse the repository at this point in the history
  • Loading branch information
sedefsavas committed Sep 15, 2022
1 parent f12e837 commit 14109e7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion api/v1beta1/awscluster_conversion.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/awsidentity_conversion.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/awsmachine_conversion.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/data/e2e_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/suites/unmanaged/unmanaged_CAPI_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 14109e7

Please sign in to comment.