icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(pipeline): replace YamlMergeStrategy.merge() with merge() in executeFreeleapsPipeline.groovy

Browse Source 
Signed-off-by: zhenyus <zhenyus@mathmast.com>
This commit is contained in:
zhenyus 2025-02-22 19:17:25 +08:00
parent 73c0497210
commit 90e0ba0eb8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
first-class-pipeline/vars/executeFreeleapsPipeline.groovy
View File

@ -68,7 +68,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'dep-resolver', name: 'dep-resolver',
@ -162,7 +162,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'code-linter', name: 'code-linter',
@ -266,7 +266,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'sast-scanner', name: 'sast-scanner',
@ -325,7 +325,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'semantic-releasing', name: 'semantic-releasing',
@ -386,7 +386,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'build-agent', name: 'build-agent',
@ -503,7 +503,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'image-builder', name: 'image-builder',
@ -592,7 +592,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: YamlMergeStrategy.merge(), yamlMergeStrategy: merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: "argo-app-version-updater", name: "argo-app-version-updater",