Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-JIRA: Move to 4.19 on go1.23 #333

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −15
Open

NO-JIRA: Move to 4.19 on go1.23 #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.22-openshift-4.18
tag: rhel-9-release-golang-1.23-openshift-4.19
4 changes: 2 additions & 2 deletions Dockerfile.aws-ebs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/aws-ebs-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/aws-ebs-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift AWS EBS CSI Driver Operator" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.aws-efs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/aws-efs-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/aws-efs-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift AWS EFS CSI Driver Operator" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.azure-disk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make


FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/azure-disk-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/azure-disk-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift Azure Disk CSI Driver Operator" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.azure-file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make


FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/azure-file-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/azure-file-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift Azure File CSI Driver Operator" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.openstack-cinder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/openstack-cinder-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/openstack-cinder-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift OpenStack Cinder CSI Driver Operator" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.openstack-manila
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/openstack-manila-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/openstack-manila-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift OpenStack Manila CSI Driver Operator" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.samba
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/csi-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/smb-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/smb-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift CIFS/SMB CSI Driver Operator" \
Expand Down