Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch GCR -> Artifact-Registry #688

Merged
merged 2 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ci/performance_regression_test
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ fi

ETCD_VERSION=${ETCD_VERSION:-"v3.4.13-bootstrap-1"}
if [ "$ETCD_VERSION" != "" ]; then
ETCD_IMAGE=${ETCD_IMAGE:-"eu.gcr.io/gardener-project/gardener/etcd:$ETCD_VERSION"}
ETCD_IMAGE=${ETCD_IMAGE:-"europe-docker.pkg.dev/gardener-project/public/gardener/etcd:$ETCD_VERSION"}
fi

if [ "$ETCDBR_VERSION" != "" ]; then
ETCDBR_IMAGE=${ETCDBR_IMAGE:-"eu.gcr.io/gardener-project/gardener/etcdbrctl:$ETCDBR_VERSION"}
ETCDBR_IMAGE=${ETCDBR_IMAGE:-"europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl:$ETCDBR_VERSION"}
fi

if [ -r "$PERF_TEST_KUBECONFIG" ]; then
Expand All @@ -62,4 +62,4 @@ set -e

echo "Done with performance regression tests."

exit $TEST_RESULT
exit $TEST_RESULT
20 changes: 13 additions & 7 deletions .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,22 @@ etcd-backup-restore:
- --testrun-prefix=playground
- --set=projectNamespace=garden-it

template: 'default'
base_definition:
repo: ~
traits:
version:
preprocess:
'inject-commit-hash'
inject_effective_version: true
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots
publish:
oci-builder: docker-buildx
platforms:
- linux/amd64
- linux/arm64
dockerimages:
etcdbrctl:
registry: 'gcr-readwrite'
image: 'eu.gcr.io/gardener-project/gardener/etcdbrctl'
image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/etcdbrctl
dockerfile: 'build/Dockerfile'
inputs:
repos:
Expand All @@ -55,23 +54,31 @@ etcd-backup-restore:
unit_test:
image: 'golang:1.20.3'
integration_test:
image: 'eu.gcr.io/gardener-project/gardener/testmachinery/base-step:stable'
image: europe-docker.pkg.dev/gardener-project/releases/testmachinery/base-step:stable
build:
image: 'golang:1.20.3'
output_dir: 'binary'

jobs:
head-update:
traits:
component_descriptor: ~
draft_release: ~
component_descriptor:
ocm_repository_mappings:
- repository: europe-docker.pkg.dev/gardener-project/releases
pull-request:
traits:
pull-request: ~
release:
traits:
version:
preprocess: 'finalize'
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/releases
publish:
dockerimages:
etcdbrctl:
image: europe-docker.pkg.dev/gardener-project/releases/gardener/etcdbrctl
shreyas-s-rao marked this conversation as resolved.
Show resolved Hide resolved
release:
nextversion: 'bump_minor'
slack:
Expand All @@ -80,4 +87,3 @@ etcd-backup-restore:
internal_scp_workspace:
channel_name: 'C0177NLL8V9' # gardener-etcd
slack_cfg_name: 'scp_workspace'
component_descriptor: ~
2 changes: 1 addition & 1 deletion .test-defs/IntegrationTest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ spec:
args:
- >-
.ci/integration_test tm
image: eu.gcr.io/gardener-project/gardener/testmachinery/base-step:0.205.0
image: europe-docker.pkg.dev/gardener-project/releases/testmachinery/base-step:stable
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.

VERSION ?= $(shell cat VERSION)
REGISTRY ?= eu.gcr.io/gardener-project/gardener
IMAGE_REPOSITORY := $(REGISTRY)/etcdbrctl
REGISTRY ?= europe-docker.pkg.dev/gardener-project/public
IMAGE_REPOSITORY := $(REGISTRY)/gardener/etcdbrctl
IMAGE_TAG := $(VERSION)
BUILD_DIR := build
BIN_DIR := bin
Expand Down
4 changes: 2 additions & 2 deletions chart/etcd-backup-restore/values.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
images:
# etcd image to use
etcd:
repository: eu.gcr.io/gardener-project/gardener/etcd
repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcd
tag: v3.4.13-bootstrap-1
pullPolicy: IfNotPresent
# etcd-backup-restore image to use
etcdBackupRestore:
repository: eu.gcr.io/gardener-project/gardener/etcdbrctl
repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl
tag: v0.12.1
pullPolicy: IfNotPresent

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/getting_started.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Getting started

Currently we don't publish the binary build with the release, but it is pretty straight forward to build it by following the steps mentioned [here](../development/local_setup.md#build). But we do publish the docker image with each release, please check the [release page](https://github.com/gardener/etcd-backup-restore/releases) for the same. Currently, release docker images are pushed to `eu.gcr.io/gardener-project/gardener/etcdbrctl` to container registry.
Currently we don't publish the binary build with the release, but it is pretty straight forward to build it by following the steps mentioned [here](../development/local_setup.md#build). But we do publish the docker image with each release, please check the [release page](https://github.com/gardener/etcd-backup-restore/releases) for the same. Currently, release docker images are pushed to `europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl` to container registry.

## Usage

Expand Down