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

fix(pipeline): update yamlMergeStrategy to use YamlMergeStrategy.merge()

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

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

@ -14,6 +14,9 @@ import com.freeleaps.devops.enums.DependenciesManager
import com.freeleaps.devops.enums.ServiceLanguage import com.freeleaps.devops.enums.ServiceLanguage
import com.freeleaps.devops.enums.CodeLinterTypes import com.freeleaps.devops.enums.CodeLinterTypes
import com.freeleaps.devops.enums.ImageBuilderTypes import com.freeleaps.devops.enums.ImageBuilderTypes
import org.csanchez.jenkins.plugins.kubernetes.pod.yaml.YamlMergeStrategy
import org.csanchez.jenkins.plugins.kubernetes.pod.yaml.Merge
def generateComponentStages(component, configurations) { def generateComponentStages(component, configurations) {
def stages = [] def stages = []
@ -65,7 +68,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'dep-resolver', name: 'dep-resolver',
@ -159,7 +162,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'code-linter', name: 'code-linter',
@ -263,7 +266,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'sast-scanner', name: 'sast-scanner',
@ -322,7 +325,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'semantic-releasing', name: 'semantic-releasing',
@ -383,7 +386,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'build-agent', name: 'build-agent',
@ -500,7 +503,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: 'image-builder', name: 'image-builder',
@ -589,7 +592,7 @@ spec:
value: "true" value: "true"
effect: "NoSchedule" effect: "NoSchedule"
""", """,
yamlMergeStrategy: "merge", yamlMergeStrategy: YamlMergeStrategy.merge(),
containers: [ containers: [
containerTemplate( containerTemplate(
name: "argo-app-version-updater", name: "argo-app-version-updater",