minor fixes

Author: Jeff McCormick

client/cmd/load.go

@@ -82,7 +82,7 @@ func init() {
 
 	loadCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering ")
 	loadCmd.Flags().StringVarP(&LoadConfig, "load-config", "l", "", "The load configuration to use that defines the load job")
-	fmt.Println(" config is " + viper.GetString("PGO.CSVLOAD_TEMPLATE"))
+	log.Debug(" csvload config is " + viper.GetString("PGO.CSVLOAD_TEMPLATE"))
 }
 
 func createLoad(args []string) {

client/cmd/upgrade.go

@@ -23,6 +23,8 @@ import (
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"k8s.io/apimachinery/pkg/labels"
+
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"strconv"
@@ -42,8 +44,8 @@ var upgradeCmd = &cobra.Command{
 		pgo upgrade mycluster`,
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Debug("upgrade called")
-		if len(args) == 0 {
-			fmt.Println(`You must specify the cluster to upgrade.`)
+		if len(args) == 0 && Selector == "" {
+			fmt.Println(`You must specify the cluster to upgrade or a selector value.`)
 		} else {
 			err := validateCreateUpdate(args)
 			if err != nil {
@@ -59,6 +61,8 @@ var upgradeCmd = &cobra.Command{
 
 func init() {
 	RootCmd.AddCommand(upgradeCmd)
+	upgradeCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering ")
+
 	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")
 
@@ -162,6 +166,40 @@ func createUpgrade(args []string) {
 	var err error
 	var newInstance *tpr.PgUpgrade
 
+	if Selector != "" {
+		//use the selector instead of an argument list to filter on
+
+		myselector, err := labels.Parse(Selector)
+		if err != nil {
+			log.Error("could not parse selector flag")
+			return
+		}
+
+		//get the clusters list
+		clusterList := tpr.PgClusterList{}
+		err = Tprclient.Get().
+			Resource(tpr.CLUSTER_RESOURCE).
+			Namespace(Namespace).
+			LabelsSelectorParam(myselector).
+			Do().
+			Into(&clusterList)
+		if err != nil {
+			log.Error("error getting cluster list" + err.Error())
+			return
+		}
+
+		if len(clusterList.Items) == 0 {
+			log.Debug("no clusters found")
+		} else {
+			newargs := make([]string, 0)
+			for _, cluster := range clusterList.Items {
+				newargs = append(newargs, cluster.Spec.Name)
+			}
+			args = newargs
+		}
+
+	}
+
 	for _, arg := range args {
 		log.Debug("create upgrade called for " + arg)
 		result := tpr.PgUpgrade{}

client/cmd/user.go

@@ -107,7 +107,7 @@ func userManager() {
 		return
 
 	}
-	log.Infoln("selector string=[" + sel + "]")
+	log.Debug("selector string=[" + sel + "]")
 
 	myselector, err := labels.Parse(sel)
 	if err != nil {
@@ -135,6 +135,8 @@ func userManager() {
 
 	for _, cluster := range clusterList.Items {
 
+		//log.Infoln("working on cluster " + cluster.Spec.Name)
+		//log.Infof("clusters %v\n", clusterList.Items)
 		sel = "pg-cluster=" + cluster.Spec.Name + ",!replica"
 		lo := meta_v1.ListOptions{LabelSelector: sel}
 		deployments, err := Clientset.ExtensionsV1beta1().Deployments(Namespace).List(lo)
@@ -144,11 +146,10 @@ func userManager() {
 		}
 
 		for _, d := range deployments.Items {
-			fmt.Println("deployment : " + d.ObjectMeta.Name)
 			info := getPostgresUserInfo(d.ObjectMeta.Name)
 
 			if ChangePasswordForUser != "" {
-				fmt.Println("changing password of user " + ChangePasswordForUser)
+				fmt.Println("changing password of user " + ChangePasswordForUser + " on " + d.ObjectMeta.Name)
 				newPassword := util.GeneratePassword(PasswordLength)
 				newExpireDate := GeneratePasswordExpireDate(PasswordAgeDays)
 				err = updatePassword(cluster.Spec.Name, info, ChangePasswordForUser, newPassword, newExpireDate)
@@ -158,11 +159,11 @@ func userManager() {
 				}
 			}
 			if DeleteUser != "" {
-				fmt.Println("deleting user " + DeleteUser)
+				fmt.Println("deleting user " + DeleteUser + " from " + d.ObjectMeta.Name)
 				deleteUser(cluster.Spec.Name, info, DeleteUser)
 			}
 			if AddUser != "" {
-				fmt.Println("adding new user " + AddUser)
+				fmt.Println("adding new user " + AddUser + " to " + d.ObjectMeta.Name)
 				addUser(d.ObjectMeta.Name, info, AddUser)
 				newPassword := util.GeneratePassword(PasswordLength)
 				newExpireDate := GeneratePasswordExpireDate(PasswordAgeDays)
@@ -418,7 +419,7 @@ func deleteUser(clusterName string, info ConnInfo, user string) {
 	conn, err = sql.Open("postgres", "sslmode=disable user="+info.Username+" host="+info.Hostip+" port="+info.Port+" dbname="+info.Database+" password="+info.Password)
 	if err != nil {
 		log.Debug(err.Error())
-		os.Exit(2)
+		//os.Exit(2)
 	}
 
 	var rows *sql.Rows
@@ -428,14 +429,14 @@ func deleteUser(clusterName string, info ConnInfo, user string) {
 	rows, err = conn.Query(querystr)
 	if err != nil {
 		log.Debug(err.Error())
-		os.Exit(2)
+		//os.Exit(2)
 	}
 	querystr = "drop user if exists " + user
 	log.Debug(querystr)
 	rows, err = conn.Query(querystr)
 	if err != nil {
 		log.Debug(err.Error())
-		os.Exit(2)
+		//os.Exit(2)
 	}
 
 	defer func() {
@@ -450,7 +451,7 @@ func deleteUser(clusterName string, info ConnInfo, user string) {
 	err = util.DeleteUserSecret(Clientset, clusterName, user, Namespace)
 	if err != nil {
 		log.Debug(err.Error())
-		os.Exit(2)
+		//os.Exit(2)
 	}
 
 }

examples/operator/remove-tpr.sh

@@ -16,6 +16,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source $DIR/setup.sh
 
+$CO_CMD delete pgbackups --all
+$CO_CMD delete pgclones --all
+$CO_CMD delete pgclusters --all
+$CO_CMD delete pgpolicies --all
+$CO_CMD delete pgpolicylogs --all
+$CO_CMD delete pgupgrades --all
+
 $CO_CMD delete thirdpartyresources pg-backup.crunchydata.com \
 	pg-clone.crunchydata.com \
 	pg-cluster.crunchydata.com  \

operator/cluster/cluster_strategy_1.go

@@ -240,7 +240,7 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
 	}
 
 	//sleep just a bit to give the drain time to work
-	time.Sleep(2000 * time.Millisecond)
+	time.Sleep(9000 * time.Millisecond)
 
 	//TODO when client-go 3.0 is ready, use propagation_policy
 	//in the delete options to also delete the replica sets
@@ -259,6 +259,7 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
 		}
 	}
 
+	/**
 	//TODO for k8s 1.6 and client-go 3.0 we can use propagation_policy
 	// to have the replica sets removed as part of the deployment remove
 	//delete replica sets if they exist
@@ -280,12 +281,13 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
 			log.Info("deleted cluster replicaset " + r.Name + " in namespace " + namespace)
 		}
 	}
+	*/
 
 	for _, d := range deployments.Items {
 		log.Debug("making sure deployment " + d.ObjectMeta.Name + " is deleted")
-		err := util.WaitUntilDeploymentIsDeleted(clientset, d.ObjectMeta.Name, time.Second*3, namespace)
+		err := util.WaitUntilDeploymentIsDeleted(clientset, d.ObjectMeta.Name, time.Second*39, namespace)
 		if err != nil {
-			log.Error("timeout waiting for deployment " + d.ObjectMeta.Name + " to delete")
+			log.Error("timeout waiting for deployment " + d.ObjectMeta.Name + " to delete " + err.Error())
 		}
 	}