@@ -26,21 +26,26 @@ var (
2626 providerMetal3Prefix = "metal3:v%s"
2727 ironicGoproxy = "https://proxy.golang.org/github.com/metal3-io/ironic-image/@v/list"
2828 bmoGoproxy = "https://proxy.golang.org/github.com/metal3-io/baremetal-operator/@v/list"
29+
30+ k8sVersion string
2931)
3032
31- var _ = Describe ("When testing cluster upgrade from releases (v1.8 =>current) [clusterctl-upgrade]" , func () {
33+ var _ = Describe ("When testing cluster upgrade from releases (v1.9 =>current) [clusterctl-upgrade]" , func () {
3234 BeforeEach (func () {
33- osType := strings .ToLower (os .Getenv ("OS" ))
34- Expect (osType ).ToNot (Equal ("" ))
35+ k8sVersion = "v1.32.0"
3536 validateGlobals (specName )
36- imageURL , imageChecksum := EnsureImage ("v1.32.0" )
37+ imageURL , imageChecksum := EnsureImage (k8sVersion )
3738 os .Setenv ("IMAGE_RAW_CHECKSUM" , imageChecksum )
3839 os .Setenv ("IMAGE_RAW_URL" , imageURL )
3940 // We need to override clusterctl apply log folder to avoid getting our credentials exposed.
4041 clusterctlLogFolder = filepath .Join (os .TempDir (), "target_cluster_logs" , bootstrapClusterProxy .GetName ())
4142 })
4243
43- minorVersion := "1.8"
44+ minorVersion := "1.9"
45+ bmoFromRelease := "0.9"
46+ ironicFromRelease := "27.0"
47+ bmoToRelease := "latest"
48+ ironicToRelease := "latest"
4449 capiStableRelease , err := capi_e2e .GetStableReleaseOfMinor (ctx , minorVersion )
4550 Expect (err ).ToNot (HaveOccurred (), "Failed to get stable version for CAPI minor release : %s" , minorVersion )
4651 capm3StableRelease , err := GetCAPM3StableReleaseOfMinor (ctx , minorVersion )
@@ -57,42 +62,45 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl
5762 InitWithBootstrapProviders : []string {fmt .Sprintf (providerKubeadmPrefix , capiStableRelease )},
5863 InitWithControlPlaneProviders : []string {fmt .Sprintf (providerKubeadmPrefix , capiStableRelease )},
5964 InitWithInfrastructureProviders : []string {fmt .Sprintf (providerMetal3Prefix , capm3StableRelease )},
60- InitWithKubernetesVersion : "v1.32.0" ,
61- WorkloadKubernetesVersion : "v1.32.0" ,
65+ InitWithKubernetesVersion : k8sVersion ,
66+ WorkloadKubernetesVersion : k8sVersion ,
6267 InitWithBinary : fmt .Sprintf (clusterctlDownloadURL , capiStableRelease ),
6368 PreInit : func (clusterProxy framework.ClusterProxy ) {
64- preInitFunc (clusterProxy , "0.8" , "26.0" )
69+ preInitFunc (clusterProxy , bmoFromRelease , ironicFromRelease )
6570 // Override capi/capm3 versions exported in preInit
6671 os .Setenv ("CAPI_VERSION" , "v1beta1" )
6772 os .Setenv ("CAPM3_VERSION" , "v1beta1" )
6873 os .Setenv ("KUBECONFIG_BOOTSTRAP" , bootstrapClusterProxy .GetKubeconfigPath ())
6974 },
7075 PostNamespaceCreated : postNamespaceCreated ,
7176 PreUpgrade : func (clusterProxy framework.ClusterProxy ) {
72- preUpgrade (clusterProxy , "latest" , "latest" )
77+ preUpgrade (clusterProxy , bmoToRelease , ironicToRelease )
7378 },
7479 PreCleanupManagementCluster : func (clusterProxy framework.ClusterProxy ) {
75- preCleanupManagementCluster (clusterProxy , "latest" )
80+ preCleanupManagementCluster (clusterProxy , ironicToRelease )
7681 },
7782 MgmtFlavor : osType ,
7883 WorkloadFlavor : osType ,
7984 }
8085 })
8186})
8287
83- var _ = Describe ("When testing cluster upgrade from releases (v1.7 =>current) [clusterctl-upgrade]" , func () {
88+ var _ = Describe ("When testing cluster upgrade from releases (v1.8 =>current) [clusterctl-upgrade]" , func () {
8489 BeforeEach (func () {
85- osType := strings .ToLower (os .Getenv ("OS" ))
86- Expect (osType ).ToNot (Equal ("" ))
90+ k8sVersion = "v1.31.2"
8791 validateGlobals (specName )
88- imageURL , imageChecksum := EnsureImage ("v1.30.0" )
92+ imageURL , imageChecksum := EnsureImage (k8sVersion )
8993 os .Setenv ("IMAGE_RAW_CHECKSUM" , imageChecksum )
9094 os .Setenv ("IMAGE_RAW_URL" , imageURL )
9195 // We need to override clusterctl apply log folder to avoid getting our credentials exposed.
9296 clusterctlLogFolder = filepath .Join (os .TempDir (), "target_cluster_logs" , bootstrapClusterProxy .GetName ())
9397 })
9498
95- minorVersion := "1.7"
99+ minorVersion := "1.8"
100+ bmoFromRelease := "0.8"
101+ ironicFromRelease := "26.0"
102+ bmoToRelease := "latest"
103+ ironicToRelease := "latest"
96104 capiStableRelease , err := capi_e2e .GetStableReleaseOfMinor (ctx , minorVersion )
97105 Expect (err ).ToNot (HaveOccurred (), "Failed to get stable version for CAPI minor release : %s" , minorVersion )
98106 capm3StableRelease , err := GetCAPM3StableReleaseOfMinor (ctx , minorVersion )
@@ -109,22 +117,22 @@ var _ = Describe("When testing cluster upgrade from releases (v1.7=>current) [cl
109117 InitWithBootstrapProviders : []string {fmt .Sprintf (providerKubeadmPrefix , capiStableRelease )},
110118 InitWithControlPlaneProviders : []string {fmt .Sprintf (providerKubeadmPrefix , capiStableRelease )},
111119 InitWithInfrastructureProviders : []string {fmt .Sprintf (providerMetal3Prefix , capm3StableRelease )},
112- InitWithKubernetesVersion : "v1.30.0" ,
113- WorkloadKubernetesVersion : "v1.30.0" ,
120+ InitWithKubernetesVersion : k8sVersion ,
121+ WorkloadKubernetesVersion : k8sVersion ,
114122 InitWithBinary : fmt .Sprintf (clusterctlDownloadURL , capiStableRelease ),
115123 PreInit : func (clusterProxy framework.ClusterProxy ) {
116- preInitFunc (clusterProxy , "0.6" , "25.0" )
124+ preInitFunc (clusterProxy , bmoFromRelease , ironicFromRelease )
117125 // Override capi/capm3 versions exported in preInit
118126 os .Setenv ("CAPI_VERSION" , "v1beta1" )
119127 os .Setenv ("CAPM3_VERSION" , "v1beta1" )
120128 os .Setenv ("KUBECONFIG_BOOTSTRAP" , bootstrapClusterProxy .GetKubeconfigPath ())
121129 },
122130 PostNamespaceCreated : postNamespaceCreated ,
123131 PreUpgrade : func (clusterProxy framework.ClusterProxy ) {
124- preUpgrade (clusterProxy , "latest" , "latest" )
132+ preUpgrade (clusterProxy , bmoToRelease , ironicToRelease )
125133 },
126134 PreCleanupManagementCluster : func (clusterProxy framework.ClusterProxy ) {
127- preCleanupManagementCluster (clusterProxy , "latest" )
135+ preCleanupManagementCluster (clusterProxy , ironicToRelease )
128136 },
129137 MgmtFlavor : osType ,
130138 WorkloadFlavor : osType ,
@@ -288,7 +296,7 @@ func preInitFunc(clusterProxy framework.ClusterProxy, bmoRelease string, ironicR
288296
289297// preUpgrade hook should be called from ClusterctlUpgradeSpec before upgrading the management cluster
290298// it upgrades Ironic and BMO before upgrading the providers.
291- func preUpgrade (clusterProxy framework.ClusterProxy , ironicUpgradeToRelease string , bmoUpgradeToRelease string ) {
299+ func preUpgrade (clusterProxy framework.ClusterProxy , bmoUpgradeToRelease string , ironicUpgradeToRelease string ) {
292300 ironicTag , err := GetLatestPatchRelease (ironicGoproxy , ironicUpgradeToRelease )
293301 Expect (err ).ToNot (HaveOccurred (), "Failed to fetch ironic version for release %s" , ironicUpgradeToRelease )
294302 Logf ("Ironic Tag %s\n " , ironicTag )
0 commit comments