diff --git a/drivers/storage/portworx/deployment.go b/drivers/storage/portworx/deployment.go index e2c731974..c0c61bd55 100644 --- a/drivers/storage/portworx/deployment.go +++ b/drivers/storage/portworx/deployment.go @@ -46,13 +46,13 @@ const ( ) var ( - pxVer2_3_2, _ = version.NewVersion("2.3.2") - pxVer2_5_5, _ = version.NewVersion("2.5.5") - pxVer2_6, _ = version.NewVersion("2.6") - pxVer2_8, _ = version.NewVersion("2.8") - pxVer2_9_1, _ = version.NewVersion("2.9.1") - pxVer3_0, _ = version.NewVersion("3.0") - pxVer3_0_1, _ = version.NewVersion("3.0.1") + pxVer2_3_2, _ = version.NewVersion("2.3.2") + pxVer2_5_5, _ = version.NewVersion("2.5.5") + pxVer2_6, _ = version.NewVersion("2.6") + pxVer2_8, _ = version.NewVersion("2.8") + pxVer2_9_1, _ = version.NewVersion("2.9.1") + pxVer2_13_8, _ = version.NewVersion("2.13.8") + pxVer3_0_1, _ = version.NewVersion("3.0.1") ) type volumeInfo struct { @@ -1226,7 +1226,7 @@ func (t *template) getVolumeMounts() []v1.VolumeMount { if t.cluster.Annotations != nil { preFltCheck = strings.TrimSpace(strings.ToLower(t.cluster.Annotations[pxutil.AnnotationPreflightCheck])) } - if t.pxVersion.GreaterThanOrEqual(pxVer3_0) && preFltCheck != "true" { + if t.pxVersion.GreaterThanOrEqual(pxVer2_13_8) && preFltCheck != "true" { extensions = append(extensions, t.getTelemetryPhoneHomeVolumeInfoList) } for _, fn := range extensions { @@ -1311,7 +1311,7 @@ func (t *template) getVolumes() []v1.Volume { if t.cluster.Annotations != nil { preFltCheck = strings.TrimSpace(strings.ToLower(t.cluster.Annotations[pxutil.AnnotationPreflightCheck])) } - if t.pxVersion.GreaterThanOrEqual(pxVer3_0) && preFltCheck != "true" { + if t.pxVersion.GreaterThanOrEqual(pxVer2_13_8) && preFltCheck != "true" { extensions = append(extensions, t.getTelemetryPhoneHomeVolumeInfoList) } diff --git a/drivers/storage/portworx/deployment_test.go b/drivers/storage/portworx/deployment_test.go index 78b11b1ce..ebede86d5 100644 --- a/drivers/storage/portworx/deployment_test.go +++ b/drivers/storage/portworx/deployment_test.go @@ -2592,7 +2592,7 @@ func TestPodWithTelemetryCCMVolume(t *testing.T) { Namespace: "kube-system", }, Spec: corev1.StorageClusterSpec{ - Image: "portworx/oci-monitor:2.8.0", + Image: "portworx/oci-monitor:2.13.7", Monitoring: &corev1.MonitoringSpec{ Telemetry: &corev1.TelemetrySpec{ Enabled: true, @@ -2633,7 +2633,7 @@ func TestPodWithTelemetryCCMVolume(t *testing.T) { assert.False(t, hasCCMVol || hasCCMVolMount) // Then upgrade the cluster to 3.0 and obtain the new pod spec - cluster.Spec.Image = "portworx/oci-monitor:3.0.0" + cluster.Spec.Image = "portworx/oci-monitor:2.13.8" err = driver.SetDefaultsOnStorageCluster(cluster) require.NoError(t, err)