Skip to content

Commit 9f22ff3

Browse files
author
Jeff McCormick
committed
delete replica sets with code until client-go 3.0 integration
1 parent 110ad00 commit 9f22ff3

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

examples/golang/listlog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func main() {
3636
fmt.Println("error waiting on lspvc pod to complete" + err.Error())
3737
}
3838
logOptions := v1.PodLogOptions{}
39-
podName := "lspvc-mycluster"
39+
podName := "lspvc-donut"
4040
req := clientset.Core().Pods("default").GetLogs(podName, &logOptions)
4141
if req == nil {
4242
fmt.Println("error in get logs for " + podName)

operator/cluster/cluster_strategy_1.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,11 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
282282
//sleep just a bit to give the drain time to work
283283
time.Sleep(2000 * time.Millisecond)
284284

285+
//TODO when client-go 3.0 is ready, use propagation_policy
286+
//in the delete options to also delete the replica sets
287+
285288
//delete the replica deployment
289+
286290
err = clientset.Deployments(namespace).Delete(replicaName, &v1.DeleteOptions{})
287291
if err != nil {
288292
log.Error("error deleting replica Deployment " + err.Error())
@@ -311,6 +315,10 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
311315
}
312316
log.Info("deleted master Deployment " + cl.Spec.Name + " in namespace " + namespace)
313317
318+
*/
319+
320+
//TODO for k8s 1.6 and client-go 3.0 we can use propagation_policy
321+
// to have the replica sets removed as part of the deployment remove
314322
//delete replica sets if they exist
315323
options := v1.ListOptions{}
316324
options.LabelSelector = "pg-cluster=" + cl.Spec.Name
@@ -330,7 +338,6 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
330338
log.Info("deleted cluster replicaset " + r.Name + " in namespace " + namespace)
331339
}
332340
}
333-
*/
334341

335342
return err
336343

0 commit comments

Comments
 (0)