diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 393a82639..1e59c02c2 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/Dockerfile b/Dockerfile index 669e7bb2c..965dbd5e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ # Build the manager binary -FROM registry.access.redhat.com/ubi8/go-toolset:1.22 as builder +FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder + +WORKDIR /opt/app-root/src # Copy the go source COPY main.go main.go @@ -10,11 +12,11 @@ COPY go.mod go.mod COPY go.sum go.sum # Build -RUN GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o /usr/bin/manager main.go +RUN GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o manager main.go -FROM registry.redhat.io/rhel8-6-els/rhel:latest WORKDIR / -COPY --from=builder /usr/bin/manager . +FROM registry.access.redhat.com/ubi9/ubi:latest +COPY --from=builder /opt/app-root/src/manager . USER 65532:65532 diff --git a/bundle/manifests/aws-load-balancer-operator.clusterserviceversion.yaml b/bundle/manifests/aws-load-balancer-operator.clusterserviceversion.yaml index 7f1ff4e12..1cfd3a51a 100644 --- a/bundle/manifests/aws-load-balancer-operator.clusterserviceversion.yaml +++ b/bundle/manifests/aws-load-balancer-operator.clusterserviceversion.yaml @@ -287,7 +287,7 @@ spec: - /manager env: - name: RELATED_IMAGE_CONTROLLER - value: quay.io/aws-load-balancer-operator/aws-load-balancer-controller:latest + value: quay.io/rh-ee-gpiotrow/aws-load-balancer-controller:07.03.1856 - name: TARGET_NAMESPACE valueFrom: fieldRef: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index f106d5d79..93b795069 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -79,7 +79,7 @@ spec: - name: RELATED_IMAGE_CONTROLLER # Use "latest" floating tag to avoid problems with the prunning of older mirorred images. # Ref: https://issues.redhat.com/browse/OCPBUGS-57339. - value: quay.io/aws-load-balancer-operator/aws-load-balancer-controller:latest + value: quay.io/rh-ee-gpiotrow/aws-load-balancer-controller:07.03.1856 - name: TARGET_NAMESPACE valueFrom: fieldRef: diff --git a/drift-cache/Dockerfile b/drift-cache/Dockerfile index 669e7bb2c..965dbd5e2 100644 --- a/drift-cache/Dockerfile +++ b/drift-cache/Dockerfile @@ -1,5 +1,7 @@ # Build the manager binary -FROM registry.access.redhat.com/ubi8/go-toolset:1.22 as builder +FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder + +WORKDIR /opt/app-root/src # Copy the go source COPY main.go main.go @@ -10,11 +12,11 @@ COPY go.mod go.mod COPY go.sum go.sum # Build -RUN GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o /usr/bin/manager main.go +RUN GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o manager main.go -FROM registry.redhat.io/rhel8-6-els/rhel:latest WORKDIR / -COPY --from=builder /usr/bin/manager . +FROM registry.access.redhat.com/ubi9/ubi:latest +COPY --from=builder /opt/app-root/src/manager . USER 65532:65532