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.

Sign up for GitHub

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 #878

Merged
merged 3 commits into from
Dec 6, 2023
Merged

switch GCR -> Artifact-Registry #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bebc1ba
cleanup: rm obsolete/redundant attributes
ccwienk Dec 5, 2023
a1bf6a7
switch to new testmachinery-image-location
ccwienk Dec 5, 2023
0c968fb
switch GCR -> Artifact-Registry
ccwienk Dec 5, 2023
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
20 changes: 13 additions & 7 deletions .ci/pipeline_definitions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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: ~
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -200,4 +200,4 @@ endif

.PHONY: add-license-headers
add-license-headers: $(GO_ADD_LICENSE)
@./hack/add_license_headers.sh
@./hack/add_license_headers.sh
2 changes: 1 addition & 1 deletion kubernetes/deployment/out-of-tree/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down