Merge pull request #391 from elfosardo/support-ironic-image32

✨ Support ironic-image 32.0

Author: metal3-io-bot

api/v1alpha1/ironic_types.go

@@ -34,6 +34,7 @@ var (
 // expectations.
 var SupportedVersions = map[Version]string{
 	VersionLatest: "latest",
+	Version320:    "release-32.0",
 	Version310:    "release-31.0",
 	Version300:    "release-30.0",
 }

pkg/ironic/validation_test.go

@@ -216,7 +216,7 @@ func TestValidateIronic(t *testing.T) {
 			Ironic: metal3api.IronicSpec{
 				Version: "42.42",
 			},
-			ExpectedError: "version 42.42 is not supported, supported versions are 30.0, 31.0, latest",
+			ExpectedError: "version 42.42 is not supported, supported versions are 30.0, 31.0, 32.0, latest",
 		},
 		{
 			Scenario: "change existing database config",

pkg/ironic/version_test.go

@@ -62,13 +62,13 @@ func TestWithIronicOverrides(t *testing.T) {
 
 			Ironic: metal3api.Ironic{
 				Spec: metal3api.IronicSpec{
-					Version: "31.0",
+					Version: "32.0",
 				},
 			},
 
 			Expected: VersionInfo{
-				InstalledVersion:       metal3api.Version310,
-				IronicImage:            "quay.io/metal3-io/ironic:release-31.0",
+				InstalledVersion:       metal3api.Version320,
+				IronicImage:            "quay.io/metal3-io/ironic:release-32.0",
 				KeepalivedImage:        "quay.io/metal3-io/keepalived:latest",
 				RamdiskDownloaderImage: "quay.io/metal3-io/ironic-ipa-downloader:latest",
 				MariaDBImage:           "quay.io/metal3-io/mariadb:latest",
@@ -79,13 +79,13 @@ func TestWithIronicOverrides(t *testing.T) {
 
 			Ironic: metal3api.Ironic{
 				Spec: metal3api.IronicSpec{
-					Version: "30.0",
+					Version: "31.0",
 				},
 			},
 
 			Expected: VersionInfo{
-				InstalledVersion:       metal3api.Version300,
-				IronicImage:            "quay.io/metal3-io/ironic:release-30.0",
+				InstalledVersion:       metal3api.Version310,
+				IronicImage:            "quay.io/metal3-io/ironic:release-31.0",
 				KeepalivedImage:        "quay.io/metal3-io/keepalived:latest",
 				RamdiskDownloaderImage: "quay.io/metal3-io/ironic-ipa-downloader:latest",
 				MariaDBImage:           "quay.io/metal3-io/mariadb:latest",

test/suite_test.go

@@ -61,11 +61,12 @@ import (
 // https://docs.openstack.org/ironic/latest/contributor/webapi-version-history.html
 const (
 	// NOTE(dtantsur): latest is now at least 1.99, so we can rely on this
-	// value to check that specifying Version: 31.0 actually installs 31.0.
+	// value to check that specifying Version: 32.0 actually installs 32.0.
 	apiVersionIn300 = "1.99"
 	apiVersionIn310 = "1.99"
+	apiVersionIn320 = "1.101"
 	// Update this periodically to make sure we're installing the latest version by default.
-	knownAPIMinorVersion = 99
+	knownAPIMinorVersion = 101
 
 	numberOfNodes = 100
 
@@ -916,8 +917,12 @@ var _ = Describe("Ironic object tests", func() {
 		testUpgrade("30.0", "31.0", apiVersionIn300, apiVersionIn310, namespace)
 	})
 
-	It("creates Ironic 31.0 and upgrades to latest", Label("v310-to-latest", "upgrade"), func() {
-		testUpgrade("31.0", "latest", apiVersionIn310, "", namespace)
+	It("creates Ironic 31.0 and upgrades to 32.0", Label("v310-to-320", "upgrade"), func() {
+		testUpgrade("31.0", "32.0", apiVersionIn310, apiVersionIn320, namespace)
+	})
+
+	It("creates Ironic 32.0 and upgrades to latest", Label("v320-to-latest", "upgrade"), func() {
+		testUpgrade("32.0", "latest", apiVersionIn320, "", namespace)
 	})
 
 	It("refuses to downgrade Ironic with a database", Label("no-db-downgrade", "upgrade"), func() {
@@ -954,8 +959,12 @@ var _ = Describe("Ironic object tests", func() {
 		testUpgradeHA("30.0", "31.0", apiVersionIn300, apiVersionIn310, namespace)
 	})
 
-	It("creates Ironic 31.0 with HA and upgrades to latest", Label("ha-v310-to-latest", "ha", "upgrade"), func() {
-		testUpgradeHA("31.0", "latest", apiVersionIn310, "", namespace)
+	It("creates Ironic 31.0 with HA and upgrades to 32.0", Label("ha-v310-to-320", "ha", "upgrade"), func() {
+		testUpgradeHA("31.0", "32.0", apiVersionIn310, apiVersionIn320, namespace)
+	})
+
+	It("creates Ironic 32.0 with HA and upgrades to latest", Label("ha-v320-to-latest", "ha", "upgrade"), func() {
+		testUpgradeHA("32.0", "latest", apiVersionIn320, "", namespace)
 	})
 
 	It("creates Ironic with keepalived and DHCP", Label("keepalived-dnsmasq"), func() {