From e057c394178f084945fde90dc92ba77da3cc8072 Mon Sep 17 00:00:00 2001 From: Jayesh Srivastava Date: Mon, 2 Dec 2024 14:33:08 +0530 Subject: [PATCH 1/2] PCP-3833: Update golang builder image --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b2b9b42a38..8f020644f1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # Build the manager binary ARG BUILDER_GOLANG_VERSION # First stage: build the executable. -FROM --platform=$TARGETPLATFORM gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine as toolchain +FROM --platform=$TARGETPLATFORM us-docker.pkg.dev/palette-images/build-base-images/golang:${BUILDER_GOLANG_VERSION}-alpine as toolchain # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy ARG goproxy=https://proxy.golang.org ENV GOPROXY=$goproxy diff --git a/Makefile b/Makefile index 755e3492e7c..731bcb75d92 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ ETCD=$(TOOLS_BIN_DIR)/etcd # Define Docker related variables. Releases should modify and double check these vars. # Fips Flags FIPS_ENABLE ?= "" -BUILDER_GOLANG_VERSION ?= 1.22 +BUILDER_GOLANG_VERSION ?= 1.23 BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION} RELEASE_LOC := release From cf776a9356cf617e541f527ef8bcf05b42e33ea8 Mon Sep 17 00:00:00 2001 From: Jayesh Srivastava Date: Fri, 6 Dec 2024 20:41:36 +0530 Subject: [PATCH 2/2] Update registry in spectro-release.yaml --- .github/workflows/spectro-release.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/spectro-release.yaml b/.github/workflows/spectro-release.yaml index 4830447fa47..32bac624ded 100644 --- a/.github/workflows/spectro-release.yaml +++ b/.github/workflows/spectro-release.yaml @@ -21,8 +21,8 @@ jobs: # Ensure that the credentials are provided as encrypted secrets env: SPECTRO_VERSION: ${{ github.event.inputs.release_version }} - LEGACY_REGISTRY: gcr.io/spectro-images-public/release/cluster-api-azure - FIPS_REGISTRY: gcr.io/spectro-images-public/release-fips/cluster-api-azure + LEGACY_REGISTRY: us-docker.pkg.dev/palette-images/palette/cluster-api-azure + FIPS_REGISTRY: us-docker.pkg.dev/palette-images-fips/palette/cluster-api-azure steps: - uses: mukunku/tag-exists-action@v1.2.0 @@ -37,8 +37,8 @@ jobs: - if: ${{ github.event.inputs.rel_type == 'rc' }} run: | - echo "LEGACY_REGISTRY=gcr.io/spectro-dev-public/release/cluster-api-azure" >> $GITHUB_ENV - echo "FIPS_REGISTRY=gcr.io/spectro-dev-public/release-fips/cluster-api-azure" >> $GITHUB_ENV + echo "LEGACY_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev/cluster-api-azure" >> $GITHUB_ENV + echo "FIPS_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev-fips/cluster-api-azure" >> $GITHUB_ENV - name: Install SSH key for remote docker build uses: shimataro/ssh-key-action@v2 @@ -58,6 +58,13 @@ jobs: registry: ${{ secrets.REGISTRY_URL }} username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_PASSWORD }} + - + name: Login to dev private registry + uses: docker/login-action@v1 + with: + registry: ${{ secrets.DEV_REGISTRY_URL }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} - name: Build Image env: