Skip to content

Re-Apply: Remove fork from mcm provider openstack and use newest release (#161) #195

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

Open
nschad wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −10
Open

Re-Apply: Remove fork from mcm provider openstack and use newest release (#161) #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@
'registry.k8s.io/provider-os/openstack-cloud-controller-manager'
],
},
{
groupName: 'machine-controller-manager-provider-openstack',
matchPackageNames: [
'registry.ske.stackit.cloud/stackitcloud/machine-controller-manager-provider-openstack',
],
// Enable updating fork releases/tags, e.g., v0.24.1-ske-1
ignoreUnstable: false,
},
{
groupName: 'Internal',
matchFileNames: [
Expand Down
4 changes: 2 additions & 2 deletions imagevector/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions pkg/webhook/controlplane/ensurer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(ctx context.Context,
}
}

// avoid unnecessary reconciles if a recourse exhausted. Specially needed for machine-controller-manager-provider-openstack
// to avoid the creation of many volumes. But also on machine-controller-manager-provider-stackit this limits the amount of requests.
sidecarContainer.Args = extensionswebhook.EnsureStringWithPrefix(
sidecarContainer.Args,
"--resource-exhausted-retry=", "30m",
)

newObj.Spec.Template.Spec.Containers = extensionswebhook.EnsureContainerWithName(
newObj.Spec.Template.Spec.Containers,
sidecarContainer,
Expand Down
9 changes: 9 additions & 0 deletions pkg/webhook/controlplane/ensurer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=", "30m",
)
Expect(deployment.Spec.Template.Spec.Containers).To(ConsistOf(expectedContainer))
})
})
Expand Down Expand Up @@ -574,6 +577,9 @@ WantedBy=multi-user.target
Expect(ensurer.EnsureMachineControllerManagerDeployment(context.TODO(), eContextK8s127WithSTACKITMCM, deployment, nil)).To(Succeed())
expectedContainer := machinecontrollermanager.ProviderSidecarContainer(shoot, deployment.Namespace, "provider-stackit", "foo:bar")
expectedContainer.Env = []corev1.EnvVar{}
expectedContainer.Args = extensionswebhook.EnsureStringWithPrefix(
expectedContainer.Args, "--resource-exhausted-retry=", "30m",
)
Expect(deployment.Spec.Template.Spec.Containers).To(ConsistOf(expectedContainer))
})
})
Expand Down Expand Up @@ -625,6 +631,9 @@ WantedBy=multi-user.target
Value: "token.qa",
},
}
expectedContainer.Args = extensionswebhook.EnsureStringWithPrefix(
expectedContainer.Args, "--resource-exhausted-retry=", "30m",
)
Expect(deployment.Spec.Template.Spec.Containers).To(ConsistOf(expectedContainer))
})
})
Expand Down