feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

ci: test rook upgrade from 1.18

Browse Source 
The upgrade test is expected to check from the previous minor
release to the current master or latest release. With the
release of 1.19 coming soon, the upgrade test will now
check from v1.18.x.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 94e9e2ba91)
This commit is contained in:
Travis Nielsen authored and Mergify committed 2025-12-15 20:56:55 +00:00
1 parent be2a9a0708
commit 85f4047e2b
4 files changed
+6 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/framework/installer/ceph_installer.go
-5
View File
@@ -468,11 +468,6 @@ func (h *CephInstaller) GetNodeHostnames() ([]string, error) {
}
func (h *CephInstaller) InstallCSIOperator() error {
if h.settings.RookVersion == Version1_17 {
logger.Infof("Skipping the CSI operator installation for previous version of Rook")
return nil
}
logger.Infof("Starting the CSI operator")
_, err := h.k8shelper.KubectlWithStdin(h.Manifests.GetCSIOperator(), createFromStdinArgs...)
if err != nil {
tests/framework/installer/ceph_manifests.go
+1 -1
View File
@@ -72,7 +72,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests {
switch settings.RookVersion {
case LocalBuildTag:
return &CephManifestsMaster{settings}
case Version1_17:
case Version1_18:
return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}}
}
panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion))
tests/framework/installer/ceph_manifests_previous.go
+3 -2
View File
@@ -24,7 +24,7 @@ import (
const (
// The version from which the upgrade test will start
Version1_17 = "v1.17.7"
Version1_18 = "v1.18.8"
)
// CephManifestsPreviousVersion wraps rook yaml definitions
@@ -46,7 +46,8 @@ func (m *CephManifestsPreviousVersion) GetCSINFSRBAC() string {
}
func (m *CephManifestsPreviousVersion) GetCSIOperator() string {
return "not-supported"
manifest := m.settings.readManifestFromGitHub("csi-operator.yaml")
return m.settings.replaceCSIOperatorSettings(m.settings.OperatorNamespace, manifest)
}
// GetRookOperator returns rook Operator manifest
tests/integration/ceph_upgrade_test.go
+2 -4
View File
@@ -106,7 +106,7 @@ func (s *UpgradeSuite) TestUpgradeHelm() {
}
func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersionSpec) {
baseRookImage := installer.Version1_17
baseRookImage := installer.Version1_18
s.baseSetup(useHelm, baseRookImage, initialCephVersion)
objectUserID := "upgraded-user"
@@ -454,9 +454,7 @@ func (s *UpgradeSuite) upgradeToMaster() {
return
}
require.NoError(s.T(), s.installer.InstallCSIOperator())
require.NoError(s.T(), s.installer.SetOperatorSetting("ROOK_USE_CSI_OPERATOR", "true"))
require.NoError(s.T(), s.k8sh.ResourceOperation("apply", s.installer.Manifests.GetCSIOperator()))
require.NoError(s.T(), s.k8sh.ResourceOperation("apply", s.installer.Manifests.GetCRDs(s.k8sh)))
require.NoError(s.T(), s.k8sh.ResourceOperation("apply", s.installer.Manifests.GetCommon()))