diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index 3b22ca49..daf585a9 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -1,11 +1,11 @@ logging: - template: 'default' base_definition: - repo: ~ traits: version: preprocess: 'inject-commit-hash' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots publish: oci-builder: docker-buildx platforms: @@ -13,8 +13,7 @@ logging: - linux/arm64 dockerimages: fluent-bit-to-vali: - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/fluent-bit-to-vali' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/fluent-bit-to-vali dockerfile: './Dockerfile' target: fluent-bit-plugin resource_labels: @@ -32,8 +31,7 @@ logging: - type: 'githubTeam' teamname: 'gardener/logging-maintainers' vali-curator: - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/vali-curator' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/vali-curator dockerfile: './Dockerfile' target: curator resource_labels: @@ -50,8 +48,7 @@ logging: - type: 'githubTeam' teamname: 'gardener/logging-maintainers' telegraf-iptables: - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/telegraf-iptables' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/telegraf-iptables dockerfile: './Dockerfile' target: telegraf resource_labels: @@ -69,8 +66,7 @@ logging: - type: 'githubTeam' teamname: 'gardener/logging-maintainers' event-logger: - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/event-logger' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/event-logger dockerfile: './Dockerfile' target: event-logger resource_labels: @@ -87,8 +83,7 @@ logging: - type: 'githubTeam' teamname: 'gardener/logging-maintainers' tune2fs: - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/tune2fs' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/tune2fs dockerfile: './Dockerfile' target: tune2fs resource_labels: @@ -107,10 +102,9 @@ logging: steps: verify: image: 'golang:1.20.4' + jobs: - head-update: - traits: - component_descriptor: ~ + head-update: ~ pull-request: traits: pull-request: ~ @@ -118,9 +112,22 @@ logging: traits: version: preprocess: 'finalize' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/releases + publish: + dockerimages: + fluent-bit-to-vali: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/fluent-bit-to-vali + vali-curator: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/vali-curator + telegraf-iptables: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/telegraf-iptables + event-logger: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/event-logger + tune2fs: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/tune2fs release: nextversion: 'bump_patch' - component_descriptor: ~ slack: default_channel: "internal_scp_workspace" channel_cfgs: diff --git a/Makefile b/Makefile index a055e664..31abc7ff 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) VERSION := $(shell cat VERSION) -REGISTRY ?= eu.gcr.io/gardener-project/gardener +REGISTRY ?= europe-docker.pkg.dev/gardener-project/public/gardener FLUENT_BIT_TO_VALI_IMAGE_REPOSITORY := $(REGISTRY)/fluent-bit-to-vali VALI_CURATOR_IMAGE_REPOSITORY := $(REGISTRY)/vali-curator TELEGRAF_IMAGE_REPOSITORY := $(REGISTRY)/telegraf-iptables diff --git a/hack/load-container-images.sh b/hack/load-container-images.sh index e567a371..225b5027 100755 --- a/hack/load-container-images.sh +++ b/hack/load-container-images.sh @@ -34,7 +34,7 @@ target="$repo_root/gardener/charts/images.yaml" for img in "${images[@]}"; do # tag "latest "container image if exists - container_image="eu.gcr.io/gardener-project/gardener/${img}:latest" + container_image="europe-docker.pkg.dev/gardener-project/public/gardener/${img}:latest" if [[ "exists" == $(__check_container_image ${container_image}) ]]; then docker tag ${container_image} ${img}:${version} else diff --git a/hack/update_chart_images.sh b/hack/update_chart_images.sh index ac607119..4a0718bf 100755 --- a/hack/update_chart_images.sh +++ b/hack/update_chart_images.sh @@ -4,76 +4,76 @@ dir="$(dirname "$0")" source "$dir/.includes.sh" -# Change the image of the loggings in the fetched gardener repo +# Change the image of the loggings in the fetched gardener repo target="$repo_root/gardener/charts/images.yaml" fluent_regex="^.*fluent-bit-to-vali$" function __update_fluent_skaffold_images() { - local registry="${1:-$(echo "localhost:5001/eu_gcr_io_gardener-project_gardener/fluent-bit-to-vali")}" + local registry="${1:-$(echo "localhost:5001/europe_docker_pkg_dev_gardener-project_gardener/fluent-bit-to-vali")}" local version="${2:-$(git rev-parse HEAD 2>/dev/null || echo "latest")}" - + $repo_root/tools/yq -i e "(.images[] | select(.name == \"fluent-bit-plugin-installer\") | .repository) |=\"${registry}\"" $target $repo_root/tools/yq -i e "(.images[] | select(.name == \"fluent-bit-plugin-installer\") | .tag) |= \"$version\"" $target -} +} event_regex="^.*event-logger$" function __update_event_skaffold_images() { - local registry="${1:-$(echo "localhost:5001/eu_gcr_io_gardener-project_gardener/event-logger")}" + local registry="${1:-$(echo "localhost:5001/europe_docker_pkg_dev_gardener-project_gardener/event-logger")}" local version="${2:-$(git rev-parse HEAD 2>/dev/null || echo "latest")}" - + $repo_root/tools/yq -i e "(.images[] | select(.name == \"event-logger\") | .repository) |=\"${registry}\"" $target $repo_root/tools/yq -i e "(.images[] | select(.name == \"event-logger\") | .tag) |= \"$version\"" $target } curator_regex="^.*vali-curator$" function __update_curator_skaffold_images() { - local registry="${1:-$(echo "localhost:5001/eu_gcr_io_gardener-project_gardener/vali-curator")}" + local registry="${1:-$(echo "localhost:5001/europe_docker_pkg_dev_gardener-project_gardener/vali-curator")}" local version="${2:-$(git rev-parse HEAD 2>/dev/null || echo "latest")}" - + $repo_root/tools/yq -i e "(.images[] | select(.name == \"vali-curator\") | .repository) |=\"${registry}\"" $target $repo_root/tools/yq -i e "(.images[] | select(.name == \"vali-curator\") | .tag) |= \"$version\"" $target } telegraf_regex="^.*telegraf-iptables$" function __update_telegraf_skaffold_images() { - local registry="${1:-$(echo "localhost:5001/eu_gcr_io_gardener-project_gardener/telegraf-iptables")}" + local registry="${1:-$(echo "localhost:5001/europe_docker_pkg_dev_gardener-project_gardener/telegraf-iptables")}" local version="${2:-$(git rev-parse HEAD 2>/dev/null || echo "latest")}" - + $repo_root/tools/yq -i e "(.images[] | select(.name == \"telegraf\") | .repository) |=\"${registry}\"" $target $repo_root/tools/yq -i e "(.images[] | select(.name == \"telegraf\") | .tag) |= \"$version\"" $target } tune2fs_regex="^.*tune2fs$" function __update_tune2fs_skaffold_images() { - local registry="${1:-$(echo "localhost:5001/eu_gcr_io_gardener-project_gardener/tune2fs")}" + local registry="${1:-$(echo "localhost:5001/europe_docker_pkg_dev_gardener-project_gardener/tune2fs")}" local version="${2:-$(git rev-parse HEAD 2>/dev/null || echo "latest")}" - + $repo_root/tools/yq -i e "(.images[] | select(.name == \"tune2fs\") | .repository) |=\"${registry}\"" $target $repo_root/tools/yq -i e "(.images[] | select(.name == \"tune2fs\") | .tag) |= \"$version\"" $target } -if [[ ! -z "$1" ]] && [[ "$1" =~ $fluent_regex ]]; then +if [[ ! -z "$1" ]] && [[ "$1" =~ $fluent_regex ]]; then __update_fluent_skaffold_images "$@" exit 0 -fi +fi -if [[ ! -z "$1" ]] && [[ "$1" =~ $event_regex ]]; then +if [[ ! -z "$1" ]] && [[ "$1" =~ $event_regex ]]; then __update_event_skaffold_images "$@" exit 0 -fi +fi -if [[ ! -z "$1" ]] && [[ "$1" =~ $curator_regex ]]; then +if [[ ! -z "$1" ]] && [[ "$1" =~ $curator_regex ]]; then __update_curator_skaffold_images "$@" exit 0 fi -if [[ ! -z "$1" ]] && [[ "$1" =~ $telegraf_regex ]]; then +if [[ ! -z "$1" ]] && [[ "$1" =~ $telegraf_regex ]]; then __update_telegraf_skaffold_images "$@" exit 0 -fi +fi -if [[ ! -z "$1" ]] && [[ "$1" =~ $tune2fs_regex ]]; then +if [[ ! -z "$1" ]] && [[ "$1" =~ $tune2fs_regex ]]; then __update_tune2fs_skaffold_images "$@" exit 0 -fi \ No newline at end of file +fi diff --git a/skaffold.yaml b/skaffold.yaml index 92525282..f87ba38f 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -40,11 +40,11 @@ metadata: name: provider-local build: artifacts: - - image: eu.gcr.io/gardener-project/gardener/extensions/provider-local + - image: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/provider-local custom: buildCommand: | - docker pull -q eu.gcr.io/gardener-project/gardener/gardener-extension-provider-local:{{.GARDENER_VERSION}} - docker tag eu.gcr.io/gardener-project/gardener/gardener-extension-provider-local:{{.GARDENER_VERSION}} $IMAGE + docker pull -q europe-docker.pkg.dev/gardener-project/public/gardener/gardener-extension-provider-local:{{.GARDENER_VERSION}} + docker tag europe-docker.pkg.dev/gardener-project/public/gardener/gardener-extension-provider-local:{{.GARDENER_VERSION}} $IMAGE [ ! -z $PUSH_IMAGE ] && docker push $IMAGE resourceSelector: allow: @@ -67,7 +67,7 @@ metadata: name: gardenlet build: artifacts: - - image: eu.gcr.io/gardener-project/gardener/fluent-bit-to-vali + - image: europe-docker.pkg.dev/gardener-project/public/gardener/fluent-bit-to-vali docker: target: fluent-bit-plugin cacheFrom: @@ -92,7 +92,7 @@ deploy: imageVectorOverwrite: | images: - name: fluent-bit-plugin-installer - repository: '{{.IMAGE_REPO_eu_gcr_io_gardener_project_gardener_fluent_bit_to_vali}}' - tag: '{{.IMAGE_TAG_eu_gcr_io_gardener_project_gardener_fluent_bit_to_vali}}@{{.IMAGE_DIGEST_eu_gcr_io_gardener_project_gardener_fluent_bit_to_vali}}' + repository: '{{.IMAGE_REPO_europe_docker_pkg_dev_gardener_project_gardener_fluent_bit_to_vali}}' + tag: '{{.IMAGE_TAG_europe_docker_pkg_dev_gardener_project_gardener_fluent_bit_to_vali}}@{{.IMAGE_DIGEST_europe_docker_pkg_dev_gardener_project_gardener_fluent_bit_to_vali}}' createNamespace: true wait: true