@@ -36,7 +36,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {
3636
3737 psmdbParams := & version_service.VersionServiceApplyParams {
3838 Apply : "latest" ,
39- OperatorVersion : "1.21.2 " ,
39+ OperatorVersion : "1.22.0 " ,
4040 Product : "psmdb-operator" ,
4141 }
4242 psmdbParams .WithTimeout (2 * time .Second )
@@ -450,6 +450,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
450450 version string
451451 }{
452452 // test latest
453+ {"latest" , "1.22.0" , nil , "8.0.19-7" },
453454 {"latest" , "1.21.2" , nil , "8.0.17-6" },
454455 {"latest" , "1.21.1" , nil , "8.0.12-4" },
455456 {"latest" , "1.21.0" , nil , "8.0.12-4" },
@@ -473,13 +474,15 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
473474 {"latest" , "1.7.0" , nil , "4.4.3-5" },
474475 {"latest" , "1.6.0" , nil , "4.4.2-4" },
475476 {"latest" , "1.5.0" , nil , "4.2.8-8" },
477+ {"latest" , "1.22.0" , & v80 , "8.0.19-7" },
476478 {"latest" , "1.21.2" , & v80 , "8.0.17-6" },
477479 {"latest" , "1.21.1" , & v80 , "8.0.12-4" },
478480 {"latest" , "1.21.0" , & v80 , "8.0.12-4" },
479481 {"latest" , "1.20.1" , & v80 , "8.0.8-3" },
480482 {"latest" , "1.20.0" , & v80 , "8.0.8-3" },
481483 {"latest" , "1.19.1" , & v80 , "8.0.4-1" },
482484 {"latest" , "1.19.0" , & v80 , "8.0.4-1" },
485+ {"latest" , "1.22.0" , & v70 , "7.0.30-16" },
483486 {"latest" , "1.21.2" , & v70 , "7.0.28-15" },
484487 {"latest" , "1.21.1" , & v70 , "7.0.24-13" },
485488 {"latest" , "1.21.0" , & v70 , "7.0.24-13" },
@@ -492,6 +495,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
492495 {"latest" , "1.16.2" , & v70 , "7.0.8-5" },
493496 {"latest" , "1.16.1" , & v70 , "7.0.8-5" },
494497 {"latest" , "1.16.0" , & v70 , "7.0.8-5" },
498+ {"latest" , "1.22.0" , & v60 , "6.0.27-21" },
495499 {"latest" , "1.21.2" , & v60 , "6.0.27-21" },
496500 {"latest" , "1.21.1" , & v60 , "6.0.25-20" },
497501 {"latest" , "1.21.0" , & v60 , "6.0.25-20" },
@@ -545,6 +549,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
545549 {"latest" , "1.5.0" , & v36 , "3.6.19-7.0" },
546550
547551 // test recommended
552+ {"recommended" , "1.22.0" , nil , "8.0.19-7" },
548553 {"recommended" , "1.21.2" , nil , "8.0.17-6" },
549554 {"recommended" , "1.21.1" , nil , "8.0.12-4" },
550555 {"recommended" , "1.21.0" , nil , "8.0.12-4" },
@@ -568,9 +573,11 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
568573 {"recommended" , "1.7.0" , nil , "4.4.3-5" },
569574 {"recommended" , "1.6.0" , nil , "4.4.2-4" },
570575 {"recommended" , "1.5.0" , nil , "4.2.8-8" },
576+ {"recommended" , "1.22.0" , & v80 , "8.0.19-7" },
571577 {"recommended" , "1.21.2" , & v80 , "8.0.17-6" },
572578 {"recommended" , "1.21.1" , & v80 , "8.0.12-4" },
573579 {"recommended" , "1.21.0" , & v80 , "8.0.12-4" },
580+ {"recommended" , "1.22.0" , & v70 , "7.0.30-16" },
574581 {"recommended" , "1.21.2" , & v70 , "7.0.28-15" },
575582 {"recommended" , "1.21.1" , & v70 , "7.0.24-13" },
576583 {"recommended" , "1.21.0" , & v70 , "7.0.24-13" },
@@ -582,6 +589,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
582589 {"recommended" , "1.16.2" , & v70 , "7.0.8-5" },
583590 {"recommended" , "1.16.1" , & v70 , "7.0.8-5" },
584591 {"recommended" , "1.16.0" , & v70 , "7.0.8-5" },
592+ {"recommended" , "1.22.0" , & v60 , "6.0.27-21" },
585593 {"recommended" , "1.21.2" , & v60 , "6.0.27-21" },
586594 {"recommended" , "1.21.1" , & v60 , "6.0.25-20" },
587595 {"recommended" , "1.21.0" , & v60 , "6.0.25-20" },
@@ -636,13 +644,15 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
636644 {"recommended" , "1.5.0" , & v36 , "3.6.19-7.0" },
637645
638646 // test exact
647+ {"8.0.19-7" , "1.22.0" , nil , "8.0.19-7" },
639648 {"8.0.17-6" , "1.21.2" , nil , "8.0.17-6" },
640649 {"8.0.12-4" , "1.21.1" , nil , "8.0.12-4" },
641650 {"8.0.12-4" , "1.21.0" , nil , "8.0.12-4" },
642651 {"8.0.8-3" , "1.20.1" , nil , "8.0.8-3" },
643652 {"8.0.8-3" , "1.20.0" , nil , "8.0.8-3" },
644653 {"8.0.4-1" , "1.19.1" , nil , "8.0.4-1" },
645654 {"8.0.4-1" , "1.19.0" , nil , "8.0.4-1" },
655+ {"7.0.30-16" , "1.22.0" , nil , "7.0.30-16" },
646656 {"7.0.28-15" , "1.21.2" , nil , "7.0.28-15" },
647657 {"7.0.24-13" , "1.21.1" , nil , "7.0.24-13" },
648658 {"7.0.24-13" , "1.21.0" , nil , "7.0.24-13" },
@@ -655,6 +665,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
655665 {"7.0.8-5" , "1.16.2" , nil , "7.0.8-5" },
656666 {"7.0.8-5" , "1.16.1" , nil , "7.0.8-5" },
657667 {"7.0.8-5" , "1.16.0" , nil , "7.0.8-5" },
668+ {"6.0.27-21" , "1.22.0" , nil , "6.0.27-21" },
658669 {"6.0.27-21" , "1.21.2" , nil , "6.0.27-21" },
659670 {"6.0.25-20" , "1.21.1" , nil , "6.0.25-20" },
660671 {"6.0.25-20" , "1.21.0" , nil , "6.0.25-20" },
@@ -712,13 +723,15 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
712723 {"3.6.18-5.0" , "1.5.0" , nil , "3.6.18-5.0" },
713724
714725 //test with suffix
726+ {"8.0-latest" , "1.22.0" , nil , "8.0.19-7" },
715727 {"8.0-latest" , "1.21.2" , nil , "8.0.17-6" },
716728 {"8.0-latest" , "1.21.1" , nil , "8.0.12-4" },
717729 {"8.0-latest" , "1.21.0" , nil , "8.0.12-4" },
718730 {"8.0-latest" , "1.20.1" , nil , "8.0.8-3" },
719731 {"8.0-latest" , "1.20.0" , nil , "8.0.8-3" },
720732 {"8.0-latest" , "1.19.1" , nil , "8.0.4-1" },
721733 {"8.0-latest" , "1.19.0" , nil , "8.0.4-1" },
734+ {"7.0-latest" , "1.22.0" , nil , "7.0.30-16" },
722735 {"7.0-latest" , "1.21.2" , nil , "7.0.28-15" },
723736 {"7.0-latest" , "1.21.1" , nil , "7.0.24-13" },
724737 {"7.0-latest" , "1.21.0" , nil , "7.0.24-13" },
@@ -731,6 +744,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
731744 {"7.0-latest" , "1.16.2" , nil , "7.0.8-5" },
732745 {"7.0-latest" , "1.16.1" , nil , "7.0.8-5" },
733746 {"7.0-latest" , "1.16.0" , nil , "7.0.8-5" },
747+ {"6.0-latest" , "1.22.0" , nil , "6.0.27-21" },
734748 {"6.0-latest" , "1.21.2" , nil , "6.0.27-21" },
735749 {"6.0-latest" , "1.21.1" , nil , "6.0.25-20" },
736750 {"6.0-latest" , "1.21.0" , nil , "6.0.25-20" },
@@ -787,9 +801,11 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
787801 {"3.6-latest" , "1.6.0" , nil , "3.6.21-10.0" },
788802 {"3.6-latest" , "1.5.0" , nil , "3.6.19-7.0" },
789803
804+ {"8.0-recommended" , "1.22.0" , nil , "8.0.19-7" },
790805 {"8.0-recommended" , "1.21.2" , nil , "8.0.17-6" },
791806 {"8.0-recommended" , "1.21.1" , nil , "8.0.12-4" },
792807 {"8.0-recommended" , "1.21.0" , nil , "8.0.12-4" },
808+ {"7.0-recommended" , "1.22.0" , nil , "7.0.30-16" },
793809 {"7.0-recommended" , "1.21.2" , nil , "7.0.28-15" },
794810 {"7.0-recommended" , "1.21.1" , nil , "7.0.24-13" },
795811 {"7.0-recommended" , "1.21.0" , nil , "7.0.24-13" },
@@ -802,6 +818,8 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
802818 {"7.0-recommended" , "1.16.2" , nil , "7.0.8-5" },
803819 {"7.0-recommended" , "1.16.1" , nil , "7.0.8-5" },
804820 {"7.0-recommended" , "1.16.0" , nil , "7.0.8-5" },
821+ {"6.0-recommended" , "1.22.0" , nil , "6.0.27-21" },
822+ {"6.0-recommended" , "1.21.2" , nil , "6.0.27-21" },
805823 {"6.0-recommended" , "1.21.1" , nil , "6.0.25-20" },
806824 {"6.0-recommended" , "1.21.0" , nil , "6.0.25-20" },
807825 {"6.0-recommended" , "1.20.1" , nil , "6.0.21-18" },
0 commit comments