update to remove major upgrade as its not currently supported

Author: jmccormick2001

apiserver/upgradeservice/upgradeimpl.go

@@ -108,6 +108,12 @@ func CreateUpgrade(request *msgs.CreateUpgradeRequest) msgs.CreateUpgradeRespons
 
 	var newInstance *crv1.Pgupgrade
 
+	if request.UpgradeType == MajorUpgrade {
+		response.Status.Code = msgs.Error
+		response.Status.Msg = "MajorUpgrade not supported yet"
+		return response
+	}
+
 	if request.Selector != "" {
 		//use the selector instead of an argument list to filter on
 

hugo/content/getting-started/_index.adoc

@@ -968,8 +968,6 @@ $ pgo upgrade NAME [FLAGS]
 |`--ccp-image-tag` |N/A |String |
 The CCPImageTag to use for cluster creation. If specified, overrides the pgo.yaml setting.
 
-|`--upgrade-type` |N/A |String |
-The upgrade type. Accepted values are either "minor" or "major", with the default being "minor".
 |=========================================================
 
 ==== Examples
@@ -981,19 +979,12 @@ Perform a minor PostgreSQL version upgrade:
 pgo upgrade mycluster
 ....
 
-===== Major Upgrade
-
-Perform a major PostgreSQL version upgrade:
-....
-pgo upgrade mycluster --upgrade-type=major
-....
-
 ===== Overriding Version
 
 Override the `CcpImageTag` variable defined in the pgo.yaml configuration file:
 ....
 pgo upgrade mycluster --ccp-image-tag=centos7-9.6.9-1.8.3
-pgo upgrade mycluster --upgrade-type=major --ccp-image-tag=centos7-9.6.9-1.8.3
+pgo upgrade mycluster --ccp-image-tag=centos7-9.6.9-1.8.3
 ....
 
 ===== Delete Upgrade

pgo/cmd/upgrade.go

@@ -17,13 +17,11 @@ package cmd
 */
 
 import (
-	"errors"
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
 	"github.com/crunchydata/postgres-operator/pgo/api"
-	"github.com/crunchydata/postgres-operator/pgo/util"
 	"github.com/spf13/cobra"
 	"os"
 )
@@ -45,12 +43,7 @@ var upgradeCmd = &cobra.Command{
 		if len(args) == 0 && Selector == "" {
 			fmt.Println(`Error: You must specify the cluster to upgrade.`)
 		} else {
-			err := validateCreateUpdate(args)
-			if err != nil {
-				fmt.Println("Error: ", err.Error())
-			} else {
-				createUpgrade(args)
-			}
+			createUpgrade(args)
 		}
 
 	},
@@ -59,7 +52,6 @@ var upgradeCmd = &cobra.Command{
 func init() {
 	RootCmd.AddCommand(upgradeCmd)
 
-	upgradeCmd.Flags().StringVarP(&UpgradeType, "upgrade-type", "", "minor", "The upgrade type. Accepted values are either 'minor' or 'major'.")
 	upgradeCmd.Flags().StringVarP(&CCPImageTag, "ccp-image-tag", "", "", "The CCPImageTag to use for cluster creation. If specified, overrides the pgo.yaml setting.")
 
 }
@@ -144,24 +136,6 @@ func deleteUpgrade(args []string) {
 
 }
 
-func validateCreateUpdate(args []string) error {
-	var err error
-
-	if UpgradeType == MajorUpgrade {
-		if util.AskForConfirmation(NoPrompt, "") {
-		} else {
-			fmt.Println("Aborting...")
-			os.Exit(2)
-		}
-
-	}
-	if UpgradeType == MajorUpgrade || UpgradeType == MinorUpgrade {
-	} else {
-		return errors.New("The --upgrade-type flag requires either a value of major or minor. If not specified, minor is the default value.")
-	}
-	return err
-}
-
 func createUpgrade(args []string) {
 	log.Debugf("createUpgrade called %v\n", args)
 
@@ -174,7 +148,7 @@ func createUpgrade(args []string) {
 	request.Args = args
 	request.Selector = Selector
 	request.CCPImageTag = CCPImageTag
-	request.UpgradeType = UpgradeType
+	request.UpgradeType = MinorUpgrade
 	request.ClientVersion = msgs.PGO_VERSION
 
 	response, err := api.CreateUpgrade(httpclient, &SessionCredentials, &request)