From 18f761708b08c88c46479179e06a850dd34f6996 Mon Sep 17 00:00:00 2001 From: viragvoros Date: Wed, 27 May 2026 17:48:19 +0200 Subject: [PATCH 1/6] Remove fork from mcm provider openstack and use newest release --- imagevector/images.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imagevector/images.yaml b/imagevector/images.yaml index 935c113..5753cd1 100644 --- a/imagevector/images.yaml +++ b/imagevector/images.yaml @@ -44,8 +44,8 @@ images: - name: machine-controller-manager-provider-openstack sourceRepository: github.com/gardener/machine-controller-manager-provider-openstack - repository: registry.ske.stackit.cloud/stackitcloud/machine-controller-manager-provider-openstack - tag: "v0.25.0-ske-1" + repository: europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager-provider-openstack + tag: "v0.27.0" - name: machine-controller-manager-provider-stackit sourceRepository: github.com/stackitcloud/machine-controller-manager-provider-stackit repository: ghcr.io/stackitcloud/machine-controller-manager-provider-stackit From c87ab5466f88b1cd4bb845c11e09c9879398ee71 Mon Sep 17 00:00:00 2001 From: viragvoros Date: Thu, 28 May 2026 16:20:59 +0200 Subject: [PATCH 2/6] add renovate --- .github/renovate.json5 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index c90b5d7..1acdd5d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -88,9 +88,8 @@ { groupName: 'machine-controller-manager-provider-openstack', matchPackageNames: [ - 'registry.ske.stackit.cloud/stackitcloud/machine-controller-manager-provider-openstack', + 'europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager-provider-openstack', ], - // Enable updating fork releases/tags, e.g., v0.24.1-ske-1 ignoreUnstable: false, }, { From b40ca9eaf322ac69113911fb9af2ab22986ab11d Mon Sep 17 00:00:00 2001 From: viragvoros Date: Thu, 28 May 2026 16:23:19 +0200 Subject: [PATCH 3/6] remove unstable --- .github/renovate.json5 | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 1acdd5d..9d90488 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -90,7 +90,6 @@ matchPackageNames: [ 'europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager-provider-openstack', ], - ignoreUnstable: false, }, { groupName: 'Internal', From fa80a858af0bcc7c6ad3041f4e3a524af9b35a65 Mon Sep 17 00:00:00 2001 From: viragvoros Date: Mon, 1 Jun 2026 17:31:23 +0200 Subject: [PATCH 4/6] add review points --- .github/renovate.json5 | 6 ------ pkg/webhook/controlplane/ensurer.go | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 9d90488..80fdaae 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -85,12 +85,6 @@ 'registry.k8s.io/provider-os/openstack-cloud-controller-manager' ], }, - { - groupName: 'machine-controller-manager-provider-openstack', - matchPackageNames: [ - 'europe-docker.pkg.dev/gardener-project/releases/gardener/machine-controller-manager-provider-openstack', - ], - }, { groupName: 'Internal', matchFileNames: [ diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 2a1a2ad..11197df 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -98,6 +98,11 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(ctx context.Context, } } + sidecarContainer.Command = extensionswebhook.EnsureStringWithPrefix( + sidecarContainer.Command, + "--resource-exhausted-retry=", "20m", + ) + newObj.Spec.Template.Spec.Containers = extensionswebhook.EnsureContainerWithName( newObj.Spec.Template.Spec.Containers, sidecarContainer, From 6e2fd59c4649a9fa3bbe2022220be529e44237cf Mon Sep 17 00:00:00 2001 From: viragvoros Date: Mon, 1 Jun 2026 17:37:38 +0200 Subject: [PATCH 5/6] fix arg --- pkg/webhook/controlplane/ensurer.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 11197df..59a6c02 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -98,8 +98,8 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(ctx context.Context, } } - sidecarContainer.Command = extensionswebhook.EnsureStringWithPrefix( - sidecarContainer.Command, + sidecarContainer.Args = extensionswebhook.EnsureStringWithPrefix( + sidecarContainer.Args, "--resource-exhausted-retry=", "20m", ) From 71c3d6ae8eb59677a72d16c9502b7a3c72b4f908 Mon Sep 17 00:00:00 2001 From: viragvoros Date: Mon, 1 Jun 2026 18:06:47 +0200 Subject: [PATCH 6/6] fix tests --- pkg/webhook/controlplane/ensurer.go | 10 ++++++---- pkg/webhook/controlplane/ensurer_test.go | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 59a6c02..83d5317 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -98,10 +98,12 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(ctx context.Context, } } - sidecarContainer.Args = extensionswebhook.EnsureStringWithPrefix( - sidecarContainer.Args, - "--resource-exhausted-retry=", "20m", - ) + if !feature.UseStackitMachineControllerManager(cluster) { + sidecarContainer.Args = extensionswebhook.EnsureStringWithPrefix( + sidecarContainer.Args, + "--resource-exhausted-retry=", "20m", + ) + } newObj.Spec.Template.Spec.Containers = extensionswebhook.EnsureContainerWithName( newObj.Spec.Template.Spec.Containers, diff --git a/pkg/webhook/controlplane/ensurer_test.go b/pkg/webhook/controlplane/ensurer_test.go index fd55dbc..9c53939 100644 --- a/pkg/webhook/controlplane/ensurer_test.go +++ b/pkg/webhook/controlplane/ensurer_test.go @@ -532,6 +532,9 @@ WantedBy=multi-user.target Expect(deployment.Spec.Template.Spec.Containers).To(BeEmpty()) Expect(ensurer.EnsureMachineControllerManagerDeployment(context.TODO(), eContextK8s127, deployment, nil)).To(Succeed()) expectedContainer := machinecontrollermanager.ProviderSidecarContainer(shoot, deployment.Namespace, "provider-openstack", "foo:bar") + expectedContainer.Args = extensionswebhook.EnsureStringWithPrefix( + expectedContainer.Args, "--resource-exhausted-retry=", "20m", + ) Expect(deployment.Spec.Template.Spec.Containers).To(ConsistOf(expectedContainer)) }) })