fix(upgrade): allow upgrades for volumes without monitor (#1760)

Signed-off-by: shubham <shubham.bajpai@mayadata.io>
openebs-archive · Nov 3, 2020 · dead3bc · dead3bc
1 parent 899dd5c
commit dead3bc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/pkg/apis/openebs.io/v1alpha1/versionDetails.go b/pkg/apis/openebs.io/v1alpha1/versionDetails.go
@@ -29,6 +29,7 @@ var (
 		"1.4.0": true, "1.5.0": true, "1.6.0": true, "1.7.0": true,
 		"1.8.0": true, "1.9.0": true, "1.10.0": true, "1.11.0": true,
 		"1.12.0": true, "2.0.0": true, "2.1.0": true, "2.2.0": true,
+		"2.3.0": true,
 	}
 	validDesiredVersion = strings.Split(version.GetVersion(), "-")[0]
 )

diff --git a/pkg/upgrade/templates/v1/cstor_target.go b/pkg/upgrade/templates/v1/cstor_target.go
@@ -44,6 +44,7 @@ var (
             ]
           {{end}}
           },
+          {{if .IsMonitorEnabled}}
           {
             "name": "maya-volume-exporter",
             "image": "{{.MExporterImage}}:{{.ImageTag}}"{{if isCurrentLessThanNewVersion .CurrentVersion "1.7.0"}},
@@ -55,6 +56,7 @@ var (
             ]
           {{end}}
           },
+          {{end}}
           {
             "name": "cstor-volume-mgmt",
             "image": "{{.VolumeMgmtImage}}:{{.ImageTag}}"{{if isCurrentLessThanNewVersion .CurrentVersion "1.7.0"}},

diff --git a/pkg/upgrade/templates/v1/jiva_target.go b/pkg/upgrade/templates/v1/jiva_target.go
@@ -37,11 +37,12 @@ var (
           {
             "name": "{{.ControllerContainerName}}",
             "image": "{{.ControllerImage}}:{{.ImageTag}}"
-          },
+          }{{if .IsMonitorEnabled}},
           {
             "name": "maya-volume-exporter",
             "image": "{{.MExporterImage}}:{{.ImageTag}}"
           }
+          {{end}}
         ]
       }
     }

diff --git a/pkg/upgrade/upgrader/cstor_volume_upgrade.go b/pkg/upgrade/upgrader/cstor_volume_upgrade.go
@@ -37,6 +37,7 @@ import (
 type cstorTargetPatchDetails struct {
 	CurrentVersion, UpgradeVersion, ImageTag, IstgtImage,
 	BaseDir, MExporterImage, VolumeMgmtImage, PVName string
+	IsMonitorEnabled bool
 }
 
 const (
@@ -69,6 +70,7 @@ func getTargetDeployPatchDetails(
 	d *appsv1.Deployment,
 ) (*cstorTargetPatchDetails, error) {
 	patchDetails := &cstorTargetPatchDetails{}
+	patchDetails.IsMonitorEnabled = true
 	if d.Name == "" {
 		return nil, errors.Errorf("missing deployment name")
 	}
@@ -79,7 +81,11 @@ func getTargetDeployPatchDetails(
 	patchDetails.IstgtImage = istgtImage
 	mexporterImage, err := getBaseImage(d, "maya-volume-exporter")
 	if err != nil {
-		return nil, err
+		if err.Error() == "image not found for container maya-volume-exporter" {
+			patchDetails.IsMonitorEnabled = false
+		} else {
+			return nil, err
+		}
 	}
 	patchDetails.MExporterImage = mexporterImage
 	volumeMgmtImage, err := getBaseImage(d, "cstor-volume-mgmt")

diff --git a/pkg/upgrade/upgrader/jiva_upgrade.go b/pkg/upgrade/upgrader/jiva_upgrade.go
@@ -47,6 +47,7 @@ type replicaPatchDetails struct {
 
 type controllerPatchDetails struct {
 	UpgradeVersion, ImageTag, ControllerContainerName, ControllerImage, MExporterImage string
+	IsMonitorEnabled                                                                   bool
 }
 
 type replicaDetails struct {
@@ -92,6 +93,7 @@ func getControllerPatchDetails(d *appsv1.Deployment) (
 	error,
 ) {
 	patchDetails := &controllerPatchDetails{}
+	patchDetails.IsMonitorEnabled = true
 	// verify delpoyment name
 	if d.Name == "" {
 		return nil, errors.New("missing deployment name")
@@ -108,7 +110,11 @@ func getControllerPatchDetails(d *appsv1.Deployment) (
 	patchDetails.ControllerImage = image
 	image, err = getBaseImage(d, "maya-volume-exporter")
 	if err != nil {
-		return nil, err
+		if err.Error() == "image not found for container maya-volume-exporter" {
+			patchDetails.IsMonitorEnabled = false
+		} else {
+			return nil, err
+		}
 	}
 	patchDetails.MExporterImage = image
 	if imageTag != "" {