Skip to content

Commit

Permalink
Merge pull request #342 from gardener/gcr-to-ar
Browse files Browse the repository at this point in the history
switch GCR -> Artifact-Registry
  • Loading branch information
MartinWeindel authored Dec 18, 2023
2 parents 857ce3a + c48a77d commit 1b7170a
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 15 deletions.
28 changes: 26 additions & 2 deletions .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ external-dns-management:
publish:
dockerimages:
dns-controller-manager:
image: europe-docker.pkg.dev/gardener-project/snapshots/dns-controller-manager
dockerfile: build/Dockerfile
image: eu.gcr.io/gardener-project/dns-controller-manager
inputs:
repos:
source: null
Expand All @@ -25,32 +25,44 @@ external-dns-management:
version:
inject_effective_version: true
preprocess: inject-branch-name
component_descriptor: ~
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots

jobs:
head-update:
traits:
version:
preprocess: inject-commit-hash
component_descriptor:
ocm_repository_mappings:
- repository: europe-docker.pkg.dev/gardener-project/releases
retention_policy: 'clean-snapshots'
draft_release: ~
draft_release: null

pull-request:
traits:
pull-request: null
component_descriptor:
ocm_repository_mappings:
- repository: europe-docker.pkg.dev/gardener-project/releases
version:
preprocess: inject-commit-hash

release:
traits:
version:
preprocess: 'finalize'
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/releases
release:
nextversion: 'bump_minor'
next_version_callback: '.ci/prepare_release'
release_callback: '.ci/prepare_release'
publish:
dockerimages:
dns-controller-manager:
image: europe-docker.pkg.dev/gardener-project/releases/dns-controller-manager
slack:
default_channel: 'internal_scp_workspace'
channel_cfgs:
Expand All @@ -62,10 +74,16 @@ external-dns-management:
traits:
version:
preprocess: finalize
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/releases
release:
nextversion: bump_patch
next_version_callback: '.ci/prepare_release'
release_callback: '.ci/prepare_release'
publish:
dockerimages:
dns-controller-manager:
image: europe-docker.pkg.dev/gardener-project/releases/dns-controller-manager
slack:
channel_cfgs:
internal_scp_workspace:
Expand All @@ -78,6 +96,12 @@ external-dns-management:
release:
nextversion: noop
release_callback: .ci/prepare_release
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/releases
publish:
dockerimages:
dns-controller-manager:
image: europe-docker.pkg.dev/gardener-project/releases/dns-controller-manager
slack:
channel_cfgs:
internal_scp_workspace:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REGISTRY := eu.gcr.io/gardener-project
REGISTRY := europe-docker.pkg.dev/gardener-project/public
EXECUTABLE := dns-controller-manager
PROJECT := github.com/gardener/external-dns-management
IMAGE_REPOSITORY := $(REGISTRY)/dns-controller-manager
Expand Down
2 changes: 1 addition & 1 deletion charts/external-dns-management/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fullnameOverride: dns-controller-manager
replicaCount: 1

image:
repository: eu.gcr.io/gardener-project/dns-controller-manager
repository: europe-docker.pkg.dev/gardener-project/public/dns-controller-manager
tag: v0.16.1-master
pullPolicy: IfNotPresent

Expand Down
10 changes: 1 addition & 9 deletions hack/.ci/component_descriptor
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [[ -f "$repo_root_dir/charts/images.yaml" ]]; then
# the konnectivity-server is temporary excluded until the component-descriptor for the replica-reloader is released
component-cli image-vector add --comp-desc ${BASE_DEFINITION_PATH} \
--image-vector "$repo_root_dir/charts/images.yaml" \
--component-prefixes eu.gcr.io/gardener-project/gardener \
--component-prefixes europe-docker.pkg.dev/gardener-project \
--exclude-component-reference konnectivity-server \
--generic-dependencies hyperkube,kube-apiserver,kube-controller-manager,kube-scheduler,kube-proxy
fi
Expand All @@ -39,14 +39,6 @@ if [[ -d "$repo_root_dir/charts/" ]]; then
REPOSITORY=${imageAndTag[0]}
TAG=${imageAndTag[1]}

gardener="eu.gcr.io/gardener-project/gardener"
if [[ "$NAME" == "hyperkube" ]]; then
${ADD_DEPENDENCIES_CMD} --generic-dependencies "{\"name\": \"$NAME\", \"version\": \"$TAG\"}"
elif [[ $REPOSITORY =~ "eu.gcr.io/gardener-project/gardener"* ]]; then
${ADD_DEPENDENCIES_CMD} --generic-dependencies "{\"name\": \"$NAME\", \"version\": \"$TAG\"}"
else
${ADD_DEPENDENCIES_CMD} --container-image-dependencies "{\"name\": \"${NAME}\", \"image_reference\": \"${REPOSITORY}:${TAG}\", \"version\": \"$TAG\"}"
fi
done < <(echo "$outputFile")
done
fi
Expand Down
2 changes: 1 addition & 1 deletion hack/get-cd-registry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

set -e

echo "eu.gcr.io/sap-se-gcr-k8s-private/cnudie/gardener/development"
echo "europe-docker.pkg.dev/gardener-project/releases"
2 changes: 1 addition & 1 deletion hack/get-image-registry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

set -e

echo "eu.gcr.io/gardener-project"
echo "europe-docker.pkg.dev/gardener-project/public"

0 comments on commit 1b7170a

Please sign in to comment.