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

Merge pull request #13900 from travisn/upgrade-from-1.13

Browse Source 
core: Upgrade test from 1.13 to master
This commit is contained in:
Travis Nielsen authored and GitHub committed 2024-03-08 10:12:08 -07:00
2 parents 9028d270a8 2e8468a47c
commit dc09ad5f37
3 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/framework/installer/ceph_manifests.go
+1 -1
View File
@@ -71,7 +71,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests {
switch settings.RookVersion {
case LocalBuildTag:
return &CephManifestsMaster{settings}
case Version1_12:
case Version1_13:
return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}}
}
panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion))
tests/framework/installer/ceph_manifests_previous.go
+1 -1
View File
@@ -24,7 +24,7 @@ import (
const (
// The version from which the upgrade test will start
Version1_12 = "v1.12.7"
Version1_13 = "v1.13.6"
)
// CephManifestsPreviousVersion wraps rook yaml definitions
tests/integration/ceph_upgrade_test.go
+6 -6
View File
@@ -88,7 +88,7 @@ func (s *UpgradeSuite) baseSetup(useHelm bool, initialCephVersion v1.CephVersion
Mons: 1,
EnableDiscovery: true,
SkipClusterCleanup: true,
RookVersion: installer.Version1_12,
RookVersion: installer.Version1_13,
CephVersion: initialCephVersion,
}
@@ -127,9 +127,9 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi
_ = s.helper.BucketClient.DeleteBucketStorageClass(s.namespace, installer.ObjectStoreName, installer.ObjectStoreSCName, "Delete")
//
// Upgrade Rook from v1.12 to master
// Upgrade Rook from v1.13 to master
//
logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_12)
logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_13)
s.gatherLogs(s.settings.OperatorNamespace, "_before_master_upgrade")
s.upgradeToMaster()
@@ -138,7 +138,7 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi
err := s.installer.WaitForToolbox(s.namespace)
assert.NoError(s.T(), err)
logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_12)
logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_13)
newFile := "post-upgrade-previous-to-master-file"
s.verifyFilesAfterUpgrade(newFile, rbdFilesToRead, cephfsFilesToRead)
rbdFilesToRead = append(rbdFilesToRead, newFile)
@@ -150,7 +150,7 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi
// do not need retry b/c the OBC controller runs parallel to Rook-Ceph orchestration
assert.True(s.T(), s.helper.BucketClient.CheckOBC(obcName, "bound"))
logger.Infof("Verified upgrade from %s to master", installer.Version1_12)
logger.Infof("Verified upgrade from %s to master", installer.Version1_13)
// SKIP the Ceph version upgrades for the helm test
if s.settings.UseHelm {
@@ -286,7 +286,7 @@ func (s *UpgradeSuite) deployClusterforUpgrade(objectUserID, preFilename string)
require.True(s.T(), created)
// verify that we're actually running the right pre-upgrade image
s.verifyOperatorImage(installer.Version1_12)
s.verifyOperatorImage(installer.Version1_13)
assert.NoError(s.T(), s.k8sh.WriteToPod("", rbdPodName, preFilename, simpleTestMessage))
assert.NoError(s.T(), s.k8sh.ReadFromPod("", rbdPodName, preFilename, simpleTestMessage))