Skip to content

Commit 354bd55

Browse files
authored
Merge pull request #16 from pubg/bug/fix-cronjob-patch
fix: GetImageStrategicPatchJson bug
2 parents e298d42 + d44cfcb commit 354bd55

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

util/kubernetes.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,20 @@ func GetImageStrategicPatchJson(obj interface{}, containers, initContainers []Co
136136

137137
switch obj.(type) {
138138
case *batchV1Beta1.CronJob:
139-
imageStrategicPatch := ImageStrategicPatchCronJob{}
140-
imageStrategicPatch.Spec.JobTemplate.Spec.Template.Spec.Containers = containers
141-
imageStrategicPatch.Spec.JobTemplate.Spec.Template.Spec.InitContainers = initContainers
139+
p := ImageStrategicPatchCronJob{}
140+
p.Spec.JobTemplate.Spec.Template.Spec.Containers = containers
141+
p.Spec.JobTemplate.Spec.Template.Spec.InitContainers = initContainers
142+
imageStrategicPatch = p
142143
case *batchV1.CronJob:
143-
imageStrategicPatch := ImageStrategicPatchCronJob{}
144-
imageStrategicPatch.Spec.JobTemplate.Spec.Template.Spec.Containers = containers
145-
imageStrategicPatch.Spec.JobTemplate.Spec.Template.Spec.InitContainers = initContainers
144+
p := ImageStrategicPatchCronJob{}
145+
p.Spec.JobTemplate.Spec.Template.Spec.Containers = containers
146+
p.Spec.JobTemplate.Spec.Template.Spec.InitContainers = initContainers
147+
imageStrategicPatch = p
146148
default:
147-
imageStrategicPatch := ImageStrategicPatch{}
148-
imageStrategicPatch.Spec.Template.Spec.Containers = containers
149-
imageStrategicPatch.Spec.Template.Spec.InitContainers = initContainers
149+
p := ImageStrategicPatch{}
150+
p.Spec.Template.Spec.Containers = containers
151+
p.Spec.Template.Spec.InitContainers = initContainers
152+
imageStrategicPatch = p
150153
}
151154
patchJson, err := json.Marshal(imageStrategicPatch)
152155
return patchJson, err

0 commit comments

Comments
 (0)