diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 28b793405286..5c8b35d4846f 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -61,8 +61,8 @@ func NewCephManifests(settings *TestCephSettings) CephManifests { switch settings.RookVersion { case LocalBuildTag: return &CephManifestsMaster{settings} - case Version1_6: - return &CephManifestsV1_6{settings} + case Version1_7: + return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}} } panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion)) } @@ -105,7 +105,7 @@ func (m *CephManifestsMaster) GetToolbox() string { //********************************************************************************** //********************************************************************************** // After a release, copy the methods below this separator into the versioned file -// such as ceph_manifests_v1.6.go. Methods above this separator do not need to be +// such as ceph_manifests_previous.go. Methods above this separator do not need to be // copied since the versioned implementation will load them directly from github. //********************************************************************************** //********************************************************************************** diff --git a/tests/framework/installer/ceph_manifests_previous.go b/tests/framework/installer/ceph_manifests_previous.go new file mode 100644 index 000000000000..0e19bfa669de --- /dev/null +++ b/tests/framework/installer/ceph_manifests_previous.go @@ -0,0 +1,162 @@ +/* +Copyright 2016 The Rook Authors. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package installer + +import ( + "strings" + + "github.com/rook/rook/tests/framework/utils" +) + +const ( + // The version from which the upgrade test will start + Version1_7 = "v1.7.8" +) + +// CephManifestsPreviousVersion wraps rook yaml definitions +type CephManifestsPreviousVersion struct { + settings *TestCephSettings + latest *CephManifestsMaster +} + +func (m *CephManifestsPreviousVersion) Settings() *TestCephSettings { + return m.settings +} + +func (m *CephManifestsPreviousVersion) GetCRDs(k8shelper *utils.K8sHelper) string { + return m.settings.readManifestFromGithub("crds.yaml") +} + +// GetRookOperator returns rook Operator manifest +func (m *CephManifestsPreviousVersion) GetOperator() string { + var manifest string + if utils.IsPlatformOpenShift() { + manifest = m.settings.readManifestFromGithub("operator-openshift.yaml") + } else { + manifest = m.settings.readManifestFromGithub("operator.yaml") + } + return m.settings.replaceOperatorSettings(manifest) +} + +// GetCommon returns rook-cluster manifest +func (m *CephManifestsPreviousVersion) GetCommon() string { + return m.settings.readManifestFromGithub("common.yaml") +} + +// GetRookToolBox returns rook-toolbox manifest +func (m *CephManifestsPreviousVersion) GetToolbox() string { + if m.settings.DirectMountToolbox { + manifest := strings.ReplaceAll(m.settings.readManifestFromGithub("direct-mount.yaml"), "name: rook-direct-mount", "name: rook-ceph-tools") + return strings.ReplaceAll(manifest, "app: rook-direct-mount", "app: rook-ceph-tools") + } + return m.settings.readManifestFromGithub("toolbox.yaml") +} + +func (m *CephManifestsPreviousVersion) GetCommonExternal() string { + return m.settings.readManifestFromGithub("common-external.yaml") +} + +//********************************************************************************** +//********************************************************************************** +// Methods in this section may need to be customized depending on new +// features that are being added in newer releases and may not be possible +// to configure in the previous release. By default, all these methods will +// provide a thin wrapper around the resources created by the master +// implementation. +//********************************************************************************** +//********************************************************************************** + +// GetRookCluster returns rook-cluster manifest +func (m *CephManifestsPreviousVersion) GetCephCluster() string { + return m.latest.GetCephCluster() +} + +func (m *CephManifestsPreviousVersion) GetBlockSnapshotClass(snapshotClassName, reclaimPolicy string) string { + return m.latest.GetBlockSnapshotClass(snapshotClassName, reclaimPolicy) +} + +func (m *CephManifestsPreviousVersion) GetFileStorageSnapshotClass(snapshotClassName, reclaimPolicy string) string { + return m.latest.GetFileStorageSnapshotClass(snapshotClassName, reclaimPolicy) +} + +func (m *CephManifestsPreviousVersion) GetBlockPool(poolName, replicaSize string) string { + return m.latest.GetBlockPool(poolName, replicaSize) +} + +func (m *CephManifestsPreviousVersion) GetBlockStorageClass(poolName, storageClassName, reclaimPolicy string) string { + return m.latest.GetBlockStorageClass(poolName, storageClassName, reclaimPolicy) +} + +func (m *CephManifestsPreviousVersion) GetFileStorageClass(fsName, storageClassName string) string { + return m.latest.GetFileStorageClass(fsName, storageClassName) +} + +// GetFilesystem returns the manifest to create a Rook filesystem resource with the given config. +func (m *CephManifestsPreviousVersion) GetFilesystem(name string, activeCount int) string { + return m.latest.GetFilesystem(name, activeCount) +} + +// GetFilesystem returns the manifest to create a Rook Ceph NFS resource with the given config. +func (m *CephManifestsPreviousVersion) GetNFS(name, pool string, count int) string { + return m.latest.GetNFS(name, pool, count) +} + +func (m *CephManifestsPreviousVersion) GetObjectStore(name string, replicaCount, port int, tlsEnable bool) string { + return m.latest.GetObjectStore(name, replicaCount, port, tlsEnable) +} + +func (m *CephManifestsPreviousVersion) GetObjectStoreUser(name, displayName, store, usercaps, maxsize string, maxbuckets, maxobjects int) string { + return m.latest.GetObjectStoreUser(name, displayName, store, usercaps, maxsize, maxbuckets, maxobjects) +} + +//GetBucketStorageClass returns the manifest to create object bucket +func (m *CephManifestsPreviousVersion) GetBucketStorageClass(storeName, storageClassName, reclaimPolicy, region string) string { + return m.latest.GetBucketStorageClass(storeName, storageClassName, reclaimPolicy, region) +} + +//GetOBC returns the manifest to create object bucket claim +func (m *CephManifestsPreviousVersion) GetOBC(claimName, storageClassName, objectBucketName, maxObject string, varBucketName bool) string { + return m.latest.GetOBC(claimName, storageClassName, objectBucketName, maxObject, varBucketName) +} + +//GetOBCNotification returns the manifest to create object bucket claim +func (m *CephManifestsPreviousVersion) GetOBCNotification(claimName, storageClassName, objectBucketName, notificationName string, varBucketName bool) string { + return m.latest.GetOBCNotification(claimName, storageClassName, objectBucketName, notificationName, varBucketName) +} + +//GetBucketNotification returns the manifest to create ceph bucket notification +func (m *CephManifestsPreviousVersion) GetBucketNotification(notificationName, topicName string) string { + return m.latest.GetBucketNotification(notificationName, topicName) +} + +//GetBucketTopic returns the manifest to create ceph bucket topic +func (m *CephManifestsPreviousVersion) GetBucketTopic(topicName, storeName, httpEndpointService string) string { + return m.latest.GetBucketTopic(topicName, storeName, httpEndpointService) +} + +func (m *CephManifestsPreviousVersion) GetClient(claimName string, caps map[string]string) string { + return m.latest.GetClient(claimName, caps) +} + +func (m *CephManifestsPreviousVersion) GetExternalCephCluster() string { + return m.latest.GetExternalCephCluster() +} + +// GetRBDMirror returns the manifest to create a Rook Ceph RBD Mirror resource with the given config. +func (m *CephManifestsPreviousVersion) GetRBDMirror(name string, count int) string { + return m.latest.GetRBDMirror(name, count) +} diff --git a/tests/framework/installer/ceph_manifests_v1.6.go b/tests/framework/installer/ceph_manifests_v1.6.go deleted file mode 100644 index 7bf32b6bb609..000000000000 --- a/tests/framework/installer/ceph_manifests_v1.6.go +++ /dev/null @@ -1,445 +0,0 @@ -/* -Copyright 2016 The Rook Authors. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package installer - -import ( - "strconv" - "strings" - - "github.com/rook/rook/tests/framework/utils" -) - -const ( - // The version from which the upgrade test will start - Version1_6 = "v1.6.7" -) - -// CephManifestsV1_6 wraps rook yaml definitions -type CephManifestsV1_6 struct { - settings *TestCephSettings -} - -func (m *CephManifestsV1_6) Settings() *TestCephSettings { - return m.settings -} - -func (m *CephManifestsV1_6) GetCRDs(k8shelper *utils.K8sHelper) string { - return m.settings.readManifestFromGithub("crds.yaml") -} - -// GetRookOperator returns rook Operator manifest -func (m *CephManifestsV1_6) GetOperator() string { - var manifest string - if utils.IsPlatformOpenShift() { - manifest = m.settings.readManifestFromGithub("operator-openshift.yaml") - } else { - manifest = m.settings.readManifestFromGithub("operator.yaml") - } - return m.settings.replaceOperatorSettings(manifest) -} - -// GetCommon returns rook-cluster manifest -func (m *CephManifestsV1_6) GetCommon() string { - return m.settings.readManifestFromGithub("common.yaml") -} - -// GetRookToolBox returns rook-toolbox manifest -func (m *CephManifestsV1_6) GetToolbox() string { - if m.settings.DirectMountToolbox { - manifest := strings.ReplaceAll(m.settings.readManifestFromGithub("direct-mount.yaml"), "name: rook-direct-mount", "name: rook-ceph-tools") - return strings.ReplaceAll(manifest, "app: rook-direct-mount", "app: rook-ceph-tools") - } - return m.settings.readManifestFromGithub("toolbox.yaml") -} - -func (m *CephManifestsV1_6) GetCommonExternal() string { - return m.settings.readManifestFromGithub("common-external.yaml") -} - -//********************************************************************************** -//********************************************************************************** -// After a release, replace the methods below this separator from the -// ceph_manifests.go. Methods above this separator do not need to be -// copied since they will load them directly from github. -//********************************************************************************** -//********************************************************************************** - -// GetRookCluster returns rook-cluster manifest -func (m *CephManifestsV1_6) GetCephCluster() string { - crushRoot := "# crushRoot not specified; Rook will use `default`" - if m.settings.Mons == 1 { - crushRoot = `crushRoot: "custom-root"` - } - - if m.settings.UsePVC { - return `apiVersion: ceph.rook.io/v1 -kind: CephCluster -metadata: - # set the name to something different from the namespace - name: ` + m.settings.ClusterName + ` - namespace: ` + m.settings.Namespace + ` -spec: - dataDirHostPath: ` + m.settings.DataDirHostPath + ` - mon: - count: ` + strconv.Itoa(m.settings.Mons) + ` - allowMultiplePerNode: true - volumeClaimTemplate: - spec: - storageClassName: ` + m.settings.StorageClassName + ` - resources: - requests: - storage: 5Gi - cephVersion: - image: ` + m.settings.CephVersion.Image + ` - allowUnsupported: ` + strconv.FormatBool(m.settings.CephVersion.AllowUnsupported) + ` - skipUpgradeChecks: false - continueUpgradeAfterChecksEvenIfNotHealthy: false - dashboard: - enabled: true - network: - hostNetwork: false - crashCollector: - disable: false - storage: - config: - ` + crushRoot + ` - storageClassDeviceSets: - - name: set1 - count: 1 - portable: false - tuneDeviceClass: true - encrypted: false - volumeClaimTemplates: - - metadata: - name: data - spec: - resources: - requests: - storage: 10Gi - storageClassName: ` + m.settings.StorageClassName + ` - volumeMode: Block - accessModes: - - ReadWriteOnce - disruptionManagement: - managePodBudgets: false - osdMaintenanceTimeout: 30 - pgHealthCheckTimeout: 0 - manageMachineDisruptionBudgets: false - machineDisruptionBudgetNamespace: openshift-machine-api` - } - - return `apiVersion: ceph.rook.io/v1 -kind: CephCluster -metadata: - name: ` + m.settings.ClusterName + ` - namespace: ` + m.settings.Namespace + ` -spec: - cephVersion: - image: ` + m.settings.CephVersion.Image + ` - allowUnsupported: ` + strconv.FormatBool(m.settings.CephVersion.AllowUnsupported) + ` - dataDirHostPath: ` + m.settings.DataDirHostPath + ` - network: - hostNetwork: false - mon: - count: ` + strconv.Itoa(m.settings.Mons) + ` - allowMultiplePerNode: true - dashboard: - enabled: true - skipUpgradeChecks: true - metadataDevice: - storage: - useAllNodes: ` + strconv.FormatBool(!m.settings.SkipOSDCreation) + ` - useAllDevices: ` + strconv.FormatBool(!m.settings.SkipOSDCreation) + ` - deviceFilter: '' - config: - databaseSizeMB: "1024" - journalSizeMB: "1024" - mgr: - modules: - - name: pg_autoscaler - enabled: true - - name: rook - enabled: true - healthCheck: - daemonHealth: - mon: - interval: 10s - timeout: 15s - osd: - interval: 10s - status: - interval: 5s` -} - -func (m *CephManifestsV1_6) GetBlockSnapshotClass(snapshotClassName, reclaimPolicy string) string { - // Create a CSI driver snapshotclass - return ` -apiVersion: snapshot.storage.k8s.io/v1beta1 -kind: VolumeSnapshotClass -metadata: - name: ` + snapshotClassName + ` -driver: ` + m.settings.OperatorNamespace + `.rbd.csi.ceph.com -deletionPolicy: ` + reclaimPolicy + ` -parameters: - clusterID: ` + m.settings.Namespace + ` - csi.storage.k8s.io/snapshotter-secret-name: rook-csi-rbd-provisioner - csi.storage.k8s.io/snapshotter-secret-namespace: ` + m.settings.Namespace + ` -` -} - -func (m *CephManifestsV1_6) GetFileStorageSnapshotClass(snapshotClassName, reclaimPolicy string) string { - // Create a CSI driver snapshotclass - return ` -apiVersion: snapshot.storage.k8s.io/v1beta1 -kind: VolumeSnapshotClass -metadata: - name: ` + snapshotClassName + ` -driver: ` + m.settings.OperatorNamespace + `.cephfs.csi.ceph.com -deletionPolicy: ` + reclaimPolicy + ` -parameters: - clusterID: ` + m.settings.Namespace + ` - csi.storage.k8s.io/snapshotter-secret-name: rook-csi-cephfs-provisioner - csi.storage.k8s.io/snapshotter-secret-namespace: ` + m.settings.Namespace + ` -` -} - -func (m *CephManifestsV1_6) GetBlockPool(poolName, replicaSize string) string { - return `apiVersion: ceph.rook.io/v1 -kind: CephBlockPool -metadata: - name: ` + poolName + ` - namespace: ` + m.settings.Namespace + ` -spec: - replicated: - size: ` + replicaSize + ` - targetSizeRatio: .5 - requireSafeReplicaSize: false - parameters: - compression_mode: aggressive - mirroring: - enabled: true - mode: image - quotas: - maxBytes: 10737418240 - maxObjects: 1000000 - statusCheck: - mirror: - disabled: false - interval: 10s` -} - -func (m *CephManifestsV1_6) GetBlockStorageClass(poolName, storageClassName, reclaimPolicy string) string { - // Create a CSI driver storage class - return ` -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: ` + storageClassName + ` -provisioner: ` + m.settings.OperatorNamespace + `.rbd.csi.ceph.com -reclaimPolicy: ` + reclaimPolicy + ` -parameters: - pool: ` + poolName + ` - clusterID: ` + m.settings.Namespace + ` - csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner - csi.storage.k8s.io/provisioner-secret-namespace: ` + m.settings.Namespace + ` - csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node - csi.storage.k8s.io/node-stage-secret-namespace: ` + m.settings.Namespace + ` - imageFeatures: layering - csi.storage.k8s.io/fstype: ext4 -` -} - -func (m *CephManifestsV1_6) GetFileStorageClass(fsName, storageClassName string) string { - // Create a CSI driver storage class - csiCephFSNodeSecret := "rook-csi-cephfs-node" //nolint:gosec // We safely suppress gosec in tests file - csiCephFSProvisionerSecret := "rook-csi-cephfs-provisioner" //nolint:gosec // We safely suppress gosec in tests file - return ` -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: ` + storageClassName + ` -provisioner: ` + m.settings.OperatorNamespace + `.cephfs.csi.ceph.com -parameters: - clusterID: ` + m.settings.Namespace + ` - fsName: ` + fsName + ` - pool: ` + fsName + `-data0 - csi.storage.k8s.io/provisioner-secret-name: ` + csiCephFSProvisionerSecret + ` - csi.storage.k8s.io/provisioner-secret-namespace: ` + m.settings.Namespace + ` - csi.storage.k8s.io/node-stage-secret-name: ` + csiCephFSNodeSecret + ` - csi.storage.k8s.io/node-stage-secret-namespace: ` + m.settings.Namespace + ` -` -} - -// GetFilesystem returns the manifest to create a Rook filesystem resource with the given config. -func (m *CephManifestsV1_6) GetFilesystem(name string, activeCount int) string { - return `apiVersion: ceph.rook.io/v1 -kind: CephFilesystem -metadata: - name: ` + name + ` - namespace: ` + m.settings.Namespace + ` -spec: - metadataPool: - replicated: - size: 1 - requireSafeReplicaSize: false - dataPools: - - replicated: - size: 1 - requireSafeReplicaSize: false - compressionMode: none - metadataServer: - activeCount: ` + strconv.Itoa(activeCount) + ` - activeStandby: true` -} - -// GetFilesystem returns the manifest to create a Rook Ceph NFS resource with the given config. -func (m *CephManifestsV1_6) GetNFS(name, pool string, count int) string { - return `apiVersion: ceph.rook.io/v1 -kind: CephNFS -metadata: - name: ` + name + ` - namespace: ` + m.settings.Namespace + ` -spec: - rados: - pool: ` + pool + ` - namespace: nfs-ns - server: - active: ` + strconv.Itoa(count) -} - -func (m *CephManifestsV1_6) GetObjectStore(name string, replicaCount, port int, tlsEnable bool) string { - return `apiVersion: ceph.rook.io/v1 -kind: CephObjectStore -metadata: - name: ` + name + ` - namespace: ` + m.settings.Namespace + ` -spec: - metadataPool: - replicated: - size: 1 - requireSafeReplicaSize: false - compressionMode: passive - dataPool: - replicated: - size: 1 - requireSafeReplicaSize: false - gateway: - sslCertificateRef: - port: ` + strconv.Itoa(port) + ` - instances: ` + strconv.Itoa(replicaCount) + ` - healthCheck: - bucket: - disabled: false - interval: 10s -` -} - -func (m *CephManifestsV1_6) GetObjectStoreUser(name, displayName, store, usercaps, maxsize string, maxbuckets, maxobjects int) string { - return `apiVersion: ceph.rook.io/v1 -kind: CephObjectStoreUser -metadata: - name: ` + name + ` - namespace: ` + m.settings.Namespace + ` -spec: - displayName: ` + displayName + ` - store: ` + store -} - -//GetBucketStorageClass returns the manifest to create object bucket -func (m *CephManifestsV1_6) GetBucketStorageClass(storeName, storageClassName, reclaimPolicy, region string) string { - return `apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: ` + storageClassName + ` -provisioner: ` + m.settings.Namespace + `.ceph.rook.io/bucket -reclaimPolicy: ` + reclaimPolicy + ` -parameters: - objectStoreName: ` + storeName + ` - objectStoreNamespace: ` + m.settings.Namespace + ` - region: ` + region -} - -//GetOBC returns the manifest to create object bucket claim -func (m *CephManifestsV1_6) GetOBC(claimName, storageClassName, objectBucketName, maxObject string, varBucketName bool) string { - bucketParameter := "generateBucketName" - if varBucketName { - bucketParameter = "bucketName" - } - return `apiVersion: objectbucket.io/v1alpha1 -kind: ObjectBucketClaim -metadata: - name: ` + claimName + ` -spec: - ` + bucketParameter + `: ` + objectBucketName + ` - storageClassName: ` + storageClassName + ` - additionalConfig: - maxObjects: "` + maxObject + `"` -} - -//GetOBCNotification returns the manifest to create object bucket claim -func (m *CephManifestsV1_6) GetOBCNotification(claimName string, storageClassName string, objectBucketName string, notificationName string, varBucketName bool) string { - panic("bucket notifications are not supported in rook v1.6") -} - -//GetBucketNotification returns the manifest to create ceph bucket notification -func (m *CephManifestsV1_6) GetBucketNotification(notificationName string, topicName string) string { - panic("bucket notifications are not supported in rook v1.6") -} - -//GetBucketTopic returns the manifest to create ceph bucket topic -func (m *CephManifestsV1_6) GetBucketTopic(topicName string, storeName string, httpEndpointService string) string { - panic("bucket notifications are not supported in rook v1.6") -} - -func (m *CephManifestsV1_6) GetClient(claimName string, caps map[string]string) string { - clientCaps := []string{} - for name, cap := range caps { - str := name + ": " + cap - clientCaps = append(clientCaps, str) - } - return `apiVersion: ceph.rook.io/v1 -kind: CephClient -metadata: - name: ` + claimName + ` - namespace: ` + m.settings.Namespace + ` -spec: - caps: - ` + strings.Join(clientCaps, "\n ") -} - -func (m *CephManifestsV1_6) GetExternalCephCluster() string { - return `apiVersion: ceph.rook.io/v1 -kind: CephCluster -metadata: - name: ` + m.settings.Namespace + ` - namespace: ` + m.settings.Namespace + ` -spec: - external: - enable: true - dataDirHostPath: ` + m.settings.DataDirHostPath + `` -} - -// GetRBDMirror returns the manifest to create a Rook Ceph RBD Mirror resource with the given config. -func (m *CephManifestsV1_6) GetRBDMirror(name string, count int) string { - return `apiVersion: ceph.rook.io/v1 -kind: CephRBDMirror -metadata: - name: ` + name + ` - namespace: ` + m.settings.Namespace + ` -spec: - count: ` + strconv.Itoa(count) -} diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 9bdb94e12307..53a74c353ab3 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -83,7 +83,7 @@ func (s *UpgradeSuite) SetupSuite() { UsePVC: false, Mons: 1, SkipOSDCreation: false, - RookVersion: installer.Version1_6, + RookVersion: installer.Version1_7, CephVersion: installer.OctopusVersion, } @@ -118,7 +118,7 @@ func (s *UpgradeSuite) TestUpgradeRookToMaster() { // // Upgrade Rook from v1.6 to master // - logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_6) + logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_7) s.gatherLogs(s.settings.OperatorNamespace, "_before_master_upgrade") s.upgradeToMaster() @@ -127,7 +127,7 @@ func (s *UpgradeSuite) TestUpgradeRookToMaster() { err := s.installer.WaitForToolbox(s.namespace) assert.NoError(s.T(), err) - logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_6) + logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_7) newFile := "post-upgrade-1_6-to-master-file" s.verifyFilesAfterUpgrade(filesystemName, newFile, message, rbdFilesToRead, cephfsFilesToRead) rbdFilesToRead = append(rbdFilesToRead, newFile) @@ -139,7 +139,7 @@ func (s *UpgradeSuite) TestUpgradeRookToMaster() { // 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_6) + logger.Infof("Verified upgrade from %s to master", installer.Version1_7) // // Upgrade from octopus to pacific @@ -263,7 +263,7 @@ func (s *UpgradeSuite) deployClusterforUpgrade(objectStoreName, objectUserID, me require.True(s.T(), created) // verify that we're actually running the right pre-upgrade image - s.verifyOperatorImage(installer.Version1_6) + s.verifyOperatorImage(installer.Version1_7) assert.NoError(s.T(), s.k8sh.WriteToPod("", rbdPodName, preFilename, message)) assert.NoError(s.T(), s.k8sh.ReadFromPod("", rbdPodName, preFilename, message))