Skip to content

Commit f132e39

Browse files
author
AOS Automation Release Team
committed
Updating ose-machine-api-provider-azure-container image to be consistent with ART for 4.17
Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-machine-api-provider-azure.yml
1 parent b323c29 commit f132e39

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.21-openshift-4.16
4+
tag: rhel-9-release-golang-1.22-openshift-4.17

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
15+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1616
WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
1717
COPY . .
1818
# VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
1919
RUN unset VERSION \
2020
&& GOPROXY=off NO_DOCKER=1 make build
2121

22-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
22+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
2323
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
2424
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /
2525

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/openshift/machine-api-provider-azure
22

3-
go 1.21
3+
go 1.22
44

5-
toolchain go1.21.0
5+
toolchain go1.22.1
66

77
require (
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible

0 commit comments

Comments
 (0)