github/kamaji
1
0
Fork 0
mirror of https://github.com/clastix/kamaji.git synced 2026-08-26 00:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserving deployment labels (#1256)

Browse Source 
Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>
This commit is contained in:
Dario Tranchitella
2026-07-27 11:54:15 +02:00
committed by GitHub
parent 8a19328903
commit 44128d87b8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/builders/controlplane/deployment.go
+5 -1
View File
@@ -116,7 +116,11 @@ type Deployment struct {
func (d Deployment) Build(ctx context.Context, deployment *appsv1.Deployment, tenantControlPlane kamajiv1alpha1.TenantControlPlane) {
address, _, _ := tenantControlPlane.AssignedControlPlaneAddress()
d.setLabels(deployment, utilities.MergeMaps(utilities.KamajiLabels(tenantControlPlane.GetName(), "deployment"), tenantControlPlane.Spec.ControlPlane.Deployment.AdditionalMetadata.Labels))
d.setLabels(deployment, utilities.MergeMaps(
deployment.GetLabels(),
utilities.KamajiLabels(tenantControlPlane.GetName(), "deployment"),
tenantControlPlane.Spec.ControlPlane.Deployment.AdditionalMetadata.Labels,
))
d.setAnnotations(deployment, utilities.MergeMaps(deployment.Annotations, tenantControlPlane.Spec.ControlPlane.Deployment.AdditionalMetadata.Annotations))
d.setTemplateLabels(&deployment.Spec.Template, utilities.MergeMaps(d.templateLabels(ctx, &tenantControlPlane), tenantControlPlane.Spec.ControlPlane.Deployment.PodAdditionalMetadata.Labels))
d.setTemplateAnnotations(&deployment.Spec.Template, utilities.MergeMaps(tenantControlPlane.Spec.ControlPlane.Deployment.PodAdditionalMetadata.Annotations, map[string]string{