diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index fed1f7b7..1f042b0f 100755 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -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: @@ -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: @@ -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: ~ diff --git a/Makefile b/Makefile index 9b4d0e70..a3a846e5 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/kubernetes/deployment.yaml b/kubernetes/deployment.yaml index 8199f99d..e2497d15 100644 --- a/kubernetes/deployment.yaml +++ b/kubernetes/deployment.yaml @@ -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 @@ -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