clean up startup scripts

Author: Jeff McCormick

examples/operator/cleanup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 # Copyright 2016 Crunchy Data Solutions, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$CMD delete configmap operator-conf
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-$CMD --namespace=$CO_NAMESPACE delete deployment postgres-operator
+source $DIR/setup.sh
+
+$CO_CMD delete configmap operator-conf
+
+$CO_CMD --namespace=$CO_NAMESPACE delete deployment postgres-operator
 
 sleep 10
 

examples/operator/create-pv.sh

@@ -15,11 +15,13 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+source $DIR/setup.sh
+
 echo "create the test PV and PVC using the HostPath dir"
 for i in {1..60}
 do
    	echo "creating PV crunchy-pv$i"
 	export COUNTER=$i
-	kubectl --namespace=$CO_NAMESPACE delete pv crunchy-pv$i
-	envsubst < $DIR/crunchy-pv.json | kubectl --namespace=$CO_NAMESPACE create -f -
+	$CO_CMD --namespace=$CO_NAMESPACE delete pv crunchy-pv$i
+	envsubst < $DIR/crunchy-pv.json | $CO_CMD --namespace=$CO_NAMESPACE create -f -
 done

examples/operator/delete-pv.sh

@@ -15,8 +15,10 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+source $DIR/setup.sh
+
 for i in {1..15}
 do
    	echo "deleting PV crunchy-pv$i"
-	kubectl delete pv crunchy-pv$i
+	$CO_CMD delete pv crunchy-pv$i
 done

examples/operator/run.sh

@@ -15,15 +15,7 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-
-if [ -z "$CO_NAMESPACE" ]; then
-	echo "CO_NAMESPACE not set, using default"
-	export CO_NAMESPACE=default
-fi
-if [ -z "$CO_CMD" ]; then
-	echo "CO_CMD not set, using kubectl"
-	export CO_CMD=kubectl
-fi
+source $DIR/setup.sh
 
 $DIR/cleanup.sh
 

examples/operator/setup.sh

@@ -0,0 +1,23 @@
+# Copyright 2016 Crunchy Data Solutions, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ -z "$CO_NAMESPACE" ]; then
+	echo "CO_NAMESPACE not set, using default"
+	export CO_NAMESPACE=default
+fi
+if [ -z "$CO_CMD" ]; then
+	echo "CO_CMD not set, using kubectl"
+	export CO_CMD=kubectl
+fi
+
+

operator/cluster/cluster_strategy_1.go

@@ -339,8 +339,6 @@ func (r ClusterStrategy1) PrepareClone(clientset *kubernetes.Clientset, tprclien
 
 	log.Info("creating clone deployment using Strategy 1 in namespace " + namespace)
 
-	//TODO copy the secrets here instead of using existing secrets
-
 	//create the clone replica deployment and set replicas to 1
 	replicaDeploymentFields := DeploymentTemplateFields{
 		Name:                 cloneName,