fix pgo delete cluster command to not delete pods while deletion of deployment is inprogress

Author: Jeff McCormick

examples/gluster/gluster-storage-class.yaml

@@ -0,0 +1,9 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: StorageClass
+metadata:
+  name: gluster-heketi
+provisioner: kubernetes.io/glusterfs
+parameters:
+  resturl: "http://gluster1:8080"
+  restuser: "user"
+  restuserkey: "My Secret"

examples/gluster/test-pvc.json

@@ -0,0 +1,20 @@
+{
+    "apiVersion": "v1",
+    "kind": "PersistentVolumeClaim",
+    "metadata": {
+        "annotations": {
+            "volume.beta.kubernetes.io/storage-class": "gluster-heketi"
+        },
+        "name": "test-pvc"
+    },
+    "spec": {
+        "accessModes": [
+            "ReadWriteOnce"
+        ],
+        "resources": {
+            "requests": {
+                "storage": "400M"
+            }
+        }
+    }
+}

golang-examples/config.go

@@ -0,0 +1,95 @@
+package main
+
+import (
+	"encoding/json"
+	log "github.com/Sirupsen/logrus"
+	"io/ioutil"
+	"os"
+)
+
+type ContainerResource struct {
+	Name           string  `json:"Name"`
+	RequestsMemory string  `json:"RequestsMemory"`
+	RequestsCPU    float64 `json:"RequestsCPU"`
+	LimitsMemory   string  `json:"LimitsMemory"`
+	LimitsCPU      float64 `json:"LimitsCPU"`
+}
+
+type Cluster struct {
+	CCPImagePrefix  string `json:"CCPImagePrefix"`
+	CCPImageTag     string `json:"CCPImageTag"`
+	Port            int    `json:"Port"`
+	User            string `json:"User"`
+	Database        string `json:"Database"`
+	PasswordAgeDays int    `json:"PasswordAgeDays"`
+	PasswordLength  int    `json:"PasswordLength"`
+	Strategy        int    `json:"Strategy"`
+	Replicas        int    `json:"Replicas"`
+}
+
+type Storage struct {
+	Name        string `json:"Name"`
+	AccessMode  string `json:"AccessMode"`
+	Size        string `json:"Size"`
+	StorageType string `json:"StorageType"`
+}
+type Pgo struct {
+	Audit         bool   `json:"Audit"`
+	Metrics       bool   `json:"Metrics"`
+	LSPVCTemplate string `json:"LSPVCTemplate"`
+	LoadTemplate  string `json:"LoadTemplate"`
+	COImagePrefix string `json:"COImagePrefix"`
+	COImageTag    string `json:"COImageTag"`
+}
+
+type PgoConfig struct {
+	ClusterDef               Cluster
+	PrimaryStorage           string              `json:"PrimaryStorage"`
+	BackupStorage            string              `json:"BackupStorage"`
+	ReplicaStorage           string              `json:"ReplicaStorage"`
+	StorageDef               []Storage           `json:"Storage"`
+	DefaultContainerResource string              `json:"DefaultContainerResource"`
+	ContainerResources       []ContainerResource `json:"ContainerResources"`
+	PgoDef                   Pgo                 `json:"Pgo"`
+}
+
+func main() {
+	log.Info("hi")
+	path := "./conf/apiserver/pgo.json"
+	_, err := ioutil.ReadFile(path)
+	if err != nil {
+		log.Error("error loading template path=" + path + err.Error())
+		panic(err.Error())
+	}
+
+	thisconfig := PgoConfig{}
+	thisconfig.PrimaryStorage = "storage1"
+	thisconfig.StorageDef = make([]Storage, 1)
+	thisconfig.StorageDef[0].Name = "storage1"
+	thisconfig.StorageDef[0].AccessMode = "ReadWriteMany"
+	thisconfig.DefaultContainerResource = "res1"
+	thisconfig.ContainerResources = make([]ContainerResource, 1)
+	thisconfig.ContainerResources[0].Name = "res1"
+	thisconfig.ClusterDef = Cluster{}
+	thisconfig.ClusterDef.Port = 5432
+	thisconfig.PgoDef.Audit = false
+	thisconfig.PgoDef.Metrics = false
+	thisconfig.PgoDef.LSPVCTemplate = "this lspvc template"
+	thisconfig.PgoDef.LoadTemplate = "loadtempaltepath"
+	thisconfig.PgoDef.COImagePrefix = "crunchydata"
+	thisconfig.PgoDef.COImageTag = "centos7-2.6"
+
+	//json.Unmarshal(buf, &c)
+
+	//log.Info("Pgo.LSPVCTemplate is [" + c.PgoDef.LSPVCTemplate + "]")
+
+	//log.Infof("%v\n", c.ContainerResources)
+
+	b, err := json.MarshalIndent(thisconfig, "", " ")
+	if err != nil {
+		log.Error(err)
+	} else {
+		os.Stdout.Write(b)
+	}
+
+}

operator/cluster/cluster_strategy_1.go

@@ -151,20 +151,7 @@ func (r Strategy1) DeleteCluster(clientset *kubernetes.Clientset, restclient *re
 		log.Error("error deleting primary Deployment " + err.Error())
 	}
 
-	//delete any remaining pods that may be left lingering
-	pods, err := kubeapi.GetPods(clientset, "pg-cluster="+cl.Spec.Name,
-		namespace)
-	for _, pod := range pods.Items {
-		err = kubeapi.DeletePod(clientset, pod.Name, namespace)
-	}
-	pods, err = kubeapi.GetPods(clientset,
-		"name="+cl.Spec.Name+ReplicaSuffix, namespace)
-	for _, pod := range pods.Items {
-		err = kubeapi.DeletePod(clientset, pod.Name, namespace)
-	}
-
 	//delete the primary service
-
 	kubeapi.DeleteService(clientset, cl.Spec.Name, namespace)
 
 	//delete the replica service
@@ -178,6 +165,9 @@ func (r Strategy1) DeleteCluster(clientset *kubernetes.Clientset, restclient *re
 	//delete the pgreplicas if necessary
 	DeletePgreplicas(restclient, cl.Spec.Name, namespace)
 
+	//delete the pgbackups if necessary
+	kubeapi.Deletepgbackup(restclient, cl.Spec.Name, namespace)
+
 	return err
 
 }