public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-21 09:15:48 +02:00
Code Issues Projects Releases Wiki Activity

Do not create roles if cluster is masterless

Browse Source 
fix pod deletion
This commit is contained in:
Murat Kabilov
2017-05-12 11:41:34 +02:00
parent da438aab3a
commit a7c57874d5
5 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/pod.go
+8 -8
View File
@@ -45,11 +45,13 @@ func (c *Cluster) deletePods() error {
}
for _, obj := range pods {
c.logger.Debugf("Deleting Pod '%s'", util.NameFromMeta(obj.ObjectMeta))
if err := c.deletePod(&obj); err != nil {
c.logger.Errorf("Can't delete Pod: %s", err)
podName := util.NameFromMeta(obj.ObjectMeta)
c.logger.Debugf("Deleting Pod '%s'", podName)
if err := c.deletePod(podName); err != nil {
c.logger.Errorf("Can't delete Pod '%s': %s", podName, err)
} else {
c.logger.Infof("Pod '%s' has been deleted", util.NameFromMeta(obj.ObjectMeta))
c.logger.Infof("Pod '%s' has been deleted", podName)
}
}
if len(pods) > 0 {
@@ -83,9 +85,7 @@ func (c *Cluster) deletePersistenVolumeClaims() error {
return nil
}
func (c *Cluster) deletePod(pod *v1.Pod) error {
podName := util.NameFromMeta(pod.ObjectMeta)
func (c *Cluster) deletePod(podName spec.NamespacedName) error {
ch := make(chan spec.PodEvent)
if _, ok := c.podSubscribers[podName]; ok {
panic("Pod '" + podName.String() + "' is already subscribed")
@@ -96,7 +96,7 @@ func (c *Cluster) deletePod(pod *v1.Pod) error {
delete(c.podSubscribers, podName)
}()
if err := c.KubeClient.Pods(pod.Namespace).Delete(pod.Name, deleteOptions); err != nil {
if err := c.KubeClient.Pods(podName.Namespace).Delete(podName.Name, deleteOptions); err != nil {
return err
}