From bb69c08cdc13f1af6238cde7b52ee1e691a1f45d Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Thu, 16 Nov 2023 23:35:55 +0000 Subject: [PATCH 1/5] chore: Update from ubi8/go-toolset:1.19.10-16 to ubi8/go-toolset:1.20.10-3 Signed-off-by: Nick Boldt --- project-clone/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project-clone/Dockerfile b/project-clone/Dockerfile index 693c6d9a5..b9b32202f 100644 --- a/project-clone/Dockerfile +++ b/project-clone/Dockerfile @@ -15,7 +15,7 @@ # 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.19.10-16 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.20.10-3 as builder ENV GOPATH=/go/ USER root WORKDIR /project-clone From dbb98bca49a4c6d85531220dac6c1ea719a47d8d Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Thu, 16 Nov 2023 23:36:00 +0000 Subject: [PATCH 2/5] chore: Update from ubi8-minimal:8.8-1072 to ubi8-minimal:8.9-1029 Signed-off-by: Nick Boldt --- project-clone/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project-clone/Dockerfile b/project-clone/Dockerfile index b9b32202f..327cf1f33 100644 --- a/project-clone/Dockerfile +++ b/project-clone/Dockerfile @@ -37,7 +37,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \ 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.8-1072 +FROM registry.access.redhat.com/ubi8-minimal:8.9-1029 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 From 0cc40ee63770a86da13bc502f449df00448acbe5 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Thu, 16 Nov 2023 23:36:06 +0000 Subject: [PATCH 3/5] chore: Update from ubi8/go-toolset:1.19.10-16 to ubi8/go-toolset:1.20.10-3 Signed-off-by: Nick Boldt --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index f876380a6..89e5f1621 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -14,7 +14,7 @@ # # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/go-toolset -FROM registry.access.redhat.com/ubi8/go-toolset:1.19.10-16 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.20.10-3 as builder ENV GOPATH=/go/ USER root WORKDIR /devworkspace-operator From a5ba3be4fc7e76391af267b5031a1cbe92b9833e Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Thu, 16 Nov 2023 23:36:11 +0000 Subject: [PATCH 4/5] chore: Update from ubi8-minimal:8.8-1072 to ubi8-minimal:8.9-1029 Signed-off-by: Nick Boldt --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 89e5f1621..78c9c1773 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -34,7 +34,7 @@ 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.8-1072 +FROM registry.access.redhat.com/ubi8-minimal:8.9-1029 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 From 3764e2bd18da8a04a54a41c7043a95569aec5376 Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Fri, 17 Nov 2023 12:19:29 -0500 Subject: [PATCH 5/5] Update project to use Go 1.20 Signed-off-by: Angel Misevski --- .ci/oci.Dockerfile | 2 +- .github/workflows/code-coverage.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/oci.Dockerfile b/.ci/oci.Dockerfile index 295e29e8a..a2f48bc9a 100644 --- a/.ci/oci.Dockerfile +++ b/.ci/oci.Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # -FROM registry.ci.openshift.org/openshift/release:golang-1.19 +FROM registry.ci.openshift.org/openshift/release:golang-1.20 SHELL ["/bin/bash", "-c"] diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index ee1b56e18..ed52f5521 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -14,7 +14,7 @@ jobs: name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: 1.19.10 + go-version: 1.20.10 - name: Set up Python 3.11 uses: actions/setup-python@v4 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f45a4d6a4..5da7d6e8f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,7 +15,7 @@ jobs: name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: 1.19.10 + go-version: 1.20.10 - name: Set up Python 3.11 uses: actions/setup-python@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 627e67ec4..d783553bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: 1.19.10 + go-version: 1.20.10 - name: Clone source code uses: actions/checkout@v3 diff --git a/go.mod b/go.mod index 52189270f..dcc4b0bfb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/devfile/devworkspace-operator -go 1.19 +go 1.20 require ( github.com/devfile/api/v2 v2.2.2