clone is working at this commit

Author: Jeff McCormick

operator/cluster/cluster_strategy_1.go

@@ -159,7 +159,7 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 		}
 		log.Info("created master Deployment " + deploymentResult.Name + " in namespace " + namespace)
 	} else {
-		log.Info("master Deployment " + deploymentResult.Name + " in namespace " + namespace + " already existed so not creating it ")
+		log.Info("master Deployment " + cl.Spec.Name + " in namespace " + namespace + " already existed so not creating it ")
 	}
 
 	//create the replica deployment

operator/postgres-operator.go

@@ -96,7 +96,7 @@ func main() {
 	go upgrade.Process(clientset, tprclient, stopchan, namespace)
 	go upgrade.MajorUpgradeProcess(clientset, tprclient, stopchan, namespace)
 	go cluster.ProcessClone(clientset, tprclient, stopchan, namespace)
-	go cluster.CompleteClone(clientset, tprclient, stopchan, namespace)
+	go cluster.CompleteClone(config, clientset, tprclient, stopchan, namespace)
 
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)

operator/util/exec.go

@@ -22,6 +22,7 @@ import (
 	"github.com/gorilla/websocket"
 	"io"
 	"k8s.io/client-go/rest"
+	//"k8s.io/client-go/tools/clientcmd"
 	"net/http"
 	"net/url"
 )
@@ -34,13 +35,7 @@ type WebsocketRoundTripper struct {
 }
 
 //execs the cmd
-func Exec(namespace, podname, containername, cmd string) error {
-
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
+func Exec(config *rest.Config, namespace, podname, containername string, cmd []string) error {
 
 	wrappedRoundTripper, err := roundTripperFromConfig(config)
 	if err != nil {
@@ -98,8 +93,9 @@ func roundTripperFromConfig(config *rest.Config) (http.RoundTripper, error) {
 	return rest.HTTPWrappersForConfig(config, rt)
 }
 
-func requestFromConfig(config *rest.Config, pod string, container string, namespace string, cmd string) (*http.Request, error) {
+func requestFromConfig(config *rest.Config, pod string, container string, namespace string, cmd []string) (*http.Request, error) {
 
+	log.Info("config.Host is " + config.Host)
 	u, err := url.Parse(config.Host)
 	if err != nil {
 		return nil, err
@@ -115,11 +111,18 @@ func requestFromConfig(config *rest.Config, pod string, container string, namesp
 	}
 
 	u.Path = fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/exec", namespace, pod)
-	if container != "" {
-		u.RawQuery = "command=" + cmd +
-			"&container=" + container +
-			"&stderr=true&stdout=true"
+	params := url.Values{}
+	for _, v := range cmd {
+		params.Add("command", v)
 	}
+	params.Add("container", container)
+	params.Add("stderr", "true")
+	params.Add("stdout", "true")
+
+	u.RawQuery = params.Encode()
+
+	log.Info(u.String())
+
 	req := &http.Request{
 		Method: http.MethodGet,
 		URL:    u,

operator/util/secrets.go

@@ -25,6 +25,7 @@ import (
 
 	"k8s.io/client-go/pkg/api/v1"
 	"math/rand"
+	"strings"
 	"time"
 )
 
@@ -173,3 +174,35 @@ func GetPasswordFromSecret(clientset *kubernetes.Clientset, namespace string, se
 	return string(secret.Data["password"][:]), err
 
 }
+
+func CopySecrets(clientset *kubernetes.Clientset, namespace string, fromCluster, toCluster string) error {
+
+	log.Debug("CopySecrets " + fromCluster + " to " + toCluster)
+	lo := v1.ListOptions{LabelSelector: "pg-database=" + fromCluster}
+	secrets, err := clientset.Secrets(namespace).List(lo)
+	if err != nil {
+		log.Error("error getting list of secrets" + err.Error())
+		return err
+	}
+
+	for _, s := range secrets.Items {
+		log.Debug("found secret : " + s.ObjectMeta.Name)
+		secret := v1.Secret{}
+		secret.Name = strings.Replace(s.ObjectMeta.Name, fromCluster, toCluster, 1)
+		secret.ObjectMeta.Labels = make(map[string]string)
+		secret.ObjectMeta.Labels["pg-database"] = toCluster
+		secret.Data = make(map[string][]byte)
+		secret.Data["username"] = s.Data["username"][:]
+		secret.Data["password"] = s.Data["password"][:]
+
+		_, err := clientset.Secrets(namespace).Create(&secret)
+		if err != nil {
+			log.Error("error creating secret" + err.Error())
+		} else {
+			log.Info("created secret " + secret.Name)
+		}
+
+	}
+	return err
+
+}