diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index 7dc9a15c4..3dc856c28 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -1,12 +1,12 @@ machine-controller-manager: - 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: @@ -19,8 +19,7 @@ machine-controller-manager: source: ~ # default steps: build: ~ - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/machine-controller-manager' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/machine-controller-manager resource_labels: - name: 'gardener.cloud/cve-categorisation' value: @@ -34,14 +33,16 @@ machine-controller-manager: check: image: 'golang:1.21.4' 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.21.4' output_dir: 'binary' jobs: head-update: traits: - component_descriptor: ~ + component_descriptor: + ocm_repository_mappings: + - repository: europe-docker.pkg.dev/gardener-project/releases draft_release: ~ pull-request: traits: @@ -50,12 +51,17 @@ machine-controller-manager: traits: version: preprocess: 'finalize' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/releases release: nextversion: 'bump_minor' + publish: + dockerimages: + machine-controller-manager: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager slack: default_channel: 'internal_scp_workspace' channel_cfgs: internal_scp_workspace: channel_name: 'C0170QTBJUW' # gardener-mcm slack_cfg_name: 'scp_workspace' - component_descriptor: ~ diff --git a/Makefile b/Makefile index 723e9dd07..edbb155fb 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ -include .env include hack/tools.mk -IMAGE_REPOSITORY := eu.gcr.io/gardener-project/gardener/machine-controller-manager +IMAGE_REPOSITORY := europe-docker.pkg.dev/gardener-project/public/gardener/machine-controller-manager IMAGE_TAG := $(shell cat VERSION) COVERPROFILE := test/output/coverprofile.out @@ -200,4 +200,4 @@ endif .PHONY: add-license-headers add-license-headers: $(GO_ADD_LICENSE) - @./hack/add_license_headers.sh \ No newline at end of file + @./hack/add_license_headers.sh diff --git a/kubernetes/deployment/out-of-tree/deployment.yaml b/kubernetes/deployment/out-of-tree/deployment.yaml index 49a28e548..6737b8c19 100644 --- a/kubernetes/deployment/out-of-tree/deployment.yaml +++ b/kubernetes/deployment/out-of-tree/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: machine-controller-manager - image: eu.gcr.io/gardener-project/gardener/machine-controller-manager:v0.39.0 + image: europe-docker.pkg.dev/gardener-project/public/gardener/machine-controller-manager:v0.39.0 imagePullPolicy: Always command: - ./machine-controller-manager