diff --git a/VERSION b/VERSION index 1cac385c6c..0eed1a29ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.11.0 +1.12.0 diff --git a/pkg/apis/openebs.io/v1alpha1/versionDetails.go b/pkg/apis/openebs.io/v1alpha1/versionDetails.go index 925523d504..ebc83c92eb 100644 --- a/pkg/apis/openebs.io/v1alpha1/versionDetails.go +++ b/pkg/apis/openebs.io/v1alpha1/versionDetails.go @@ -28,6 +28,7 @@ var ( "1.0.0": true, "1.1.0": true, "1.2.0": true, "1.3.0": true, "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, } validDesiredVersion = version.GetVersion() ) diff --git a/pkg/upgrade/upgrader/exec.go b/pkg/upgrade/upgrader/exec.go index 0fb1402d8f..1aeb76db05 100644 --- a/pkg/upgrade/upgrader/exec.go +++ b/pkg/upgrade/upgrader/exec.go @@ -186,15 +186,23 @@ func verifyMayaApiserver(openebsNamespace string) error { }, ) if err != nil { - return errors.Wrapf(err, "failed to get maya-apiserver deployment") + return errors.Wrapf(err, "failed to list maya-apiserver pod(s)") } if len(mayaPods.Items) == 0 { return errors.Errorf( - "failed to get maya-apiserver deployment in %s", + "failed to get maya-apiserver pod(s) in %s", openebsNamespace, ) } - if len(mayaPods.Items) > 1 { + mayaDeploy, err := deployClient.WithNamespace(openebsNamespace).List( + &metav1.ListOptions{ + LabelSelector: mayaLabels, + }, + ) + if err != nil { + return errors.Wrapf(err, "failed to get maya-apiserver deployment") + } + if len(mayaPods.Items) != int(*mayaDeploy.Items[0].Spec.Replicas) { return errors.Errorf("control plane upgrade is not complete try after some time") } if mayaPods.Items[0].Labels["openebs.io/version"] != upgradeVersion {