From 2a77292b55bb097d48104a71fec01364d42356e4 Mon Sep 17 00:00:00 2001 From: Pavan <25031267+Pavan-SAP@users.noreply.github.com> Date: Tue, 24 Feb 2026 14:40:03 +0100 Subject: [PATCH] [Misc] Operator: Labels/Annotations amended Clean-up and get rid of some unnecessary labels/annotations. These are ancient leftovers and should be added by consumers if needed anyway! --- internal/controller/reconcile-capapplicationversion.go | 8 ++------ internal/controller/reconcile.go | 1 - .../cav-processing-with-none-complete-content-jobs.yaml | 3 --- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/internal/controller/reconcile-capapplicationversion.go b/internal/controller/reconcile-capapplicationversion.go index b6e55c8d..85c72097 100644 --- a/internal/controller/reconcile-capapplicationversion.go +++ b/internal/controller/reconcile-capapplicationversion.go @@ -312,10 +312,6 @@ func (c *Controller) handleContentDeployJob(ca *v1alpha1.CAPApplication, cav *v1 // newContentDeploymentJob creates a Content Deployment Job for the CAV resource. It also sets the appropriate OwnerReferences. func newContentDeploymentJob(cav *v1alpha1.CAPApplicationVersion, workload *v1alpha1.WorkloadDetails, ownerRef metav1.OwnerReference, vcapSecretName string) *batchv1.Job { - labels := copyMaps(workload.Labels, map[string]string{ - LabelDisableKarydia: "true", - }) - contentJobName := getContentJobName(workload.Name, cav) util.LogInfo("Creating content job", string(Processing), cav, nil, "contentJobName", contentJobName, "version", cav.Spec.Version) @@ -336,7 +332,7 @@ func newContentDeploymentJob(cav *v1alpha1.CAPApplicationVersion, workload *v1al Template: corev1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Annotations: workload.Annotations, - Labels: labels, + Labels: workload.Labels, }, Spec: corev1.PodSpec{ Containers: []corev1.Container{ @@ -367,7 +363,7 @@ func newContentDeploymentJob(cav *v1alpha1.CAPApplicationVersion, workload *v1al NodeName: workload.JobDefinition.NodeName, PriorityClassName: workload.JobDefinition.PriorityClassName, Affinity: workload.JobDefinition.Affinity, - TopologySpreadConstraints: getTopologySpreadConstraints(workload.JobDefinition.TopologySpreadConstraints, labels, false), + TopologySpreadConstraints: getTopologySpreadConstraints(workload.JobDefinition.TopologySpreadConstraints, workload.Labels, false), Tolerations: workload.JobDefinition.Tolerations, }, }, diff --git a/internal/controller/reconcile.go b/internal/controller/reconcile.go index 0297d52d..cce12483 100644 --- a/internal/controller/reconcile.go +++ b/internal/controller/reconcile.go @@ -40,7 +40,6 @@ const ( LabelTenantOperationStep = "sme.sap.com/tenant-operation-step" LabelCAVVersion = "sme.sap.com/cav-version" LabelRelevantDNSTarget = "sme.sap.com/relevant-dns-target-hash" - LabelDisableKarydia = "x4.sap.com/disable-karydia" LabelExposedWorkload = "sme.sap.com/exposed-workload" LabelDNSNameHash = "sme.sap.com/dns-name-hash" LabelSubscriptionGUID = "sme.sap.com/subscription-guid" diff --git a/internal/controller/testdata/capapplicationversion/expected/cav-processing-with-none-complete-content-jobs.yaml b/internal/controller/testdata/capapplicationversion/expected/cav-processing-with-none-complete-content-jobs.yaml index e192206b..e7d3930e 100644 --- a/internal/controller/testdata/capapplicationversion/expected/cav-processing-with-none-complete-content-jobs.yaml +++ b/internal/controller/testdata/capapplicationversion/expected/cav-processing-with-none-complete-content-jobs.yaml @@ -91,9 +91,6 @@ metadata: uid: 5e64489b-7346-4984-8617-e8c37338b3d8 spec: template: - metadata: - labels: - x4.sap.com/disable-karydia: "true" spec: containers: - env: