diff --git a/.github/workflows/spectro-release.yaml b/.github/workflows/spectro-release.yaml index cdea0222..b6d65e45 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/kube-vip - FIPS_REGISTRY: gcr.io/spectro-images-public/release-fips/kube-vip + LEGACY_REGISTRY: us-docker.pkg.dev/palette-images/palette/kube-vip + FIPS_REGISTRY: us-docker.pkg.dev/palette-images-fips/palette/kube-vip 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/kube-vip" >> $GITHUB_ENV - echo "FIPS_REGISTRY=gcr.io/spectro-dev-public/release-fips/kube-vip" >> $GITHUB_ENV + echo "LEGACY_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev/kube-vip" >> $GITHUB_ENV + echo "FIPS_REGISTRY=us-east1-docker.pkg.dev/spectro-images/dev-fips/kube-vip" >> $GITHUB_ENV - uses: actions/checkout@v3 - @@ -51,6 +51,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: diff --git a/Dockerfile b/Dockerfile index a5e7de92..27645be8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental ARG BUILDER_GOLANG_VERSION # First stage: build the executable. -FROM --platform=$TARGETPLATFORM gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine as dev +FROM --platform=$TARGETPLATFORM us-docker.pkg.dev/palette-images/build-base-images/golang:${BUILDER_GOLANG_VERSION}-alpine as dev # FIPS ARG CRYPTO_LIB diff --git a/Makefile b/Makefile index 9ee6aeff..820b094d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ TARGET := kube-vip # 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 diff --git a/go.mod b/go.mod index e046c73d..b0de9171 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/mdlayher/ndp v1.0.1 github.com/onsi/ginkgo/v2 v2.13.0 github.com/onsi/gomega v1.30.0 - github.com/osrg/gobgp/v3 v3.19.0 + github.com/osrg/gobgp/v3 v3.20.0 github.com/packethost/packngo v0.30.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 diff --git a/go.sum b/go.sum index 95c1d7ab..d3a53b9b 100644 --- a/go.sum +++ b/go.sum @@ -295,8 +295,8 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/osrg/gobgp/v3 v3.19.0 h1:SHjeu707EVp5h2LR8qLxDz/PzFU6oO+jhquGzGsigTI= -github.com/osrg/gobgp/v3 v3.19.0/go.mod h1:TszzyYD/31jXlljifRhxFEmPsITEloZmGU5CTN21W18= +github.com/osrg/gobgp/v3 v3.20.0 h1:U0dhaAo0QHscQQ+vTrnX2Rak9vaKnJ3aQDM5mAEeIEw= +github.com/osrg/gobgp/v3 v3.20.0/go.mod h1:4fbscYpsCk14EO16nTWAdJyErO4MbAZ2zLJmsmeXu/k= github.com/packethost/packngo v0.30.0 h1:JVeTwbXXETsLTDQncUbYwIFpkOp/xevXrffM2HrFECI= github.com/packethost/packngo v0.30.0/go.mod h1:BT/XcdwLVmeMtGPbovnxCpnI1s9ylSE1cs/7pq007NE= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=