Skip to content

Commit 8021597

Browse files
committed
Update version argument mapping
1 parent 62b8abc commit 8021597

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

controllers/drupalsite_controller.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -655,13 +655,14 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
655655
}
656656
// Initialize 'spec.version.releaseSpec' if empty
657657
if len(drp.Spec.Version.ReleaseSpec) == 0 {
658-
if strings.HasPrefix(drp.Spec.Version.Name, "v8") {
658+
switch {
659+
case strings.HasPrefix(drp.Spec.Version.Name, "v8"):
659660
drp.Spec.Version.ReleaseSpec = DefaultD8ReleaseSpec
660-
} else if strings.HasPrefix(drp.Spec.Version.Name, "v9.2") {
661-
drp.Spec.Version.ReleaseSpec = DefaultD9ReleaseSpec
662-
} else if strings.HasPrefix(drp.Spec.Version.Name, "v9.3") {
661+
case strings.HasPrefix(drp.Spec.Version.Name, "v9.3-1"):
663662
drp.Spec.Version.ReleaseSpec = DefaultD93ReleaseSpec
664-
} else {
663+
case strings.HasPrefix(drp.Spec.Version.Name, "v9.3-2"):
664+
drp.Spec.Version.ReleaseSpec = DefaultD932ReleaseSpec
665+
default:
665666
log.V(3).Info("Cannot set default ReleaseSpec for version " + drp.Spec.Version.Name)
666667
}
667668
update = true

controllers/suite_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ var _ = BeforeSuite(func(done Done) {
8181
PhpFpmExporterImage = "test-phpfpmexporter"
8282
WebDAVImage = "test-webdav"
8383
DefaultD8ReleaseSpec = "test-d8-spec"
84-
DefaultD9ReleaseSpec = "test-d9-spec"
84+
DefaultD93ReleaseSpec = "test-d93-spec"
85+
DefaultD932ReleaseSpec = "test-d93-2-spec"
8586
ClusterName = "test"
8687
EasystartBackupName = "easystart-backup"
8788

0 commit comments

Comments
 (0)