From 90e0ba0eb8aec39f85a7cc7d5e23dae51bb4c03b Mon Sep 17 00:00:00 2001
From: zhenyus <zhenyus@mathmast.com>
Date: Sat, 22 Feb 2025 19:17:25 +0800
Subject: [PATCH] fix(pipeline): replace YamlMergeStrategy.merge() with merge()
 in executeFreeleapsPipeline.groovy

Signed-off-by: zhenyus <zhenyus@mathmast.com>
---
 .../vars/executeFreeleapsPipeline.groovy           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 1aa8b95a..be81f3bf 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -68,7 +68,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
         containers: [
           containerTemplate(
             name: 'dep-resolver',
@@ -162,7 +162,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
           containers: [
             containerTemplate(
               name: 'code-linter',
@@ -266,7 +266,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
           containers: [
             containerTemplate(
               name: 'sast-scanner',
@@ -325,7 +325,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
           containers: [
             containerTemplate(
               name: 'semantic-releasing',
@@ -386,7 +386,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
         containers: [
           containerTemplate(
             name: 'build-agent',
@@ -503,7 +503,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
         containers: [
           containerTemplate(
             name: 'image-builder',
@@ -592,7 +592,7 @@ spec:
       value: "true"
       effect: "NoSchedule"
         """,
-        yamlMergeStrategy: YamlMergeStrategy.merge(),
+        yamlMergeStrategy: merge(),
         containers: [
           containerTemplate(
             name: "argo-app-version-updater",