Merge pull request #14487 from travisn/upgrade-from-1.14
tests: Upgrade from rook 1.14 to master
This commit is contained in:
3 files changed
+7
-12
No files matched your search
@@ -71,7 +71,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests {
|
||||
switch settings.RookVersion {
|
||||
case LocalBuildTag:
|
||||
return &CephManifestsMaster{settings}
|
||||
case Version1_13:
|
||||
case Version1_14:
|
||||
return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}}
|
||||
}
|
||||
panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion))
|
||||
@@ -237,15 +237,10 @@ spec:
|
||||
deviceFilter: ` + getDeviceFilter() + `
|
||||
config:
|
||||
databaseSizeMB: "1024"
|
||||
`
|
||||
// Append the storage settings if it's not an upgrade from 1.13 where the settings do not exist
|
||||
if m.settings.RookVersion != Version1_13 {
|
||||
clusterSpec += `
|
||||
fullRatio: 0.96
|
||||
backfillFullRatio: 0.91
|
||||
nearFullRatio: 0.88
|
||||
`
|
||||
}
|
||||
}
|
||||
|
||||
if m.settings.ConnectionsEncrypted {
|
||||
|
||||
@@ -24,7 +24,7 @@ import (
|
||||
|
||||
const (
|
||||
// The version from which the upgrade test will start
|
||||
Version1_13 = "v1.13.10"
|
||||
Version1_14 = "v1.14.8"
|
||||
)
|
||||
|
||||
// CephManifestsPreviousVersion wraps rook yaml definitions
|
||||
|
||||
@@ -105,7 +105,7 @@ func (s *UpgradeSuite) TestUpgradeHelm() {
|
||||
}
|
||||
|
||||
func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersionSpec) {
|
||||
s.baseSetup(useHelm, installer.Version1_13, initialCephVersion)
|
||||
s.baseSetup(useHelm, installer.Version1_14, initialCephVersion)
|
||||
|
||||
objectUserID := "upgraded-user"
|
||||
preFilename := "pre-upgrade-file"
|
||||
@@ -129,7 +129,7 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi
|
||||
//
|
||||
// Upgrade Rook from v1.13 to master
|
||||
//
|
||||
logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_13)
|
||||
logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_14)
|
||||
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_13)
|
||||
logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_14)
|
||||
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_13)
|
||||
logger.Infof("Verified upgrade from %s to master", installer.Version1_14)
|
||||
|
||||
// SKIP the Ceph version upgrades for the helm test
|
||||
if s.settings.UseHelm {
|
||||
@@ -330,7 +330,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_13)
|
||||
s.verifyOperatorImage(installer.Version1_14)
|
||||
|
||||
assert.NoError(s.T(), s.k8sh.WriteToPod("", rbdPodName, preFilename, simpleTestMessage))
|
||||
assert.NoError(s.T(), s.k8sh.ReadFromPod("", rbdPodName, preFilename, simpleTestMessage))
|
||||
|
||||
Reference in new issue
Block a user