Skip to content

Commit

Permalink
switch GCR -> Artifact-Registry
Browse files Browse the repository at this point in the history
GCR has been deprecated [0] in favour of Artifact-Registry.

Thus, change push-targets for OCI-Images:

- europe-docker.pkg.dev/gardener-project/snapshots for snapshots
- europe-docker.pkg.dev/gardener-project/releases for releases
- europe-docker.pkg.dev/gardener-project/public for read-access to
  snapshots + releases

[0]
https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr
  • Loading branch information
ccwienk committed Dec 7, 2023
1 parent c21a2a9 commit f8b9ed9
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 30 deletions.
66 changes: 39 additions & 27 deletions .ci/pipeline_definitions
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
machine-controller-manager-provider-alicloud:
base_definition:
repo: ~
traits:
version: ~
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots
inherit:
publish_template: &publish_anchor
publish:
dockerimages:
machine-controller-manager-provider-alicloud:
inputs:
repos:
source: ~ # default
steps:
build: ~
image: 'eu.gcr.io/gardener-project/gardener/machine-controller-manager-provider-alicloud'
resource_labels:
- name: 'gardener.cloud/cve-categorisation'
value:
network_exposure: 'protected'
authentication_enforced: false
user_interaction: 'gardener-operator'
confidentiality_requirement: 'high'
integrity_requirement: 'high'
availability_requirement: 'low'
steps_template: &steps_anchor
steps:
check:
Expand All @@ -38,19 +22,41 @@ machine-controller-manager-provider-alicloud:
<<: *steps_anchor
traits:
<<: *version_anchor
component_descriptor: ~
component_descriptor:
ocm_repository_mappings:
- repository: europe-docker.pkg.dev/gardener-project/releases
draft_release: ~
<<: *publish_anchor
publish:
dockerimages: &default_images
machine-controller-manager-provider-alicloud: &mcmpa-image
inputs:
repos:
source: ~ # default
steps:
build: ~
image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/machine-controller-manager-provider-alicloud
resource_labels:
- name: 'gardener.cloud/cve-categorisation'
value:
network_exposure: 'protected'
authentication_enforced: false
user_interaction: 'gardener-operator'
confidentiality_requirement: 'high'
integrity_requirement: 'high'
availability_requirement: 'low'
pull-request:
<<: *steps_anchor
traits:
<<: *version_anchor
pull-request: ~
<<: *publish_anchor
publish:
dockerimages:
<<: *default_images
create-upgrade-prs:
traits:
component_descriptor: ~
version: ~
component_descriptor:
ocm_repository_mappings:
- repository: europe-docker.pkg.dev/gardener-project/releases
cronjob:
interval: '24h'
update_component_deps:
Expand All @@ -59,15 +65,21 @@ machine-controller-manager-provider-alicloud:
release:
<<: *steps_anchor
traits:
<<: *publish_anchor
version:
preprocess: 'finalize'
component_descriptor:
ocm_repository: europe-docker.pkg.dev/gardener-project/releases
release:
nextversion: 'bump_minor'
publish:
dockerimages:
<<: *default_images
machine-controller-manager-provider-alicloud:
<<: *mcmpa-image
image: europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager-provider-alicloud
slack:
default_channel: 'internal_scp_workspace'
channel_cfgs:
internal_scp_workspace:
channel_name: 'C0170QTBJUW' # gardener-mcm
slack_cfg_name: 'scp_workspace'
component_descriptor: ~
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

BINARY_PATH := bin/
COVERPROFILE := test/output/coverprofile.out
IMAGE_REPOSITORY := eu.gcr.io/gardener-project/gardener/machine-controller-manager-provider-alicloud
IMAGE_REPOSITORY := europe-docker.pkg.dev/gardener-project/public/gardener/machine-controller-manager-provider-alicloud
IMAGE_TAG := $(shell cat VERSION)
PROVIDER_NAME := alicloud
PROJECT_NAME := gardener
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
containers:
- name: machine-controller-manager
image: eu.gcr.io/gardener-project/gardener/machine-controller-manager:v0.46.0
image: europe-docker.pkg.dev/gardener-project/public/gardener/machine-controller-manager:v0.46.0
imagePullPolicy: Always
command:
- ./machine-controller-manager
Expand Down Expand Up @@ -59,7 +59,7 @@ spec:
- --machine-safety-orphan-vms-period=30m # Optional Parameter - Default value 30mins - Time period (in time) used to poll for orphan VMs by safety controller.
- --node-conditions=ReadonlyFilesystem,KernelDeadlock,DiskPressure # List of comma-separated/case-sensitive node-conditions which when set to True will change machine to a failed state after MachineHealthTimeout duration. It may further be replaced with a new machine if the machine is backed by a machine-set object.
- --v=3
image: eu.gcr.io/gardener-project/gardener/machine-controller-manager-provider-alicloud:v0.6.0
image: europe-docker.pkg.dev/gardener-project/public/gardener/machine-controller-manager-provider-alicloud:v0.6.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down

0 comments on commit f8b9ed9

Please sign in to comment.