From d0aeeae08a02b72ea19e31f9342cf58152228c4e Mon Sep 17 00:00:00 2001 From: Paulo Lieuthier Date: Tue, 17 Mar 2026 09:49:47 -0300 Subject: [PATCH 1/2] feat: crds: allow patch merge for ScaledObject's triggers Signed-off-by: Paulo Lieuthier --- config/crd/bases/keda.sh_scaledobjects.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/crd/bases/keda.sh_scaledobjects.yaml b/config/crd/bases/keda.sh_scaledobjects.yaml index 395a54b71d5..c87b032360e 100644 --- a/config/crd/bases/keda.sh_scaledobjects.yaml +++ b/config/crd/bases/keda.sh_scaledobjects.yaml @@ -367,6 +367,8 @@ spec: type: object minItems: 1 type: array + x-kubernetes-patch-merge-key: name + x-kubernetes-patch-strategy: merge required: - scaleTargetRef - triggers From 9bb7ac4b2a5b8513f3732e5d2919a7fbf735de1f Mon Sep 17 00:00:00 2001 From: Paulo Lieuthier Date: Tue, 17 Mar 2026 09:58:16 -0300 Subject: [PATCH 2/2] feat: crds: allow patch merge for ScaledJob's triggers Signed-off-by: Paulo Lieuthier --- config/crd/bases/keda.sh_scaledjobs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/crd/bases/keda.sh_scaledjobs.yaml b/config/crd/bases/keda.sh_scaledjobs.yaml index 328a88df372..1cd73733b7a 100644 --- a/config/crd/bases/keda.sh_scaledjobs.yaml +++ b/config/crd/bases/keda.sh_scaledjobs.yaml @@ -9056,6 +9056,8 @@ spec: type: object minItems: 1 type: array + x-kubernetes-patch-merge-key: name + x-kubernetes-patch-strategy: merge required: - jobTargetRef - triggers