Skip to content

Commit bb90f17

Browse files
Merge pull request #1786 from wangke19/art-consistency-openshift-4.19-ose-cluster-kube-apiserver-operator
OCPBUGS-45654: Updating ose-cluster-kube-apiserver-operator-container image to be consistent with ART for 4.19
2 parents fef044d + cb8d752 commit bb90f17

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.22-openshift-4.18
4+
tag: rhel-9-release-golang-1.23-openshift-4.19

Dockerfile.rhel7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-kube-apiserver-operator
33
COPY . .
44
ENV GO_PACKAGE github.com/openshift/cluster-kube-apiserver-operator
55
RUN make build --warn-undefined-variables
66

7-
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
7+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
88
COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/bindata/bootkube/bootstrap-manifests /usr/share/bootkube/manifests/bootstrap-manifests/
99
COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/bindata/bootkube/config /usr/share/bootkube/manifests/config/
1010
COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/bindata/bootkube/manifests /usr/share/bootkube/manifests/manifests/

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/cluster-kube-apiserver-operator
22

3-
go 1.22.0
3+
go 1.23.0
44

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

77
require (
88
github.com/apparentlymart/go-cidr v1.0.1

0 commit comments

Comments
 (0)