fix(pipeline): update yamlMergeStrategy to use YamlMergeStrategy.merge()
Signed-off-by: zhenyus <zhenyus@mathmast.com>
This commit is contained in:
parent
f5536e16e6
commit
73c0497210
@ -14,6 +14,9 @@ import com.freeleaps.devops.enums.DependenciesManager
|
||||
import com.freeleaps.devops.enums.ServiceLanguage
|
||||
import com.freeleaps.devops.enums.CodeLinterTypes
|
||||
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 stages = []
|
||||
@ -65,7 +68,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'dep-resolver',
|
||||
@ -159,7 +162,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'code-linter',
|
||||
@ -263,7 +266,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'sast-scanner',
|
||||
@ -322,7 +325,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'semantic-releasing',
|
||||
@ -383,7 +386,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'build-agent',
|
||||
@ -500,7 +503,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'image-builder',
|
||||
@ -589,7 +592,7 @@ spec:
|
||||
value: "true"
|
||||
effect: "NoSchedule"
|
||||
""",
|
||||
yamlMergeStrategy: "merge",
|
||||
yamlMergeStrategy: YamlMergeStrategy.merge(),
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: "argo-app-version-updater",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user