add --ccp-image-tag command flag for pgo create cluster and pgo upgrade

Author: Jeff McCormick

client/cmd/cluster.go

@@ -169,43 +169,37 @@ func createCluster(args []string) {
 
 func getClusterParams(name string) *tpr.PgCluster {
 
-	//set to internal defaults
-	spec := tpr.PgClusterSpec{
-		Name:                name,
-		ClusterName:         name,
-		CCP_IMAGE_TAG:       "centos7-9.5-1.2.8",
-		Port:                "5432",
-		PVC_NAME:            "",
-		PVC_SIZE:            "100M",
-		PVC_ACCESS_MODE:     "ReadWriteMany",
-		BACKUP_PATH:         "",
-		BACKUP_PVC_NAME:     "",
-		PG_MASTER_HOST:      name,
-		PG_MASTER_USER:      "master",
-		PG_MASTER_PASSWORD:  "password",
-		PG_USER:             "testuser",
-		PG_PASSWORD:         "password",
-		PG_DATABASE:         "userdb",
-		PG_ROOT_PASSWORD:    "password",
-		REPLICAS:            "2",
-		FS_GROUP:            "",
-		SUPPLEMENTAL_GROUPS: "",
-		STRATEGY:            "1",
-	}
+	spec := tpr.PgClusterSpec{}
+	spec.CCP_IMAGE_TAG = viper.GetString("CLUSTER.CCP_IMAGE_TAG")
+	if CCP_IMAGE_TAG != "" {
+		spec.CCP_IMAGE_TAG = CCP_IMAGE_TAG
+		log.Debug("using CCP_IMAGE_TAG from command line " + CCP_IMAGE_TAG)
+	}
+	spec.Name = name
+	spec.ClusterName = name
+	spec.Port = "5432"
+	spec.PVC_NAME = viper.GetString("CLUSTER.PVC_NAME")
+	spec.PVC_SIZE = "100M"
+	spec.PVC_ACCESS_MODE = "ReadWriteMany"
+	spec.BACKUP_PATH = ""
+	spec.BACKUP_PVC_NAME = ""
+	spec.PG_MASTER_HOST = name
+	spec.PG_MASTER_USER = "master"
+	spec.PG_MASTER_PASSWORD = viper.GetString("CLUSTER.PG_MASTER_PASSWORD")
+	spec.PG_USER = "testuser"
+	spec.PG_PASSWORD = viper.GetString("CLUSTER.PG_PASSWORD")
+	spec.PG_DATABASE = "userdb"
+	spec.PG_ROOT_PASSWORD = viper.GetString("CLUSTER.PG_ROOT_PASSWORD")
+	spec.REPLICAS = "0"
+	spec.FS_GROUP = ""
+	spec.SUPPLEMENTAL_GROUPS = ""
+	spec.STRATEGY = "1"
 
 	//override any values from config file
-	str := viper.GetString("CLUSTER.CCP_IMAGE_TAG")
-	if str != "" {
-		spec.CCP_IMAGE_TAG = str
-	}
-	str = viper.GetString("CLUSTER.PORT")
+	str := viper.GetString("CLUSTER.PORT")
 	if str != "" {
 		spec.Port = str
 	}
-	str = viper.GetString("CLUSTER.PVC_NAME")
-	if str != "" {
-		spec.PVC_NAME = str
-	}
 	str = viper.GetString("CLUSTER.PVC_SIZE")
 	if str != "" {
 		spec.PVC_SIZE = str
@@ -218,26 +212,14 @@ func getClusterParams(name string) *tpr.PgCluster {
 	if str != "" {
 		spec.PG_MASTER_USER = str
 	}
-	str = viper.GetString("CLUSTER.PG_MASTER_PASSWORD")
-	if str != "" {
-		spec.PG_MASTER_PASSWORD = str
-	}
 	str = viper.GetString("CLUSTER.PG_USER")
 	if str != "" {
 		spec.PG_USER = str
 	}
-	str = viper.GetString("CLUSTER.PG_PASSWORD")
-	if str != "" {
-		spec.PG_PASSWORD = str
-	}
 	str = viper.GetString("CLUSTER.PG_DATABASE")
 	if str != "" {
 		spec.PG_DATABASE = str
 	}
-	str = viper.GetString("CLUSTER.PG_ROOT_PASSWORD")
-	if str != "" {
-		spec.PG_ROOT_PASSWORD = str
-	}
 	str = viper.GetString("CLUSTER.FSGROUP")
 	if str != "" {
 		spec.FS_GROUP = str

client/cmd/create.go

@@ -21,6 +21,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var CCP_IMAGE_TAG string
 var Password string
 var BackupPath, BackupPVC string
 
@@ -73,5 +74,6 @@ func init() {
 	createClusterCmd.Flags().StringVarP(&Password, "password", "w", "", "The password to use for initial database users")
 	createClusterCmd.Flags().StringVarP(&BackupPVC, "backup-pvc", "p", "", "The backup archive PVC to restore from")
 	createClusterCmd.Flags().StringVarP(&BackupPath, "backup-path", "x", "", "The backup archive path to restore from")
+	createClusterCmd.Flags().StringVarP(&CCP_IMAGE_TAG, "ccp-image-tag", "c", "", "The CCP_IMAGE_TAG to use for cluster creation, if specified overrides the .pgo.yaml setting")
 
 }

client/cmd/upgrade.go

@@ -61,6 +61,7 @@ var upgradeCmd = &cobra.Command{
 func init() {
 	RootCmd.AddCommand(upgradeCmd)
 	upgradeCmd.Flags().StringVarP(&UpgradeType, "upgrade-type", "t", "minor", "The upgrade type to perform either minor or major, default is minor ")
+	upgradeCmd.Flags().StringVarP(&CCP_IMAGE_TAG, "ccp-image-tag", "c", "", "The CCP_IMAGE_TAG to use for the upgrade target")
 
 }
 
@@ -262,6 +263,11 @@ func getUpgradeParams(name string) (*tpr.PgUpgrade, error) {
 		NEW_PVC_NAME:      viper.GetString("PVC_NAME"),
 	}
 
+	if CCP_IMAGE_TAG != "" {
+		log.Debug("using CCP_IMAGE_TAG from command line " + CCP_IMAGE_TAG)
+		spec.CCP_IMAGE_TAG = CCP_IMAGE_TAG
+	}
+
 	cluster := tpr.PgCluster{}
 	err = Tprclient.Get().
 		Resource("pgclusters").
@@ -287,14 +293,25 @@ func getUpgradeParams(name string) (*tpr.PgUpgrade, error) {
 		return nil, err
 	}
 
-	if viper.GetString("CLUSTER.CCP_IMAGE_TAG") == existingImage {
+	var requestedMajorVersion float64
+
+	if CCP_IMAGE_TAG != "" {
+		if CCP_IMAGE_TAG == existingImage {
+			log.Error("CCP_IMAGE_TAG is the same as the cluster")
+			log.Error("can't upgrade to the same image version")
+
+			return nil, errors.New("invalid image tag")
+		}
+		requestedMajorVersion = parseMajorVersion(CCP_IMAGE_TAG)
+	} else if viper.GetString("CLUSTER.CCP_IMAGE_TAG") == existingImage {
 		log.Error("CCP_IMAGE_TAG is the same as the cluster")
 		log.Error("can't upgrade to the same image version")
 
 		return nil, errors.New("invalid image tag")
+	} else {
+		requestedMajorVersion = parseMajorVersion(viper.GetString("CLUSTER.CCP_IMAGE_TAG"))
 	}
 
-	requestedMajorVersion := parseMajorVersion(viper.GetString("CLUSTER.CCP_IMAGE_TAG"))
 	if UpgradeType == MAJOR_UPGRADE {
 		if requestedMajorVersion == existingMajorVersion {
 			log.Error("can't upgrade to the same major version")