Azure
/
ARO-RP
зеркало из https://github.com/Azure/ARO-RP.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use Go 1.21.13 instead of 1.21.11 (Uber mockgen needs >= 1.21.12)

This commit is contained in:
kimorris27 2024-09-24 17:01:53 -05:00
Родитель 086f532624
Коммит a06aa0a3d2
12 изменённых файлов: 14 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
.github/workflows/ci-go.yml поставляемый
Просмотреть файл

@ -15,7 +15,7 @@ jobs:
ci-from-docker: ci-from-docker:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: registry.access.redhat.com/ubi8/go-toolset:1.21.11-1.1720406008 image: registry.access.redhat.com/ubi8/go-toolset:1.21.13-1
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -32,7 +32,7 @@ jobs:
vendor-check: vendor-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: registry.access.redhat.com/ubi8/go-toolset:1.21.11-1.1720406008 image: registry.access.redhat.com/ubi8/go-toolset:1.21.13-1
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -46,7 +46,7 @@ jobs:
generate-check: generate-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: registry.access.redhat.com/ubi8/go-toolset:1.21.11-1.1720406008 image: registry.access.redhat.com/ubi8/go-toolset:1.21.13-1
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4

2
.pipelines/clean-subscription.yml
Просмотреть файл

@ -9,7 +9,7 @@ parameters:
resources: resources:
containers: containers:
- container: golang - container: golang
image: registry.access.redhat.com/ubi8/go-toolset:1.21.11-1.1720406008 image: registry.access.redhat.com/ubi8/go-toolset:1.21.13-1
options: --user=0 options: --user=0
variables: variables:

2
.pipelines/onebranch/pipeline.buildrp.official.yml
Просмотреть файл

@ -14,7 +14,7 @@ pr: none
variables: variables:
Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io
LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.21.11-1.1720406008 # 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.21.13-1 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
Debian_Frontend: noninteractive Debian_Frontend: noninteractive
resources: resources:

2
.pipelines/onebranch/pipeline.buildrp.pullrequest.yml
Просмотреть файл

@ -14,7 +14,7 @@ pr: none
variables: variables:
Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io
LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.21.11-1.1720406008 # 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.21.13-1 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
Debian_Frontend: noninteractive Debian_Frontend: noninteractive
resources: resources:

2
Dockerfile.aro-e2e
Просмотреть файл

@ -1,7 +1,7 @@
# Uses a multi-stage container build to build the RP & E2E components. # Uses a multi-stage container build to build the RP & E2E components.
# #
ARG REGISTRY ARG REGISTRY
FROM ${REGISTRY}/ubi8/go-toolset:1.21.11-1.1720406008 AS builder FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
USER root USER root
ENV GOPATH=/root/go ENV GOPATH=/root/go

2
Dockerfile.aro-multistage
Просмотреть файл

@ -1,7 +1,7 @@
# Uses a multi-stage container build to build the RP. # Uses a multi-stage container build to build the RP.
# #
ARG REGISTRY ARG REGISTRY
FROM ${REGISTRY}/ubi8/go-toolset:1.21.11-1.1720406008 AS builder FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
USER root USER root
ENV GOPATH=/root/go ENV GOPATH=/root/go

2
Dockerfile.ci-rp
Просмотреть файл

@ -23,7 +23,7 @@ RUN npm run lint && npm run build
############################################################################### ###############################################################################
# Stage 2: Compile the Golang RP code # Stage 2: Compile the Golang RP code
############################################################################### ###############################################################################
FROM ${REGISTRY}/ubi8/go-toolset:1.21.11-1.1720406008 AS builder FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
ARG ARO_VERSION ARG ARO_VERSION
LABEL aro-builder=true LABEL aro-builder=true
USER root USER root

2
Dockerfile.ci-tunnel
Просмотреть файл

@ -1,7 +1,7 @@
ARG REGISTRY ARG REGISTRY
ARG ARO_VERSION ARG ARO_VERSION
FROM ${REGISTRY}/ubi8/go-toolset:1.21.11-1.1720406008 AS builder FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
ARG ARO_VERSION ARG ARO_VERSION
USER root USER root
WORKDIR /app WORKDIR /app

2
Dockerfile.gatekeeper
Просмотреть файл

@ -1,5 +1,5 @@
ARG REGISTRY ARG REGISTRY
FROM ${REGISTRY}/ubi8/go-toolset:1.21.11-1.1720406008 AS builder FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
ARG GATEKEEPER_VERSION ARG GATEKEEPER_VERSION
ENV DOWNLOAD_URL=https://github.com/open-policy-agent/gatekeeper/archive/${GATEKEEPER_VERSION}.tar.gz ENV DOWNLOAD_URL=https://github.com/open-policy-agent/gatekeeper/archive/${GATEKEEPER_VERSION}.tar.gz

2
Dockerfile.proxy
Просмотреть файл

@ -1,7 +1,7 @@
# Uses a multi-stage container build to build the proxy # Uses a multi-stage container build to build the proxy
# #
ARG REGISTRY ARG REGISTRY
FROM ${REGISTRY}/ubi8/go-toolset:1.21.11-1.1720406008 AS builder FROM ${REGISTRY}/ubi8/go-toolset:1.21.13-1 AS builder
USER root USER root
ENV GOPATH=/root/go ENV GOPATH=/root/go
RUN mkdir -p /app RUN mkdir -p /app

2
cmd/aro/mirror.go
Просмотреть файл

@ -104,7 +104,7 @@ func mirror(ctx context.Context, log *logrus.Entry) error {
"registry.access.redhat.com/ubi8/nodejs-18:latest", "registry.access.redhat.com/ubi8/nodejs-18:latest",
// https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1 // https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1
"registry.access.redhat.com/ubi8/go-toolset:1.21.11-1.1720406008", "registry.access.redhat.com/ubi8/go-toolset:1.21.13-1",
// https://quay.io/repository/app-sre/managed-upgrade-operator?tab=tags // https://quay.io/repository/app-sre/managed-upgrade-operator?tab=tags
// https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/data/services/osd-operators/cicd/saas/saas-managed-upgrade-operator.yaml?ref_type=heads // https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/data/services/osd-operators/cicd/saas/saas-managed-upgrade-operator.yaml?ref_type=heads

2
pkg/containerinstall/install_test.go
Просмотреть файл

@ -27,7 +27,7 @@ import (
testlog "github.com/Azure/ARO-RP/test/util/log" testlog "github.com/Azure/ARO-RP/test/util/log"
) )
const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.21.11-1.1720406008" const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.21.13-1"
var _ = Describe("Podman", Ordered, func() { var _ = Describe("Podman", Ordered, func() {
var err error var err error