Merge pull request #290 from elfosardo/prepare-0.4

✨ Switch to Ironic 30.0 by default, prepare release-0.4

Author: metal3-io-bot

Makefile

@@ -72,7 +72,7 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 endif
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/metal3-io/ironic-standalone-operator:latest
+IMG ?= quay.io/metal3-io/ironic-standalone-operator:release-0.4
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

config/manager/manager.yaml

@@ -44,7 +44,7 @@ spec:
         envFrom:
         - configMapRef:
             name: ironic-standalone-operator-config
-        image: quay.io/metal3-io/ironic-standalone-operator:latest
+        image: quay.io/metal3-io/ironic-standalone-operator:release-0.4
         name: manager
         securityContext:
           allowPrivilegeEscalation: false

pkg/ironic/version.go

@@ -12,7 +12,7 @@ const (
 
 var (
 	// NOTE(dtantsur): defaultVersion must be updated after branching.
-	defaultVersion                = metal3api.VersionLatest
+	defaultVersion                = metal3api.Version300
 	defaultMariaDBImage           = defaultRegistry + "/mariadb:latest"
 	defaultRamdiskDownloaderImage = defaultRegistry + "/ironic-ipa-downloader:latest"
 	defaultKeepalivedImage        = defaultRegistry + "/keepalived:latest"

pkg/ironic/version_test.go

@@ -26,8 +26,8 @@ func TestWithIronicOverrides(t *testing.T) {
 
 			Expected: VersionInfo{
 				// NOTE(dtantsur): this value will change on stable branches
-				InstalledVersion:       metal3api.VersionLatest,
-				IronicImage:            "quay.io/metal3-io/ironic:latest",
+				InstalledVersion:       metal3api.Version300,
+				IronicImage:            "quay.io/metal3-io/ironic:release-30.0",
 				KeepalivedImage:        "quay.io/metal3-io/keepalived:latest",
 				RamdiskDownloaderImage: "quay.io/metal3-io/ironic-ipa-downloader:latest",
 				MariaDBImage:           "quay.io/metal3-io/mariadb:latest",
@@ -50,7 +50,7 @@ func TestWithIronicOverrides(t *testing.T) {
 			Expected: VersionInfo{
 				AgentBranch: "stable/x.y",
 				// NOTE(dtantsur): this value will change on stable branches
-				InstalledVersion:       metal3api.VersionLatest,
+				InstalledVersion:       metal3api.Version300,
 				IronicImage:            "myorg/ironic:tag",
 				KeepalivedImage:        "myorg/keepalived:tag",
 				RamdiskDownloaderImage: "myorg/ramdisk-downloader:tag",

test/suite_test.go

@@ -869,10 +869,6 @@ var _ = Describe("Ironic object tests", func() {
 		testUpgrade("29.0", "30.0", apiVersionIn290, apiVersionIn300, namespace)
 	})
 
-	It("creates Ironic 30.0 and upgrades to latest", Label("v300-to-latest", "upgrade"), func() {
-		testUpgrade("30.0", "latest", apiVersionIn300, "", namespace)
-	})
-
 	It("refuses to downgrade Ironic with a database", Label("no-db-downgrade", "upgrade"), func() {
 		helpers.SkipIfCustomImage()
 
@@ -911,10 +907,6 @@ var _ = Describe("Ironic object tests", func() {
 		testUpgradeHA("29.0", "30.0", apiVersionIn290, apiVersionIn300, namespace)
 	})
 
-	It("creates Ironic 30.0 with HA and upgrades to latest", Label("ha-v300-to-latest", "ha", "upgrade"), func() {
-		testUpgradeHA("30.0", "latest", apiVersionIn300, "", namespace)
-	})
-
 	It("creates Ironic with keepalived and DHCP", Label("keepalived-dnsmasq"), func() {
 		name := types.NamespacedName{
 			Name:      "test-ironic",