Skip to content

Commit 4de3221

Browse files
Merge pull request #473 from elfosardo/prepare-0.7
✨ Switch to Ironic 33.0 by default, prepare release-0.7
2 parents 6799a7e + 93e6b3b commit 4de3221

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ endif
7676

7777
# Image URL to use all building/pushing image targets
7878
IMG_NO_TAG ?= quay.io/metal3-io/ironic-standalone-operator
79-
IMG ?= $(IMG_NO_TAG):latest
79+
IMG ?= $(IMG_NO_TAG):release-0.7
8080

8181
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
8282
ifeq (,$(shell go env GOBIN))

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
envFrom:
4545
- configMapRef:
4646
name: ironic-standalone-operator-config
47-
image: quay.io/metal3-io/ironic-standalone-operator:latest
47+
image: quay.io/metal3-io/ironic-standalone-operator:release-0.7
4848
name: manager
4949
securityContext:
5050
allowPrivilegeEscalation: false

pkg/ironic/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313

1414
var (
1515
// NOTE(dtantsur): defaultVersion must be updated after branching.
16-
defaultVersion = metal3api.VersionLatest
16+
defaultVersion = metal3api.Version330
1717
defaultMariaDBImage = defaultRegistry + "/mariadb:latest"
1818
defaultRamdiskDownloaderImage = defaultRegistry + "/ironic-ipa-downloader:latest"
1919
defaultKeepalivedImage = defaultRegistry + "/keepalived:latest"

pkg/ironic/version_test.go

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func TestWithIronicOverrides(t *testing.T) {
2828

2929
Expected: VersionInfo{
3030
// NOTE(dtantsur): this value will change on stable branches
31-
InstalledVersion: metal3api.VersionLatest,
32-
IronicImage: "quay.io/metal3-io/ironic:latest",
31+
InstalledVersion: metal3api.Version330,
32+
IronicImage: "quay.io/metal3-io/ironic:release-33.0",
3333
KeepalivedImage: "quay.io/metal3-io/keepalived:latest",
3434
RamdiskDownloaderImage: "quay.io/metal3-io/ironic-ipa-downloader:latest",
3535
MariaDBImage: "quay.io/metal3-io/mariadb:latest",
@@ -52,7 +52,7 @@ func TestWithIronicOverrides(t *testing.T) {
5252
Expected: VersionInfo{
5353
AgentBranch: "stable/x.y",
5454
// NOTE(dtantsur): this value will change on stable branches
55-
InstalledVersion: metal3api.VersionLatest,
55+
InstalledVersion: metal3api.Version330,
5656
IronicImage: "myorg/ironic:tag",
5757
KeepalivedImage: "myorg/keepalived:tag",
5858
RamdiskDownloaderImage: "myorg/ramdisk-downloader:tag",
@@ -146,12 +146,6 @@ func TestPrometheusExporterVersionCheck(t *testing.T) {
146146
enabled: true,
147147
expectedError: "",
148148
},
149-
{
150-
name: "PrometheusExporter with latest version",
151-
version: metal3api.VersionLatest,
152-
enabled: true,
153-
expectedError: "",
154-
},
155149
}
156150

157151
for _, tc := range testCases {
@@ -204,11 +198,6 @@ func TestBMCCAVersionCheck(t *testing.T) {
204198
version: metal3api.Version320,
205199
expectedError: "",
206200
},
207-
{
208-
name: "BMCCA with latest version",
209-
version: metal3api.VersionLatest,
210-
expectedError: "",
211-
},
212201
{
213202
name: "BMCCA with version 31.0 (too old)",
214203
version: metal3api.Version310,

0 commit comments

Comments
 (0)