Skip to content

Commit dc3b80c

Browse files
authored
Merge pull request #1217 from zexi/automated-cherry-pick-of-#1215-upstream-master
Automated cherry pick of #1215: fix(operator): clear Web.Overview and Web.Docs component
2 parents 46b8e9a + 4187a39 commit dc3b80c

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

pkg/apis/onecloud/v1alpha1/defaults.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ func SetDefaults_OnecloudClusterSpec(obj *OnecloudClusterSpec, isEE bool, isEEOr
244244
false, isEE,
245245
)
246246
obj.Web.Overview.ImagePullPolicy = corev1.PullIfNotPresent
247+
clearContainerSpec(&obj.Web.Overview)
248+
247249
// setting web docs image
248250
obj.Web.Docs.Image = getImage(
249251
obj.ImageRepository, obj.Web.Docs.Repository,
@@ -252,6 +254,7 @@ func SetDefaults_OnecloudClusterSpec(obj *OnecloudClusterSpec, isEE bool, isEEOr
252254
false, isEE,
253255
)
254256
obj.Web.Docs.ImagePullPolicy = corev1.PullIfNotPresent
257+
clearContainerSpec(&obj.Web.Docs)
255258

256259
// setting host spec
257260
if obj.HostAgent.DefaultQemuVersion == "" {

0 commit comments

Comments
 (0)