From 32a747a5b2c034b0a0f74362c5aae7849c1ed5d3 Mon Sep 17 00:00:00 2001 From: dkwon17 Date: Mon, 2 Dec 2024 17:51:24 -0500 Subject: [PATCH] Update images to ubi9 Signed-off-by: dkwon17 --- build/Dockerfile | 8 ++++---- .../devworkspace-operator.clusterserviceversion.yaml | 4 ++-- deploy/deployment/kubernetes/combined.yaml | 2 +- .../devworkspace-controller-manager.Deployment.yaml | 2 +- deploy/deployment/openshift/combined.yaml | 2 +- .../devworkspace-controller-manager.Deployment.yaml | 2 +- .../templates/components/csv/clusterserviceversion.yaml | 2 +- deploy/templates/components/manager/manager.yaml | 2 +- project-clone/Dockerfile | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1701afff4..b1d342c71 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -13,8 +13,8 @@ # limitations under the License. # -# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/go-toolset -FROM registry.access.redhat.com/ubi8/go-toolset:1.22.7-5 as builder +# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset +FROM registry.access.redhat.com/ubi9/go-toolset:1.22.7-1733160835 as builder ENV GOPATH=/go/ USER root WORKDIR /devworkspace-operator @@ -33,8 +33,8 @@ COPY . . RUN make compile-devworkspace-controller RUN make compile-webhook-server -# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal -FROM registry.access.redhat.com/ubi8-minimal:8.10-1130 +# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9-minimal +FROM registry.access.redhat.com/ubi9-minimal:9.5-1731593028 RUN microdnf -y update && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages" WORKDIR / COPY --from=builder /devworkspace-operator/_output/bin/devworkspace-controller /usr/local/bin/devworkspace-controller diff --git a/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml b/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml index a3ba636db..873e312e6 100644 --- a/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml +++ b/deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml @@ -368,7 +368,7 @@ spec: - name: WEBHOOKS_SERVER_CPU_REQUEST value: 100m - name: RELATED_IMAGE_pvc_cleanup_job - value: registry.access.redhat.com/ubi8-micro:8.8-1 + value: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 - name: RELATED_IMAGE_async_storage_server value: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 - name: RELATED_IMAGE_async_storage_sidecar @@ -485,7 +485,7 @@ spec: name: kube_rbac_proxy - image: quay.io/devfile/project-clone:next name: project_clone - - image: registry.access.redhat.com/ubi8-micro:8.8-1 + - image: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 name: pvc_cleanup_job - image: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 name: async_storage_server diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index fa7c1a439..8722a46cc 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -25229,7 +25229,7 @@ spec: - name: WEBHOOKS_SERVER_CPU_REQUEST value: 100m - name: RELATED_IMAGE_pvc_cleanup_job - value: registry.access.redhat.com/ubi8-micro:8.8-1 + value: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 - name: RELATED_IMAGE_async_storage_server value: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 - name: RELATED_IMAGE_async_storage_sidecar diff --git a/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml b/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml index 12c392f96..ec6887730 100644 --- a/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml +++ b/deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml @@ -55,7 +55,7 @@ spec: - name: WEBHOOKS_SERVER_CPU_REQUEST value: 100m - name: RELATED_IMAGE_pvc_cleanup_job - value: registry.access.redhat.com/ubi8-micro:8.8-1 + value: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 - name: RELATED_IMAGE_async_storage_server value: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 - name: RELATED_IMAGE_async_storage_sidecar diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 2158743be..d19719998 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -25231,7 +25231,7 @@ spec: - name: WEBHOOKS_SERVER_CPU_REQUEST value: 100m - name: RELATED_IMAGE_pvc_cleanup_job - value: registry.access.redhat.com/ubi8-micro:8.8-1 + value: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 - name: RELATED_IMAGE_async_storage_server value: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 - name: RELATED_IMAGE_async_storage_sidecar diff --git a/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml b/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml index b8f46ab29..729c287a7 100644 --- a/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml +++ b/deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml @@ -55,7 +55,7 @@ spec: - name: WEBHOOKS_SERVER_CPU_REQUEST value: 100m - name: RELATED_IMAGE_pvc_cleanup_job - value: registry.access.redhat.com/ubi8-micro:8.8-1 + value: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 - name: RELATED_IMAGE_async_storage_server value: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 - name: RELATED_IMAGE_async_storage_sidecar diff --git a/deploy/templates/components/csv/clusterserviceversion.yaml b/deploy/templates/components/csv/clusterserviceversion.yaml index 88722ee04..227d1c986 100644 --- a/deploy/templates/components/csv/clusterserviceversion.yaml +++ b/deploy/templates/components/csv/clusterserviceversion.yaml @@ -103,7 +103,7 @@ spec: name: kube_rbac_proxy - image: quay.io/devfile/project-clone:next name: project_clone - - image: registry.access.redhat.com/ubi8-micro:8.8-1 + - image: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338 name: pvc_cleanup_job - image: quay.io/eclipse/che-workspace-data-sync-storage:0.0.1 name: async_storage_server diff --git a/deploy/templates/components/manager/manager.yaml b/deploy/templates/components/manager/manager.yaml index 6992af142..499d06e15 100644 --- a/deploy/templates/components/manager/manager.yaml +++ b/deploy/templates/components/manager/manager.yaml @@ -85,7 +85,7 @@ spec: - name: RELATED_IMAGE_devworkspace_webhook_server value: "quay.io/devfile/devworkspace-controller:next" - name: RELATED_IMAGE_pvc_cleanup_job - value: "registry.access.redhat.com/ubi8-micro:8.8-1" + value: "registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338" - name: RELATED_IMAGE_async_storage_server value: "quay.io/eclipse/che-workspace-data-sync-storage:0.0.1" - name: RELATED_IMAGE_async_storage_sidecar diff --git a/project-clone/Dockerfile b/project-clone/Dockerfile index f021a16aa..7d11fce67 100644 --- a/project-clone/Dockerfile +++ b/project-clone/Dockerfile @@ -14,8 +14,8 @@ # # Build the manager binary -# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/go-toolset -FROM registry.access.redhat.com/ubi8/go-toolset:1.22.7-5 as builder +# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset +FROM registry.access.redhat.com/ubi9/go-toolset:1.22.7-1733160835 as builder ENV GOPATH=/go/ USER root WORKDIR /project-clone @@ -36,8 +36,8 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \ -asmflags all=-trimpath=/ \ project-clone/main.go -# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal -FROM registry.access.redhat.com/ubi8-minimal:8.10-1130 +# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9-minimal +FROM registry.access.redhat.com/ubi9-minimal:9.5-1731593028 RUN microdnf -y update && microdnf install -y time git git-lfs && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages" WORKDIR / COPY --from=builder /project-clone/_output/bin/project-clone /usr/local/bin/project-clone