diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml index f3f45c70477..1a00d70fd2d 100644 --- a/.github/workflows/ci-go.yml +++ b/.github/workflows/ci-go.yml @@ -43,5 +43,5 @@ jobs: - run: | go mod vendor - go mod tidy -compat=1.18 + go mod tidy -compat=1.20 hack/ci-utils/isClean.sh diff --git a/.golangci.yml b/.golangci.yml index 395a05368cc..16bf664b528 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -10,7 +10,7 @@ run: - "containers_image_openpgp" - "exclude_graphdriver_devicemapper" - "exclude_graphdriver_btrfs" - go: "1.18" + go: "1.20" issues: max-same-issues: 0 diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml index e5964156ce0..3564656b43d 100644 --- a/.pipelines/ci.yml +++ b/.pipelines/ci.yml @@ -22,7 +22,7 @@ pr: resources: containers: - container: golang - image: registry.access.redhat.com/ubi8/go-toolset:1.18.10 + image: registry.access.redhat.com/ubi8/go-toolset:1.20.10 options: --user=0 - container: python image: registry.access.redhat.com/ubi8/python-39:latest diff --git a/.pipelines/clean-subscription.yml b/.pipelines/clean-subscription.yml index aadc509bcb5..b4516bafbb2 100644 --- a/.pipelines/clean-subscription.yml +++ b/.pipelines/clean-subscription.yml @@ -9,7 +9,7 @@ parameters: resources: containers: - container: golang - image: registry.access.redhat.com/ubi8/go-toolset:1.18 + image: registry.access.redhat.com/ubi8/go-toolset:1.20 options: --user=0 variables: diff --git a/.pipelines/onebranch/pipeline.buildrp.official.yml b/.pipelines/onebranch/pipeline.buildrp.official.yml index dbea6399890..b95d8ba98c7 100644 --- a/.pipelines/onebranch/pipeline.buildrp.official.yml +++ b/.pipelines/onebranch/pipeline.buildrp.official.yml @@ -14,7 +14,7 @@ pr: none variables: Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io - LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.18.4 # Docker image which is used to build the project https://aka.ms/obpipelines/containers + LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.10 # Docker image which is used to build the project https://aka.ms/obpipelines/containers Debian_Frontend: noninteractive resources: diff --git a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml index fd1153075c9..62df20d5cb9 100644 --- a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml +++ b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml @@ -14,7 +14,7 @@ pr: none variables: Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io - LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.18.4 # Docker image which is used to build the project https://aka.ms/obpipelines/containers + LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.10 # Docker image which is used to build the project https://aka.ms/obpipelines/containers Debian_Frontend: noninteractive resources: diff --git a/Dockerfile.aro-e2e b/Dockerfile.aro-e2e index 2588bd071ff..23b575fe12b 100644 --- a/Dockerfile.aro-e2e +++ b/Dockerfile.aro-e2e @@ -1,7 +1,7 @@ # Uses a multi-stage container build to build the RP & E2E components. # ARG REGISTRY -FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder +FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 AS builder USER root ENV GOPATH=/root/go diff --git a/Dockerfile.aro-multistage b/Dockerfile.aro-multistage index 09fff864199..148f32ad4f3 100644 --- a/Dockerfile.aro-multistage +++ b/Dockerfile.aro-multistage @@ -1,7 +1,7 @@ # Uses a multi-stage container build to build the RP. # ARG REGISTRY -FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder +FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 AS builder USER root ENV GOPATH=/root/go diff --git a/Dockerfile.ci b/Dockerfile.ci index 3a079f3cd90..e6e723b3ebd 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,5 +1,5 @@ ARG REGISTRY -FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 +FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 USER root ENV GOPATH=/root/go diff --git a/Dockerfile.gatekeeper b/Dockerfile.gatekeeper index 2d66e721a28..1321b691b98 100644 --- a/Dockerfile.gatekeeper +++ b/Dockerfile.gatekeeper @@ -1,5 +1,5 @@ ARG REGISTRY -FROM ${REGISTRY}/ubi8/go-toolset:1.18.10-1 AS builder +FROM ${REGISTRY}/ubi8/go-toolset:1.20.10-1 AS builder ARG GATEKEEPER_VERSION ENV DOWNLOAD_URL=https://github.com/open-policy-agent/gatekeeper/archive/${GATEKEEPER_VERSION}.tar.gz @@ -29,4 +29,4 @@ ENTRYPOINT ["/manager"] USER ${USER_UID} LABEL io.openshift.managed.name="guardrails-operator" \ - io.openshift.managed.description="Operator to enforce guardrails policies for Openshift version 4 clusters" + io.openshift.managed.description="Operator to enforce guardrails policies for Openshift version 4 clusters" diff --git a/Dockerfile.proxy b/Dockerfile.proxy index 0b928354476..df435586616 100644 --- a/Dockerfile.proxy +++ b/Dockerfile.proxy @@ -1,7 +1,7 @@ # Uses a multi-stage container build to build the proxy # ARG REGISTRY -FROM ${REGISTRY}/ubi8/go-toolset:1.18.10 AS builder +FROM ${REGISTRY}/ubi8/go-toolset:1.20.10 AS builder USER root ENV GOPATH=/root/go RUN mkdir -p /app diff --git a/go.mod b/go.mod index 9e0dfcd5e28..6d996836d76 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/ARO-RP -go 1.18 +go 1.20 require ( github.com/Azure/azure-sdk-for-go v63.1.0+incompatible diff --git a/pkg/containerinstall/install_test.go b/pkg/containerinstall/install_test.go index d4f0ccf18ba..620a7e62fa3 100644 --- a/pkg/containerinstall/install_test.go +++ b/pkg/containerinstall/install_test.go @@ -27,7 +27,7 @@ import ( testlog "github.com/Azure/ARO-RP/test/util/log" ) -const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.18.10" +const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.20.10" var _ = Describe("Podman", Ordered, func() { var err error